From 9d430844c3ed411879f9f6ab82352686e7dd9983 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 5 Apr 2016 08:15:05 -0700 Subject: [PATCH 1/4] Replace most (if not all) output << operators with to_chat(user, message) Currently, to_chat is literally just a proc that does user << message. But it'll let us do output modification in the future, especially for something like Goon's HTML chat. Big thanks to PJB for his to_chat script, see https://github.com/d3athrow/vgstation13/pull/6625 for more details. --- code/ATMOSPHERICS/atmospherics.dm | 9 +- .../components/binary_devices/passive_gate.dm | 6 +- .../components/binary_devices/pump.dm | 6 +- .../components/binary_devices/valve.dm | 3 +- .../components/binary_devices/volume_pump.dm | 6 +- .../components/omni_devices/omni_base.dm | 6 +- .../components/trinary_devices/filter.dm | 3 +- .../components/trinary_devices/mixer.dm | 3 +- .../components/trinary_devices/tvalve.dm | 3 +- .../unary_devices/outlet_injector.dm | 3 +- .../unary_devices/portables_connector.dm | 3 +- .../components/unary_devices/vent_pump.dm | 27 +- .../components/unary_devices/vent_scrubber.dm | 15 +- code/__HELPERS/files.dm | 6 +- code/__HELPERS/game.dm | 16 +- code/__HELPERS/global_lists.dm | 3 +- code/__HELPERS/icon_smoothing.dm | 3 + code/__HELPERS/icons.dm | 3 +- code/__HELPERS/logging.dm | 6 +- code/__HELPERS/names.dm | 3 +- code/__HELPERS/unsorted.dm | 33 +- code/_onclick/click.dm | 6 +- code/_onclick/click_override.dm | 9 +- code/_onclick/cyborg.dm | 3 +- code/_onclick/hud/action.dm | 6 +- code/_onclick/hud/hud.dm | 6 +- code/_onclick/hud/robot.dm | 6 +- code/_onclick/hud/screen_objects.dm | 18 +- code/_onclick/item_attack.dm | 12 +- code/_onclick/observer.dm | 6 +- code/_onclick/oldcode.dm | 3 +- code/_onclick/rig.dm | 12 +- code/_onclick/telekinesis.dm | 3 +- code/controllers/Processes/inactivity.dm | 3 +- code/controllers/Processes/shuttles.dm | 21 +- code/controllers/configuration.dm | 6 +- code/controllers/voting.dm | 39 +- code/datums/ai_laws.dm | 6 +- code/datums/browser.dm | 12 +- code/datums/cargoprofile.dm | 12 +- code/datums/datumvars.dm | 214 ++++++--- code/datums/diseases/advance/advance.dm | 15 +- .../datums/diseases/advance/symptoms/beard.dm | 9 +- .../diseases/advance/symptoms/choking.dm | 9 +- .../diseases/advance/symptoms/confusion.dm | 6 +- .../datums/diseases/advance/symptoms/cough.dm | 3 +- .../diseases/advance/symptoms/deafness.dm | 9 +- .../datums/diseases/advance/symptoms/dizzy.dm | 6 +- .../datums/diseases/advance/symptoms/fever.dm | 3 +- code/datums/diseases/advance/symptoms/fire.dm | 9 +- .../diseases/advance/symptoms/flesh_eating.dm | 6 +- .../diseases/advance/symptoms/genetics.dm | 3 +- .../diseases/advance/symptoms/hallucigen.dm | 9 +- .../diseases/advance/symptoms/headache.dm | 3 +- code/datums/diseases/advance/symptoms/heal.dm | 6 +- .../diseases/advance/symptoms/itching.dm | 3 +- .../diseases/advance/symptoms/oxygen.dm | 3 +- .../diseases/advance/symptoms/sensory.dm | 27 +- .../diseases/advance/symptoms/shedding.dm | 9 +- .../diseases/advance/symptoms/shivering.dm | 3 +- .../diseases/advance/symptoms/stimulant.dm | 3 +- .../datums/diseases/advance/symptoms/viral.dm | 12 +- .../diseases/advance/symptoms/vision.dm | 15 +- .../diseases/advance/symptoms/voice_change.dm | 3 +- .../datums/diseases/advance/symptoms/vomit.dm | 3 +- .../diseases/advance/symptoms/weakness.dm | 9 +- .../diseases/advance/symptoms/weight.dm | 9 +- .../datums/diseases/advance/symptoms/youth.dm | 15 +- code/datums/diseases/anxiety.dm | 15 +- code/datums/diseases/appendicitis.dm | 3 +- code/datums/diseases/beesease.dm | 12 +- code/datums/diseases/brainrot.dm | 12 +- code/datums/diseases/cold.dm | 30 +- code/datums/diseases/cold9.dm | 15 +- code/datums/diseases/dna_spread.dm | 12 +- code/datums/diseases/fake_gbs.dm | 3 +- code/datums/diseases/flu.dm | 18 +- code/datums/diseases/fluspanish.dm | 6 +- code/datums/diseases/gbs.dm | 6 +- code/datums/diseases/magnitis.dm | 15 +- code/datums/diseases/pierrot_throat.dm | 15 +- code/datums/diseases/retrovirus.dm | 36 +- code/datums/diseases/rhumba_beat.dm | 15 +- code/datums/diseases/transformation.dm | 27 +- code/datums/diseases/tuberculosis.dm | 30 +- code/datums/diseases/wizarditis.dm | 9 +- code/datums/gas_mixture.dm | 6 +- .../helper_datums/construction_datum.dm | 18 +- code/datums/helper_datums/events.dm | 6 +- code/datums/helper_datums/global_iterator.dm | 3 +- code/datums/helper_datums/teleport.dm | 3 +- code/datums/martial.dm | 71 ++- code/datums/mind.dm | 169 ++++--- code/datums/progressbar.dm | 3 +- code/datums/spell.dm | 30 +- code/datums/spells/area_teleport.dm | 6 +- code/datums/spells/bloodcrawl.dm | 6 +- code/datums/spells/charge.dm | 21 +- code/datums/spells/conjure.dm | 3 +- code/datums/spells/ethereal_jaunt.dm | 6 +- code/datums/spells/horsemask.dm | 9 +- code/datums/spells/lichdom.dm | 25 +- code/datums/spells/lightning.dm | 12 +- code/datums/spells/magnet.dm | 12 +- code/datums/spells/mime.dm | 9 +- code/datums/spells/mind_transfer.dm | 22 +- code/datums/spells/summonitem.dm | 3 +- code/datums/spells/touch_attacks.dm | 9 +- code/datums/spells/wizard.dm | 6 +- code/datums/wires/alarm.dm | 27 +- code/datums/wires/robot.dm | 6 +- code/datums/wires/wires.dm | 9 +- code/defines/procs/AStar.dm | 8 +- code/defines/procs/announce.dm | 45 +- code/defines/procs/statistics.dm | 6 +- code/game/area/areas.dm | 9 +- code/game/atoms.dm | 21 +- code/game/dna/dna_modifier.dm | 51 ++- code/game/dna/genes/disabilities.dm | 6 +- code/game/dna/genes/gene.dm | 6 +- code/game/dna/genes/goon_disabilities.dm | 12 +- code/game/dna/genes/goon_powers.dm | 96 ++-- code/game/dna/genes/monkey.dm | 6 +- code/game/dna/genes/powers.dm | 3 +- code/game/dna/genes/vg_powers.dm | 18 +- code/game/gamemodes/antag_spawner.dm | 39 +- .../game/gamemodes/autotraitor/autotraitor.dm | 15 +- code/game/gamemodes/blob/blob.dm | 33 +- code/game/gamemodes/blob/blob_finish.dm | 24 +- code/game/gamemodes/blob/blob_report.dm | 3 +- code/game/gamemodes/blob/overmind.dm | 30 +- code/game/gamemodes/blob/powers.dm | 81 ++-- code/game/gamemodes/blob/theblob.dm | 3 +- code/game/gamemodes/borer/borer.dm | 30 +- code/game/gamemodes/changeling/changeling.dm | 57 ++- .../gamemodes/changeling/changeling_power.dm | 18 +- .../gamemodes/changeling/evolution_menu.dm | 27 +- .../gamemodes/changeling/powers/absorb.dm | 30 +- .../changeling/powers/digitalcamo.dm | 6 +- .../changeling/powers/epinephrine.dm | 6 +- .../gamemodes/changeling/powers/fakedeath.dm | 6 +- .../gamemodes/changeling/powers/fleshmend.dm | 3 +- .../gamemodes/changeling/powers/headcrab.dm | 9 +- .../gamemodes/changeling/powers/hivemind.dm | 18 +- .../gamemodes/changeling/powers/humanform.dm | 3 +- .../gamemodes/changeling/powers/lesserform.dm | 9 +- .../changeling/powers/mimic_voice.dm | 9 +- .../gamemodes/changeling/powers/mutations.dm | 15 +- .../gamemodes/changeling/powers/panacea.dm | 3 +- .../gamemodes/changeling/powers/revive.dm | 3 +- .../gamemodes/changeling/powers/shriek.dm | 6 +- .../changeling/powers/strained_muscles.dm | 15 +- .../gamemodes/changeling/powers/swap_form.dm | 21 +- .../gamemodes/changeling/powers/tiny_prick.dm | 33 +- .../game/gamemodes/changeling/traitor_chan.dm | 6 +- code/game/gamemodes/cult/cult.dm | 45 +- code/game/gamemodes/cult/cult_items.dm | 6 +- code/game/gamemodes/cult/ritual.dm | 66 ++- code/game/gamemodes/cult/runes.dm | 178 +++++--- code/game/gamemodes/cult/talisman.dm | 48 +- code/game/gamemodes/events.dm | 3 +- code/game/gamemodes/extended/extended.dm | 6 +- code/game/gamemodes/game_mode.dm | 23 +- code/game/gamemodes/gameticker.dm | 85 ++-- code/game/gamemodes/heist/heist.dm | 48 +- .../gamemodes/malfunction/Malf_Modules.dm | 129 ++---- .../game/gamemodes/malfunction/malfunction.dm | 93 ++-- code/game/gamemodes/meteor/meteor.dm | 12 +- code/game/gamemodes/miniantags/borer/borer.dm | 198 +++++--- .../gamemodes/miniantags/bot_swarm/swarmer.dm | 159 ++++--- .../gamemodes/miniantags/guardian/guardian.dm | 204 ++++++--- code/game/gamemodes/miniantags/morph/morph.dm | 6 +- .../gamemodes/miniantags/morph/morph_event.dm | 6 +- .../gamemodes/miniantags/revenant/revenant.dm | 78 ++-- .../miniantags/revenant/revenant_abilities.dm | 75 ++-- .../miniantags/slaughter/bloodcrawl.dm | 18 +- .../miniantags/slaughter/slaughter.dm | 27 +- .../mutiny/emergency_authentication_device.dm | 14 +- code/game/gamemodes/mutiny/key_pinpointer.dm | 18 +- code/game/gamemodes/mutiny/mutiny.dm | 90 ++-- code/game/gamemodes/mutiny/mutiny_fluff.dm | 8 +- code/game/gamemodes/nations/nations.dm | 75 ++-- code/game/gamemodes/nations/nationsprocs.dm | 21 +- code/game/gamemodes/newobjective.dm | 3 +- code/game/gamemodes/nuclear/nuclear.dm | 87 ++-- .../gamemodes/nuclear/nuclear_challenge.dm | 15 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 42 +- code/game/gamemodes/nuclear/pinpointer.dm | 48 +- code/game/gamemodes/revolution/revolution.dm | 57 ++- .../gamemodes/revolution/rp_revolution.dm | 60 ++- code/game/gamemodes/sandbox/h_sandbox.dm | 9 +- code/game/gamemodes/sandbox/sandbox.dm | 6 +- code/game/gamemodes/scoreboard.dm | 6 +- code/game/gamemodes/shadowling/shadowling.dm | 68 ++- .../shadowling/shadowling_abilities.dm | 276 ++++++++---- .../special_shadowling_abilities.dm | 42 +- code/game/gamemodes/traitor/traitor.dm | 57 ++- code/game/gamemodes/vampire/vampire.dm | 60 ++- code/game/gamemodes/vampire/vampire_powers.dm | 81 ++-- code/game/gamemodes/wizard/artefact.dm | 114 +++-- code/game/gamemodes/wizard/godhand.dm | 6 +- code/game/gamemodes/wizard/raginmages.dm | 42 +- code/game/gamemodes/wizard/rightandwrong.dm | 9 +- code/game/gamemodes/wizard/soulstone.dm | 78 ++-- code/game/gamemodes/wizard/spellbook.dm | 93 ++-- code/game/gamemodes/wizard/wizard.dm | 39 +- code/game/gamemodes/xenos/xenos.dm | 33 +- code/game/jobs/job/support_chaplain.dm | 3 +- code/game/jobs/job_controller.dm | 18 +- code/game/jobs/whitelist.dm | 6 +- code/game/machinery/Freezer.dm | 12 +- code/game/machinery/OpTable.dm | 12 +- code/game/machinery/PDApainter.dm | 9 +- code/game/machinery/Sleeper.dm | 90 ++-- code/game/machinery/adv_med.dm | 39 +- code/game/machinery/ai_slipper.dm | 15 +- code/game/machinery/alarm.dm | 48 +- code/game/machinery/atmo_control.dm | 12 +- code/game/machinery/atmoalter/canister.dm | 12 +- code/game/machinery/atmoalter/meter.dm | 6 +- .../atmoalter/portable_atmospherics.dm | 12 +- code/game/machinery/atmoalter/scrubber.dm | 12 +- code/game/machinery/autolathe.dm | 21 +- code/game/machinery/bees_apiary.dm | 48 +- code/game/machinery/biogenerator.dm | 39 +- code/game/machinery/camera/camera.dm | 54 ++- code/game/machinery/camera/camera_assembly.dm | 36 +- code/game/machinery/camera/tracking.dm | 48 +- code/game/machinery/cell_charger.dm | 24 +- code/game/machinery/chiller.dm | 15 +- code/game/machinery/cloning.dm | 42 +- .../machinery/computer/HolodeckControl.dm | 36 +- code/game/machinery/computer/ai_core.dm | 90 ++-- code/game/machinery/computer/aifixer.dm | 30 +- code/game/machinery/computer/arcade.dm | 40 +- .../game/machinery/computer/buildandrepair.dm | 93 ++-- code/game/machinery/computer/camera.dm | 3 +- .../machinery/computer/camera_advanced.dm | 3 +- code/game/machinery/computer/card.dm | 12 +- code/game/machinery/computer/cloning.dm | 10 +- .../game/machinery/computer/communications.dm | 75 ++-- code/game/machinery/computer/computer.dm | 6 +- code/game/machinery/computer/honkputer.dm | 24 +- code/game/machinery/computer/law.dm | 39 +- code/game/machinery/computer/message.dm | 15 +- code/game/machinery/computer/pod.dm | 3 +- code/game/machinery/computer/prisoner.dm | 10 +- code/game/machinery/computer/robot.dm | 63 ++- code/game/machinery/computer/salvage_ship.dm | 3 +- code/game/machinery/computer/security.dm | 6 +- code/game/machinery/computer/skills.dm | 6 +- .../machinery/computer/specops_shuttle.dm | 39 +- code/game/machinery/computer/store.dm | 6 +- .../computer/syndicate_specops_shuttle.dm | 27 +- .../machinery/computer/telecrystalconsoles.dm | 6 +- code/game/machinery/constructable_frame.dm | 51 ++- code/game/machinery/cryo.dm | 48 +- code/game/machinery/cryopod.dm | 81 ++-- code/game/machinery/deployable.dm | 12 +- code/game/machinery/door_control.dm | 9 +- code/game/machinery/doors/airlock.dm | 150 ++++--- code/game/machinery/doors/airlock_control.dm | 3 +- code/game/machinery/doors/firedoor.dm | 12 +- code/game/machinery/doors/windowdoor.dm | 12 +- code/game/machinery/doppler_array.dm | 6 +- code/game/machinery/drying_rack.dm | 24 +- .../airlock_docking_controller.dm | 21 +- .../airlock_docking_controller_multi.dm | 21 +- .../embedded_controller/docking_program.dm | 3 +- code/game/machinery/firealarm.dm | 18 +- code/game/machinery/floodlight.dm | 27 +- code/game/machinery/guestpass.dm | 27 +- code/game/machinery/hologram.dm | 18 +- code/game/machinery/iv_drip.dm | 34 +- code/game/machinery/kitchen/gibber.dm | 21 +- code/game/machinery/kitchen/icecream_vat.dm | 30 +- code/game/machinery/kitchen/juicer.dm | 9 +- .../game/machinery/kitchen/kitchen_machine.dm | 30 +- code/game/machinery/kitchen/monkeyrecycler.dm | 24 +- code/game/machinery/kitchen/processor.dm | 12 +- code/game/machinery/kitchen/smartfridge.dm | 36 +- code/game/machinery/lightswitch.dm | 3 +- code/game/machinery/machinery.dm | 60 ++- code/game/machinery/mass_driver.dm | 69 ++- code/game/machinery/navbeacon.dm | 12 +- code/game/machinery/newscaster.dm | 12 +- code/game/machinery/overview.dm | 21 +- code/game/machinery/pipe/construction.dm | 12 +- code/game/machinery/pipe/pipe_dispenser.dm | 9 +- code/game/machinery/podmen.dm | 27 +- code/game/machinery/poolcontroller.dm | 26 +- code/game/machinery/portable_turret.dm | 117 +++-- code/game/machinery/programmable_unloader.dm | 48 +- code/game/machinery/recharger.dm | 21 +- code/game/machinery/rechargestation.dm | 21 +- code/game/machinery/recycler.dm | 24 +- code/game/machinery/requests_console.dm | 6 +- code/game/machinery/robot_fabricator.dm | 6 +- code/game/machinery/seed_extractor.dm | 9 +- code/game/machinery/shieldgen.dm | 63 ++- code/game/machinery/spaceheater.dm | 15 +- code/game/machinery/status_display.dm | 3 +- code/game/machinery/suit_storage_unit.dm | 141 ++++-- code/game/machinery/syndicatebeacon.dm | 31 +- code/game/machinery/syndicatebomb.dm | 45 +- code/game/machinery/telecomms/logbrowser.dm | 12 +- .../telecomms/machine_interactions.dm | 24 +- .../machinery/telecomms/telecomunications.dm | 3 +- code/game/machinery/telecomms/telemonitor.dm | 9 +- .../machinery/telecomms/traffic_control.dm | 12 +- code/game/machinery/teleporter.dm | 48 +- code/game/machinery/transformer.dm | 3 +- code/game/machinery/turntable.dm | 57 ++- code/game/machinery/turret_control.dm | 15 +- code/game/machinery/turrets.dm | 12 +- code/game/machinery/vending.dm | 65 ++- code/game/machinery/washing_machine.dm | 57 ++- code/game/machinery/wishgranter.dm | 15 +- code/game/magic/Uristrunes.dm | 1 + code/game/mecha/combat/marauder.dm | 3 +- code/game/mecha/equipment/mecha_equipment.dm | 6 +- code/game/mecha/equipment/tools/tools.dm | 6 +- code/game/mecha/equipment/weapons/weapons.dm | 3 +- code/game/mecha/mech_fabricator.dm | 18 +- code/game/mecha/mecha.dm | 241 ++++++---- code/game/mecha/mecha_construction_paths.dm | 12 +- code/game/mecha/mecha_wreckage.dm | 18 +- code/game/objects/buckling.dm | 6 +- code/game/objects/effects/aliens.dm | 12 +- code/game/objects/effects/anomalies.dm | 3 +- code/game/objects/effects/datacore-effect.dm | 3 +- .../effects/decals/Cleanable/humans.dm | 6 +- .../effects/decals/Cleanable/tracks.dm | 3 +- code/game/objects/effects/decals/cleanable.dm | 12 +- .../game/objects/effects/decals/contraband.dm | 25 +- code/game/objects/effects/effect_system.dm | 15 +- code/game/objects/effects/gibs.dm | 3 +- code/game/objects/effects/mines.dm | 3 +- code/game/objects/effects/spiders.dm | 6 +- code/game/objects/empulse.dm | 3 +- code/game/objects/explosion.dm | 3 +- code/game/objects/items.dm | 60 ++- code/game/objects/items/ashtray.dm | 9 +- code/game/objects/items/blueprints.dm | 21 +- code/game/objects/items/bodybag.dm | 15 +- code/game/objects/items/crayons.dm | 18 +- code/game/objects/items/dehy_carp.dm | 6 +- code/game/objects/items/devices/aicard.dm | 15 +- code/game/objects/items/devices/autopsy.dm | 12 +- code/game/objects/items/devices/camera_bug.dm | 9 +- .../objects/items/devices/chameleonproj.dm | 21 +- code/game/objects/items/devices/debugger.dm | 18 +- code/game/objects/items/devices/flash.dm | 30 +- code/game/objects/items/devices/flashlight.dm | 28 +- .../objects/items/devices/laserpointer.dm | 30 +- .../objects/items/devices/lightreplacer.dm | 30 +- code/game/objects/items/devices/megaphone.dm | 21 +- code/game/objects/items/devices/modkit.dm | 15 +- code/game/objects/items/devices/paicard.dm | 30 +- .../objects/items/devices/pipe_painter.dm | 6 +- code/game/objects/items/devices/pizza_bomb.dm | 21 +- code/game/objects/items/devices/powersink.dm | 6 +- .../objects/items/devices/radio/beacon.dm | 9 +- .../items/devices/radio/electropack.dm | 12 +- .../objects/items/devices/radio/headset.dm | 15 +- .../objects/items/devices/radio/intercom.dm | 27 +- .../game/objects/items/devices/radio/radio.dm | 24 +- code/game/objects/items/devices/scanners.dm | 45 +- .../objects/items/devices/taperecorder.dm | 36 +- .../objects/items/devices/traitordevices.dm | 15 +- .../objects/items/devices/transfer_valve.dm | 18 +- code/game/objects/items/devices/uplinks.dm | 6 +- code/game/objects/items/devices/whistle.dm | 3 +- .../items/mountable_frames/apc_frame.dm | 9 +- .../objects/items/mountable_frames/frames.dm | 6 +- .../objects/items/mountable_frames/lights.dm | 3 +- .../items/mountable_frames/mountables.dm | 6 +- .../mountable_frames/newscaster_frame.dm | 9 +- code/game/objects/items/policetape.dm | 19 +- code/game/objects/items/robot/robot_parts.dm | 87 ++-- .../objects/items/robot/robot_upgrades.dm | 39 +- code/game/objects/items/shooting_range.dm | 12 +- code/game/objects/items/stacks/medical.dm | 45 +- code/game/objects/items/stacks/nanopaste.dm | 9 +- code/game/objects/items/stacks/rods.dm | 12 +- .../game/objects/items/stacks/sheets/glass.dm | 81 ++-- .../objects/items/stacks/sheets/leather.dm | 3 +- code/game/objects/items/stacks/stack.dm | 21 +- code/game/objects/items/stacks/telecrystal.dm | 6 +- code/game/objects/items/toys.dm | 138 ++++-- code/game/objects/items/weapons/AI_modules.dm | 103 +++-- code/game/objects/items/weapons/RCD.dm | 36 +- code/game/objects/items/weapons/RSF.dm | 96 ++-- .../objects/items/weapons/alien_specific.dm | 6 +- code/game/objects/items/weapons/cards_ids.dm | 66 ++- code/game/objects/items/weapons/cash.dm | 15 +- code/game/objects/items/weapons/caution.dm | 6 +- .../objects/items/weapons/chrono_eraser.dm | 12 +- code/game/objects/items/weapons/cigs.dm | 36 +- .../game/objects/items/weapons/clown_items.dm | 9 +- code/game/objects/items/weapons/cosmetics.dm | 27 +- code/game/objects/items/weapons/defib.dm | 63 ++- code/game/objects/items/weapons/dice.dm | 3 +- .../objects/items/weapons/dnascrambler.dm | 3 +- code/game/objects/items/weapons/explosives.dm | 15 +- .../objects/items/weapons/extinguisher.dm | 21 +- code/game/objects/items/weapons/fireworks.dm | 6 +- .../objects/items/weapons/flamethrower.dm | 9 +- code/game/objects/items/weapons/garrote.dm | 15 +- .../objects/items/weapons/gift_wrappaper.dm | 15 +- .../items/weapons/grenades/bananade.dm | 15 +- .../items/weapons/grenades/chem_grenade.dm | 42 +- .../items/weapons/grenades/clowngrenade.dm | 3 +- .../items/weapons/grenades/flashbang.dm | 12 +- .../items/weapons/grenades/ghettobomb.dm | 17 +- .../objects/items/weapons/grenades/grenade.dm | 27 +- code/game/objects/items/weapons/handcuffs.dm | 39 +- code/game/objects/items/weapons/holosign.dm | 12 +- .../items/weapons/implants/implant_chem.dm | 6 +- .../weapons/implants/implant_explosive.dm | 6 +- .../items/weapons/implants/implant_freedom.dm | 3 +- .../weapons/implants/implant_loyality.dm | 9 +- .../items/weapons/implants/implant_misc.dm | 3 +- .../items/weapons/implants/implant_traitor.dm | 12 +- .../items/weapons/implants/implantchair.dm | 9 +- .../items/weapons/implants/implanter.dm | 3 +- .../items/weapons/implants/implantpad.dm | 6 +- code/game/objects/items/weapons/legcuffs.dm | 6 +- code/game/objects/items/weapons/lighters.dm | 3 +- .../objects/items/weapons/melee/energy.dm | 24 +- code/game/objects/items/weapons/melee/misc.dm | 3 +- code/game/objects/items/weapons/misc.dm | 9 +- code/game/objects/items/weapons/mop.dm | 9 +- .../objects/items/weapons/pneumaticCannon.dm | 48 +- .../game/objects/items/weapons/power_cells.dm | 3 +- code/game/objects/items/weapons/scrolls.dm | 6 +- code/game/objects/items/weapons/shards.dm | 10 +- code/game/objects/items/weapons/shields.dm | 21 +- code/game/objects/items/weapons/soap.dm | 6 +- code/game/objects/items/weapons/staff.dm | 6 +- .../objects/items/weapons/storage/backpack.dm | 10 +- .../objects/items/weapons/storage/bags.dm | 9 +- .../objects/items/weapons/storage/belt.dm | 13 +- .../objects/items/weapons/storage/bible.dm | 33 +- .../objects/items/weapons/storage/fancy.dm | 27 +- .../objects/items/weapons/storage/firstaid.dm | 6 +- .../objects/items/weapons/storage/lockbox.dm | 24 +- .../objects/items/weapons/storage/secure.dm | 15 +- .../objects/items/weapons/storage/storage.dm | 36 +- .../objects/items/weapons/storage/toolbox.dm | 3 +- code/game/objects/items/weapons/stunbaton.dm | 27 +- .../objects/items/weapons/swords_axes_etc.dm | 15 +- .../objects/items/weapons/table_rack_parts.dm | 6 +- .../objects/items/weapons/tanks/jetpack.dm | 12 +- .../objects/items/weapons/tanks/tank_types.dm | 24 +- .../game/objects/items/weapons/tanks/tanks.dm | 28 +- .../objects/items/weapons/tanks/watertank.dm | 33 +- code/game/objects/items/weapons/tape.dm | 10 +- .../objects/items/weapons/teleportation.dm | 6 +- code/game/objects/items/weapons/tools.dm | 58 ++- code/game/objects/items/weapons/twohanded.dm | 39 +- .../objects/items/weapons/vending_items.dm | 6 +- code/game/objects/items/weapons/weaponry.dm | 30 +- code/game/objects/items/weapons/whetstone.dm | 21 +- code/game/objects/items/weapons/wires.dm | 9 +- code/game/objects/structures.dm | 24 +- code/game/objects/structures/artstuff.dm | 9 +- code/game/objects/structures/barsign.dm | 33 +- code/game/objects/structures/bedsheet_bin.dm | 24 +- code/game/objects/structures/coathanger.dm | 3 +- .../structures/crates_lockers/closets.dm | 54 ++- .../crates_lockers/closets/cardboardbox.dm | 3 +- .../crates_lockers/closets/fireaxe.dm | 57 ++- .../crates_lockers/closets/secure/personal.dm | 12 +- .../closets/secure/secure_closets.dm | 30 +- .../crates_lockers/closets/statue.dm | 3 +- .../structures/crates_lockers/crates.dm | 57 ++- .../structures/crates_lockers/crittercrate.dm | 3 +- .../structures/crates_lockers/largecrate.dm | 6 +- .../structures/crates_lockers/walllocker.dm | 6 +- code/game/objects/structures/displaycase.dm | 54 ++- code/game/objects/structures/door_assembly.dm | 39 +- code/game/objects/structures/electricchair.dm | 9 +- code/game/objects/structures/engicart.dm | 54 ++- code/game/objects/structures/extinguisher.dm | 12 +- code/game/objects/structures/false_walls.dm | 12 +- code/game/objects/structures/flora.dm | 6 +- code/game/objects/structures/foodcart.dm | 48 +- code/game/objects/structures/girders.dm | 93 ++-- code/game/objects/structures/grille.dm | 15 +- code/game/objects/structures/inflatable.dm | 12 +- code/game/objects/structures/janicart.dm | 60 ++- code/game/objects/structures/kitchen_spike.dm | 24 +- code/game/objects/structures/lamarr_cage.dm | 6 +- code/game/objects/structures/lattice.dm | 3 +- code/game/objects/structures/mineral_doors.dm | 9 +- code/game/objects/structures/misc.dm | 12 +- code/game/objects/structures/mop_bucket.dm | 9 +- code/game/objects/structures/morgue.dm | 18 +- code/game/objects/structures/musician.dm | 24 +- code/game/objects/structures/noticeboard.dm | 9 +- code/game/objects/structures/safe.dm | 36 +- code/game/objects/structures/signs.dm | 6 +- code/game/objects/structures/spirit_board.dm | 15 +- .../stool_bed_chair_nest/alien_nests.dm | 3 +- .../structures/stool_bed_chair_nest/bed.dm | 6 +- .../structures/stool_bed_chair_nest/chairs.dm | 3 +- code/game/objects/structures/tables_racks.dm | 51 ++- .../game/objects/structures/tank_dispenser.dm | 24 +- code/game/objects/structures/target_stake.dm | 9 +- .../structures/transit_tubes/station.dm | 3 +- code/game/objects/structures/watercloset.dm | 60 ++- .../objects/structures/windoor_assembly.dm | 51 ++- code/game/objects/structures/window.dm | 21 +- code/game/response_team.dm | 30 +- code/game/sound.dm | 7 +- code/game/turfs/simulated/floor.dm | 12 +- .../game/turfs/simulated/floor/fancy_floor.dm | 6 +- .../game/turfs/simulated/floor/light_floor.dm | 12 +- code/game/turfs/simulated/floor/plating.dm | 24 +- code/game/turfs/simulated/walls.dm | 93 ++-- code/game/turfs/simulated/walls_reinforced.dm | 108 +++-- code/game/turfs/space/space.dm | 57 ++- code/game/vehicles/spacepods/equipment.dm | 6 +- code/game/vehicles/spacepods/parts.dm | 12 +- .../game/vehicles/spacepods/pod_fabricator.dm | 15 +- code/game/vehicles/spacepods/spacepod.dm | 244 ++++++---- code/game/verbs/ooc.dm | 101 +++-- code/game/verbs/suicide.dm | 63 ++- code/game/verbs/who.dm | 6 +- code/modules/admin/DB ban/functions.dm | 45 +- code/modules/admin/NewBan.dm | 45 +- code/modules/admin/ToRban.dm | 19 +- code/modules/admin/admin.dm | 96 ++-- code/modules/admin/admin_investigate.dm | 30 +- code/modules/admin/admin_memo.dm | 18 +- code/modules/admin/admin_verbs.dm | 87 ++-- code/modules/admin/banappearance.dm | 6 +- code/modules/admin/banjob.dm | 6 +- code/modules/admin/buildmode.dm | 114 +++-- code/modules/admin/create_poll.dm | 15 +- code/modules/admin/holder2.dm | 12 +- code/modules/admin/machine_upgrade.dm | 3 +- code/modules/admin/newbanjob.dm | 69 ++- .../admin/permissionverbs/permissionedit.dm | 18 +- code/modules/admin/sql_notes.dm | 12 +- code/modules/admin/stickyban.dm | 27 +- code/modules/admin/topic.dm | 423 ++++++++++++------ code/modules/admin/verbs/BrokenInhands.dm | 6 +- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 51 ++- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 3 +- code/modules/admin/verbs/adminhelp.dm | 18 +- code/modules/admin/verbs/adminjump.dm | 9 +- code/modules/admin/verbs/adminpm.dm | 60 ++- code/modules/admin/verbs/adminsay.dm | 6 +- code/modules/admin/verbs/antag-ooc.dm | 3 +- code/modules/admin/verbs/atmosdebug.dm | 33 +- code/modules/admin/verbs/custom_event.dm | 33 +- code/modules/admin/verbs/deadsay.dm | 6 +- code/modules/admin/verbs/debug.dm | 96 ++-- code/modules/admin/verbs/diagnostics.dm | 18 +- code/modules/admin/verbs/dice.dm | 6 +- code/modules/admin/verbs/freeze.dm | 21 +- code/modules/admin/verbs/getlogs.dm | 35 +- code/modules/admin/verbs/honksquad.dm | 15 +- code/modules/admin/verbs/mapping.dm | 6 +- code/modules/admin/verbs/massmodvar.dm | 36 +- code/modules/admin/verbs/modifyvariables.dm | 78 ++-- code/modules/admin/verbs/one_click_antag.dm | 15 +- code/modules/admin/verbs/onlyone.dm | 18 +- code/modules/admin/verbs/onlyoneteam.dm | 12 +- code/modules/admin/verbs/playsound.dm | 18 +- code/modules/admin/verbs/possess.dm | 3 +- code/modules/admin/verbs/pray.dm | 30 +- code/modules/admin/verbs/randomverbs.dm | 121 +++-- code/modules/admin/verbs/striketeam.dm | 12 +- .../admin/verbs/striketeam_syndicate.dm | 9 +- code/modules/admin/verbs/ticklag.dm | 3 +- code/modules/admin/verbs/tripAI.dm | 12 +- code/modules/admin/watchlist.dm | 6 +- code/modules/arcade/arcade_base.dm | 39 +- code/modules/arcade/prize_counter.dm | 12 +- code/modules/assembly/assembly.dm | 15 +- code/modules/assembly/bomb.dm | 9 +- code/modules/assembly/holder.dm | 18 +- code/modules/assembly/mousetrap.dm | 15 +- code/modules/assembly/shock_kit.dm | 3 +- .../implementation/digital_valves.dm | 3 +- .../implementation/emitters.dm | 3 +- .../implementation/vent_pump.dm | 3 +- .../awaymissions/bluespaceartillery.dm | 3 +- code/modules/awaymissions/gateway.dm | 21 +- code/modules/awaymissions/maploader/writer.dm | 3 +- .../awaymissions/mission_code/wildwest.dm | 108 +++-- code/modules/awaymissions/trigger.dm | 3 +- code/modules/client/asset_cache.dm | 3 +- code/modules/client/client procs.dm | 96 ++-- code/modules/client/preferences.dm | 18 +- code/modules/client/preferences_toggles.dm | 95 ++-- code/modules/clothing/clothing.dm | 76 ++-- code/modules/clothing/glasses/glasses.dm | 21 +- code/modules/clothing/gloves/rings.dm | 12 +- code/modules/clothing/head/hardhat.dm | 4 +- code/modules/clothing/head/helmet.dm | 3 +- code/modules/clothing/head/misc_special.dm | 12 +- code/modules/clothing/head/soft_caps.dm | 6 +- code/modules/clothing/masks/gasmask.dm | 27 +- code/modules/clothing/masks/voice.dm | 6 +- code/modules/clothing/shoes/magboots.dm | 6 +- code/modules/clothing/spacesuits/alien.dm | 16 +- code/modules/clothing/spacesuits/breaches.dm | 24 +- .../modules/clothing/spacesuits/chronosuit.dm | 49 +- code/modules/clothing/spacesuits/ert.dm | 6 +- code/modules/clothing/spacesuits/plasmamen.dm | 10 +- code/modules/clothing/spacesuits/rig.dm | 77 ++-- .../clothing/spacesuits/rig/modules/combat.dm | 21 +- .../spacesuits/rig/modules/computer.dm | 69 ++- .../spacesuits/rig/modules/modules.dm | 51 ++- .../clothing/spacesuits/rig/modules/ninja.dm | 15 +- .../spacesuits/rig/modules/utility.dm | 48 +- .../clothing/spacesuits/rig/modules/vision.dm | 9 +- code/modules/clothing/spacesuits/rig/rig.dm | 107 +++-- .../clothing/spacesuits/rig/rig_attackby.dm | 66 ++- .../clothing/spacesuits/rig/rig_pieces.dm | 4 +- .../clothing/spacesuits/rig/rig_verbs.dm | 75 ++-- code/modules/clothing/suits/armor.dm | 6 +- code/modules/clothing/suits/miscellaneous.dm | 6 +- .../clothing/under/accessories/accessory.dm | 33 +- .../clothing/under/accessories/holster.dm | 24 +- .../clothing/under/accessories/storage.dm | 3 +- code/modules/clothing/under/chameleon.dm | 12 +- code/modules/computer3/bios.dm | 18 +- code/modules/computer3/buildandrepair.dm | 81 ++-- code/modules/computer3/component.dm | 78 ++-- code/modules/computer3/computer.dm | 12 +- .../computer3/computers/atmos_alert.dm | 6 +- code/modules/computer3/computers/camera.dm | 3 +- code/modules/computer3/computers/cloning.dm | 6 +- .../computer3/computers/communications.dm | 27 +- code/modules/computer3/computers/law.dm | 33 +- code/modules/computer3/computers/medical.dm | 3 +- code/modules/computer3/computers/message.dm | 17 +- code/modules/computer3/computers/prisoner.dm | 3 +- .../computer3/computers/prisonshuttle.dm | 33 +- code/modules/computer3/computers/robot.dm | 18 +- .../computer3/computers/scanconsole.dm | 12 +- code/modules/computer3/computers/security.dm | 3 +- code/modules/computer3/computers/shuttle.dm | 24 +- .../computer3/computers/specops_shuttle.dm | 24 +- .../computer3/computers/syndicate_shuttle.dm | 3 +- .../computers/syndicate_specops_shuttle.dm | 24 +- code/modules/computer3/laptop.dm | 39 +- code/modules/computer3/lapvend.dm | 18 +- code/modules/computer3/storage.dm | 9 +- code/modules/computer3/upload/programs.dm | 3 +- code/modules/crafting/guncrafting.dm | 15 +- code/modules/crafting/table.dm | 9 +- code/modules/customitems/item_defines.dm | 45 +- code/modules/customitems/item_spawning.dm | 6 +- code/modules/detective_work/evidence.dm | 12 +- code/modules/detective_work/scanner.dm | 21 +- code/modules/economy/ATM.dm | 36 +- code/modules/economy/EFTPOS.dm | 36 +- code/modules/economy/POS.dm | 9 +- code/modules/economy/utils.dm | 6 +- .../modules/events/communications_blackout.dm | 18 +- code/modules/events/event_manager.dm | 6 +- code/modules/events/holidays/Holidays.dm | 6 +- code/modules/events/ion_storm.dm | 9 +- code/modules/events/prison_break.dm | 3 +- code/modules/events/undead.dm | 3 +- code/modules/fish/fish_items.dm | 18 +- code/modules/fish/fishtank.dm | 54 ++- code/modules/flufftext/Dreaming.dm | 3 +- code/modules/flufftext/Hallucination.dm | 164 ++++--- code/modules/food/cooker.dm | 15 +- code/modules/food/customizables.dm | 15 +- code/modules/food/icecream_vat.dm | 15 +- code/modules/food/oven.dm | 6 +- .../garbage_collection/garbage_collector.dm | 3 +- code/modules/garbage_collection/gc_testing.dm | 15 +- code/modules/holiday/holiday.dm | 3 +- code/modules/hydroponics/grown.dm | 93 ++-- code/modules/hydroponics/grown_inedible.dm | 33 +- code/modules/hydroponics/seed.dm | 23 +- code/modules/hydroponics/seed_controller.dm | 12 +- code/modules/hydroponics/seed_machines.dm | 27 +- code/modules/hydroponics/seed_packets.dm | 3 +- code/modules/hydroponics/seed_storage.dm | 6 +- .../hydroponics/spreading/spreading.dm | 6 +- .../spreading/spreading_response.dm | 3 +- code/modules/hydroponics/trays/tray.dm | 121 +++-- code/modules/hydroponics/trays/tray_apiary.dm | 48 +- code/modules/hydroponics/trays/tray_tools.dm | 12 +- .../hydroponics/trays/tray_update_icons.dm | 3 +- code/modules/karma/karma.dm | 87 ++-- code/modules/library/lib_items.dm | 75 ++-- code/modules/library/lib_machines.dm | 9 +- .../media/broadcast/receivers/radio.dm | 6 +- .../media/broadcast/transmitters/broadcast.dm | 15 +- code/modules/media/jukebox.dm | 9 +- code/modules/media/mediamanager.dm | 9 +- code/modules/mining/abandonedcrates.dm | 39 +- code/modules/mining/coins.dm | 15 +- code/modules/mining/equipment_locker.dm | 83 ++-- code/modules/mining/laborcamp/laborshuttle.dm | 6 +- code/modules/mining/laborcamp/laborstacker.dm | 46 +- code/modules/mining/manufacturing.dm | 57 ++- code/modules/mining/mine_items.dm | 9 +- code/modules/mining/mine_turfs.dm | 33 +- code/modules/mining/mint.dm | 3 +- code/modules/mining/money_bag.dm | 6 +- code/modules/mining/ore.dm | 9 +- code/modules/mining/satchel_ore_boxdm.dm | 18 +- code/modules/mob/dead/observer/observer.dm | 120 +++-- code/modules/mob/dead/observer/say.dm | 6 +- code/modules/mob/dead/observer/spells.dm | 3 +- code/modules/mob/emote.dm | 15 +- code/modules/mob/hear_say.dm | 24 +- code/modules/mob/holder.dm | 15 +- code/modules/mob/language.dm | 6 +- code/modules/mob/living/autohiss.dm | 12 +- code/modules/mob/living/carbon/alien/alien.dm | 3 +- .../mob/living/carbon/alien/alien_defenses.dm | 9 +- .../carbon/alien/humanoid/alien_powers.dm | 39 +- .../carbon/alien/humanoid/caste/drone.dm | 9 +- .../carbon/alien/humanoid/caste/hunter.dm | 9 +- .../carbon/alien/humanoid/caste/sentinel.dm | 3 +- .../mob/living/carbon/alien/humanoid/emote.dm | 3 +- .../living/carbon/alien/humanoid/empress.dm | 3 +- .../living/carbon/alien/humanoid/humanoid.dm | 21 +- .../mob/living/carbon/alien/humanoid/life.dm | 3 +- .../mob/living/carbon/alien/humanoid/queen.dm | 9 +- .../mob/living/carbon/alien/larva/emote.dm | 9 +- .../mob/living/carbon/alien/larva/larva.dm | 21 +- .../mob/living/carbon/alien/larva/powers.dm | 33 +- code/modules/mob/living/carbon/alien/life.dm | 3 +- .../carbon/alien/special/alien_embryo.dm | 25 +- .../living/carbon/alien/special/facehugger.dm | 9 +- code/modules/mob/living/carbon/brain/MMI.dm | 24 +- .../mob/living/carbon/brain/brain_item.dm | 9 +- code/modules/mob/living/carbon/brain/emote.dm | 21 +- code/modules/mob/living/carbon/brain/life.dm | 14 +- .../mob/living/carbon/brain/posibrain.dm | 54 ++- code/modules/mob/living/carbon/brain/say.dm | 3 +- code/modules/mob/living/carbon/carbon.dm | 78 ++-- code/modules/mob/living/carbon/give.dm | 34 +- code/modules/mob/living/carbon/human/emote.dm | 15 +- .../mob/living/carbon/human/examine.dm | 9 +- code/modules/mob/living/carbon/human/human.dm | 184 +++++--- .../living/carbon/human/human_attackhand.dm | 45 +- .../mob/living/carbon/human/human_damage.dm | 9 +- .../mob/living/carbon/human/human_defense.dm | 15 +- .../mob/living/carbon/human/inventory.dm | 46 +- code/modules/mob/living/carbon/human/life.dm | 61 ++- code/modules/mob/living/carbon/human/login.dm | 3 +- .../mob/living/carbon/human/species/apollo.dm | 18 +- .../living/carbon/human/species/plasmaman.dm | 12 +- .../living/carbon/human/species/species.dm | 6 +- .../living/carbon/human/species/station.dm | 39 +- .../mob/living/carbon/human/update_icons.dm | 6 +- code/modules/mob/living/carbon/life.dm | 3 +- code/modules/mob/living/carbon/slime/emote.dm | 9 +- .../mob/living/carbon/slime/examine.dm | 3 +- .../modules/mob/living/carbon/slime/powers.dm | 68 ++- code/modules/mob/living/carbon/slime/slime.dm | 27 +- code/modules/mob/living/carbon/superheroes.dm | 70 ++- code/modules/mob/living/default_language.dm | 12 +- code/modules/mob/living/living.dm | 60 ++- code/modules/mob/living/living_defense.dm | 27 +- code/modules/mob/living/login.dm | 3 +- code/modules/mob/living/say.dm | 15 +- code/modules/mob/living/silicon/ai/ai.dm | 149 ++++-- code/modules/mob/living/silicon/ai/examine.dm | 3 +- .../living/silicon/ai/freelook/cameranet.dm | 3 +- .../mob/living/silicon/ai/freelook/eye.dm | 6 +- .../modules/mob/living/silicon/ai/latejoin.dm | 3 +- code/modules/mob/living/silicon/ai/laws.dm | 3 +- code/modules/mob/living/silicon/ai/life.dm | 58 ++- code/modules/mob/living/silicon/ai/say.dm | 15 +- code/modules/mob/living/silicon/laws.dm | 9 +- code/modules/mob/living/silicon/pai/emote.dm | 3 +- .../modules/mob/living/silicon/pai/examine.dm | 3 +- code/modules/mob/living/silicon/pai/life.dm | 3 +- code/modules/mob/living/silicon/pai/pai.dm | 60 ++- .../mob/living/silicon/pai/personality.dm | 12 +- .../modules/mob/living/silicon/pai/recruit.dm | 3 +- code/modules/mob/living/silicon/pai/say.dm | 3 +- .../mob/living/silicon/pai/software.dm | 3 +- .../living/silicon/pai/software_modules.dm | 24 +- .../mob/living/silicon/robot/component.dm | 63 ++- .../mob/living/silicon/robot/drone/drone.dm | 78 ++-- .../silicon/robot/drone/drone_abilities.dm | 12 +- .../silicon/robot/drone/drone_console.dm | 33 +- .../living/silicon/robot/drone/drone_items.dm | 27 +- .../silicon/robot/drone/drone_manufacturer.dm | 30 +- .../living/silicon/robot/drone/drone_say.dm | 11 +- .../modules/mob/living/silicon/robot/emote.dm | 9 +- .../mob/living/silicon/robot/examine.dm | 3 +- .../mob/living/silicon/robot/inventory.dm | 9 +- code/modules/mob/living/silicon/robot/laws.dm | 27 +- code/modules/mob/living/silicon/robot/life.dm | 15 +- .../mob/living/silicon/robot/photos.dm | 3 +- .../modules/mob/living/silicon/robot/robot.dm | 201 ++++++--- .../mob/living/silicon/robot/robot_damage.dm | 18 +- .../mob/living/silicon/robot/robot_items.dm | 3 +- code/modules/mob/living/silicon/say.dm | 23 +- code/modules/mob/living/silicon/silicon.dm | 39 +- code/modules/mob/living/simple_animal/bees.dm | 3 +- .../mob/living/simple_animal/bot/bot.dm | 144 ++++-- .../mob/living/simple_animal/bot/cleanbot.dm | 15 +- .../living/simple_animal/bot/construction.dm | 93 ++-- .../mob/living/simple_animal/bot/ed209bot.dm | 3 +- .../mob/living/simple_animal/bot/floorbot.dm | 9 +- .../mob/living/simple_animal/bot/medbot.dm | 12 +- .../mob/living/simple_animal/bot/mulebot.dm | 51 ++- .../mob/living/simple_animal/bot/secbot.dm | 3 +- .../mob/living/simple_animal/constructs.dm | 6 +- .../living/simple_animal/friendly/corgi.dm | 55 ++- .../simple_animal/friendly/corgi_powers.dm | 6 +- .../mob/living/simple_animal/friendly/crab.dm | 30 +- .../living/simple_animal/friendly/diona.dm | 42 +- .../simple_animal/friendly/farm_animals.dm | 24 +- .../living/simple_animal/friendly/mouse.dm | 12 +- .../living/simple_animal/friendly/slime.dm | 3 +- .../simple_animal/friendly/spiderbot.dm | 66 ++- .../simple_animal/hostile/giant_spider.dm | 9 +- .../living/simple_animal/hostile/headcrab.dm | 6 +- .../simple_animal/hostile/mining_mobs.dm | 27 +- .../living/simple_animal/hostile/mushroom.dm | 9 +- .../living/simple_animal/hostile/statue.dm | 6 +- .../living/simple_animal/hostile/syndicate.dm | 3 +- .../simple_animal/hostile/winter_mobs.dm | 12 +- .../mob/living/simple_animal/parrot.dm | 39 +- .../mob/living/simple_animal/powers.dm | 12 +- .../modules/mob/living/simple_animal/shade.dm | 3 +- .../mob/living/simple_animal/simple_animal.dm | 26 +- .../mob/living/simple_animal/tribbles.dm | 24 +- code/modules/mob/living/simple_animal/vox.dm | 21 +- code/modules/mob/mob.dm | 101 +++-- code/modules/mob/mob_grab.dm | 28 +- code/modules/mob/mob_helpers.dm | 18 +- code/modules/mob/mob_movement.dm | 30 +- code/modules/mob/mob_transformation_simple.dm | 12 +- code/modules/mob/new_player/login.dm | 6 +- code/modules/mob/new_player/new_player.dm | 41 +- code/modules/mob/new_player/poll.dm | 42 +- code/modules/mob/say.dm | 6 +- code/modules/mob/spirit/mask/mask.dm | 27 +- code/modules/mob/spirit/movement.dm | 9 +- code/modules/mob/spirit/spirit.dm | 9 +- code/modules/mob/spirit/viewpoint.dm | 41 +- code/modules/mob/transform_procs.dm | 28 +- code/modules/mob/typing_indicator.dm | 3 +- code/modules/nano/modules/crew_monitor.dm | 3 +- code/modules/nano/modules/law_manager.dm | 9 +- code/modules/nano/nanomapgen.dm | 15 +- code/modules/nano/nanoui.dm | 4 +- code/modules/ninja/energy_katana.dm | 3 +- code/modules/ninja/martial_art.dm | 27 +- code/modules/ninja/suit/SpiderOS.dm | 27 +- code/modules/ninja/suit/suit.dm | 15 +- code/modules/ninja/suit/suit_attackby.dm | 9 +- .../modules/ninja/suit/suit_initialisation.dm | 60 ++- code/modules/paperwork/carbonpaper.dm | 6 +- code/modules/paperwork/clipboard.dm | 9 +- code/modules/paperwork/faxmachine.dm | 15 +- code/modules/paperwork/filingcabinet.dm | 18 +- code/modules/paperwork/folders.dm | 3 +- code/modules/paperwork/frames.dm | 24 +- code/modules/paperwork/handlabeler.dm | 30 +- code/modules/paperwork/paper.dm | 27 +- code/modules/paperwork/paper_bundle.dm | 27 +- code/modules/paperwork/paperbin.dm | 24 +- code/modules/paperwork/pen.dm | 15 +- code/modules/paperwork/photocopier.dm | 24 +- code/modules/paperwork/photography.dm | 45 +- code/modules/paperwork/silicon_photography.dm | 27 +- code/modules/pda/PDA.dm | 48 +- code/modules/pda/ai.dm | 12 +- code/modules/pda/app.dm | 3 +- code/modules/pda/chatroom.dm | 3 +- code/modules/pda/messenger.dm | 12 +- code/modules/pda/radio.dm | 3 +- code/modules/pda/utilities.dm | 34 +- code/modules/power/apc.dm | 179 +++++--- code/modules/power/cable.dm | 75 ++-- code/modules/power/cable_heavyduty.dm | 6 +- code/modules/power/cell.dm | 12 +- code/modules/power/generator.dm | 3 +- code/modules/power/generator_type2.dm | 3 +- code/modules/power/gravitygenerator.dm | 15 +- code/modules/power/lighting.dm | 75 ++-- code/modules/power/port_gen.dm | 38 +- code/modules/power/singularity/collector.dm | 24 +- code/modules/power/singularity/emitter.dm | 54 ++- .../power/singularity/field_generator.dm | 21 +- code/modules/power/singularity/narsie.dm | 21 +- .../particle_accelerator.dm | 15 +- .../particle_accelerator/particle_control.dm | 3 +- code/modules/power/singularity/singularity.dm | 3 +- code/modules/power/smes.dm | 36 +- code/modules/power/solar.dm | 9 +- code/modules/power/supermatter/sm_shard.dm | 6 +- code/modules/power/supermatter/supermatter.dm | 7 +- code/modules/power/switch.dm | 12 +- code/modules/power/tesla/energy_ball.dm | 3 +- code/modules/power/treadmill.dm | 3 +- code/modules/power/turbine.dm | 12 +- .../procedural_mapping/mapGenerator.dm | 36 +- code/modules/projectiles/ammunition.dm | 19 +- code/modules/projectiles/gun.dm | 45 +- code/modules/projectiles/guns/alien.dm | 9 +- .../projectiles/guns/energy/advtaser.dm | 6 +- .../projectiles/guns/energy/blueshield.dm | 6 +- code/modules/projectiles/guns/energy/hos.dm | 9 +- code/modules/projectiles/guns/energy/laser.dm | 6 +- .../projectiles/guns/energy/nuclear.dm | 24 +- code/modules/projectiles/guns/energy/pulse.dm | 12 +- .../projectiles/guns/energy/special.dm | 39 +- .../projectiles/guns/energy/temperature.dm | 3 +- code/modules/projectiles/guns/magic.dm | 6 +- code/modules/projectiles/guns/magic/wand.dm | 18 +- code/modules/projectiles/guns/projectile.dm | 30 +- .../projectiles/guns/projectile/automatic.dm | 33 +- .../projectiles/guns/projectile/crossbow.dm | 80 ++-- .../guns/projectile/grenade launcher.dm | 9 +- .../projectiles/guns/projectile/revolver.dm | 39 +- .../projectiles/guns/projectile/rocket.dm | 15 +- .../projectiles/guns/projectile/shotgun.dm | 27 +- code/modules/projectiles/guns/syringe_gun.dm | 15 +- code/modules/projectiles/medbeam.dm | 3 +- code/modules/projectiles/projectile.dm | 18 +- code/modules/projectiles/projectile/beams.dm | 15 +- code/modules/projectiles/projectile/magic.dm | 15 +- code/modules/projectiles/targeting.dm | 78 ++-- code/modules/reagents/Chemistry-Holder.dm | 12 +- code/modules/reagents/Chemistry-Machinery.dm | 69 ++- code/modules/reagents/Chemistry-Readme.dm | 9 +- code/modules/reagents/dartgun.dm | 45 +- code/modules/reagents/grenade_launcher.dm | 30 +- .../modules/reagents/newchem/Blob-Reagents.dm | 3 +- code/modules/reagents/newchem/chem_heater.dm | 6 +- code/modules/reagents/newchem/disease.dm | 3 +- code/modules/reagents/newchem/drinks.dm | 6 +- code/modules/reagents/newchem/drugs.dm | 48 +- code/modules/reagents/newchem/food.dm | 61 ++- code/modules/reagents/newchem/medicine.dm | 21 +- .../modules/reagents/newchem/newchem_procs.dm | 24 +- code/modules/reagents/newchem/other.dm | 6 +- code/modules/reagents/newchem/pyro.dm | 24 +- code/modules/reagents/newchem/toxins.dm | 87 ++-- .../chemical_reaction_slime.dm | 3 +- .../oldchem/reagents/_reagent_base.dm | 6 +- .../reagents/drink/reagents_alcohol.dm | 9 +- .../oldchem/reagents/reagents_food.dm | 3 +- .../oldchem/reagents/reagents_toxin.dm | 39 +- .../oldchem/reagents/reagents_water.dm | 21 +- code/modules/reagents/pandemic.dm | 6 +- code/modules/reagents/reagent_containers.dm | 6 +- .../reagents/reagent_containers/borghydro.dm | 21 +- .../reagents/reagent_containers/dropper.dm | 21 +- .../reagents/reagent_containers/drugs.dm | 27 +- .../reagents/reagent_containers/food/cans.dm | 27 +- .../reagent_containers/food/condiment.dm | 34 +- .../reagent_containers/food/drinks.dm | 49 +- .../reagent_containers/food/sandwich.dm | 15 +- .../reagent_containers/food/snacks.dm | 72 ++- .../reagent_containers/food/snacks/meat.dm | 3 +- .../reagent_containers/glass_containers.dm | 57 ++- .../reagents/reagent_containers/hypospray.dm | 18 +- .../reagents/reagent_containers/pill.dm | 6 +- .../reagent_containers/robodropper.dm | 21 +- .../reagents/reagent_containers/spray.dm | 24 +- .../reagents/reagent_containers/syringes.dm | 87 ++-- code/modules/reagents/reagent_dispenser.dm | 15 +- code/modules/recycling/conveyor2.dm | 3 +- .../recycling/disposal-construction.dm | 36 +- code/modules/recycling/disposal.dm | 81 ++-- code/modules/recycling/sortingmachinery.dm | 42 +- code/modules/research/circuitprinter.dm | 18 +- code/modules/research/destructive_analyzer.dm | 18 +- code/modules/research/experimentor.dm | 51 ++- code/modules/research/message_server.dm | 6 +- code/modules/research/protolathe.dm | 15 +- code/modules/research/rdconsole.dm | 27 +- code/modules/research/rdmachines.dm | 9 +- code/modules/research/server.dm | 6 +- .../xenoarchaeology/artifact/artifact.dm | 9 +- .../artifact/artifact_gigadrill.dm | 6 +- .../artifact/artifact_unknown.dm | 15 +- .../artifact/effects/unknown_affect_cold.dm | 3 +- .../effects/unknown_effect_badfeeling.dm | 18 +- .../effects/unknown_effect_cellcharge.dm | 9 +- .../effects/unknown_effect_celldrain.dm | 9 +- .../effects/unknown_effect_dnaswitch.dm | 42 +- .../effects/unknown_effect_goodfeeling.dm | 18 +- .../artifact/effects/unknown_effect_heal.dm | 9 +- .../artifact/effects/unknown_effect_heat.dm | 3 +- .../artifact/effects/unknown_effect_hurt.dm | 9 +- .../effects/unknown_effect_roboheal.dm | 9 +- .../effects/unknown_effect_robohurt.dm | 10 +- .../artifact/effects/unknown_effect_sleepy.dm | 18 +- .../artifact/effects/unknown_effect_stun.dm | 12 +- .../effects/unknown_effect_teleport.dm | 9 +- .../research/xenoarchaeology/chemistry.dm | 3 +- .../xenoarchaeology/finds/finds_fossils.dm | 3 +- .../xenoarchaeology/finds/finds_misc.dm | 3 +- .../xenoarchaeology/finds/finds_special.dm | 6 +- .../finds/finds_talkingitem.dm | 12 +- .../xenoarchaeology/genetics/reconstitutor.dm | 6 +- .../machinery/artifact_harvester.dm | 6 +- .../machinery/geosample_scanner.dm | 18 +- .../tools/ano_device_battery.dm | 6 +- .../xenoarchaeology/tools/bunsen_burner.dm | 15 +- .../tools/suspension_generator.dm | 66 ++- .../xenoarchaeology/tools/tools_anoscanner.dm | 3 +- .../tools/tools_coresampler.dm | 27 +- .../tools/tools_depthscanner.dm | 6 +- .../research/xenobiology/xenobio_camera.dm | 3 +- .../research/xenobiology/xenobiology.dm | 96 ++-- code/modules/scripting/Parser/Keywords.dm | 8 +- .../security_levels/keycard authentication.dm | 27 +- code/modules/shuttle/assault_pod.dm | 3 +- code/modules/shuttle/emergency.dm | 21 +- code/modules/shuttle/shuttle.dm | 19 +- code/modules/shuttle/supply.dm | 12 +- code/modules/shuttle/syndicate.dm | 6 +- code/modules/surgery/dental_implant.dm | 3 +- code/modules/surgery/helpers.dm | 6 +- code/modules/surgery/implant.dm | 27 +- code/modules/surgery/organs/augments_eyes.dm | 6 +- .../surgery/organs/augments_internal.dm | 42 +- code/modules/surgery/organs/autoimplanter.dm | 15 +- code/modules/surgery/organs/blood.dm | 12 +- code/modules/surgery/organs/body_egg.dm | 3 +- code/modules/surgery/organs/organ.dm | 3 +- code/modules/surgery/organs/organ_external.dm | 6 +- code/modules/surgery/organs/organ_internal.dm | 9 +- code/modules/surgery/organs/pain.dm | 6 +- code/modules/surgery/organs/parasites.dm | 3 +- .../surgery/organs/subtypes/machine.dm | 3 +- code/modules/surgery/organs_internal.dm | 24 +- code/modules/surgery/other.dm | 6 +- code/modules/surgery/robotics.dm | 54 ++- code/modules/surgery/surgery.dm | 3 +- code/modules/surgery/tools.dm | 10 +- code/modules/telesci/telepad.dm | 33 +- code/modules/telesci/telesci_computer.dm | 15 +- code/modules/vehicle/train/train.dm | 30 +- .../modules/vehicle/train/trains/ambulance.dm | 30 +- .../vehicle/train/trains/cargo/cargo_train.dm | 27 +- code/modules/vehicle/vehicle.dm | 21 +- code/world.dm | 49 +- 1054 files changed, 17612 insertions(+), 8898 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 3686bc46d2f..6ea62424cf2 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -153,7 +153,8 @@ Pipelines + Other Objects -> Pipe network if(can_unwrench && istype(W, /obj/item/weapon/wrench)) var/turf/T = get_turf(src) if (level == 1 && isturf(T) && T.intact) - user << "You must remove the plating first." + to_chat(user, "You must remove the plating first.") + return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() @@ -163,9 +164,11 @@ Pipelines + Other Objects -> Pipe network var/internal_pressure = int_air.return_pressure()-env_air.return_pressure() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You begin to unfasten \the [src]..." + to_chat(user, "You begin to unfasten \the [src]...") + if (internal_pressure > 2*ONE_ATMOSPHERE) - user << "As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?" + to_chat(user, "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 (do_after(user, 40, target = src) && isnull(gcDestroyed)) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 9fe7885c052..ebabc2e3c4b 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -134,7 +134,8 @@ return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return usr.set_machine(src) interact(user) @@ -158,7 +159,8 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if (on) - user << "You cannot unwrench this [src], turn it off first." + to_chat(user, "You cannot unwrench this [src], turn it off first.") + return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index f091135940b..5923825735e 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -157,7 +157,8 @@ Thus, the two variables affect pump operation are set in New(): return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return usr.set_machine(src) interact(user) @@ -188,6 +189,7 @@ Thus, the two variables affect pump operation are set in New(): if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) - user << "You cannot unwrench this [src], turn it off first." + to_chat(user, "You cannot unwrench this [src], turn it off first.") + return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index a46382ab085..9aae2337f1e 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -74,7 +74,8 @@ if(!powered()) return if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index c697251bc44..253504d773e 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -147,7 +147,8 @@ Thus, the two variables affect pump operation are set in New(): return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return usr.set_machine(src) interact(user) @@ -178,6 +179,7 @@ Thus, the two variables affect pump operation are set in New(): if (!istype(W, /obj/item/weapon/wrench)) return ..() if (!(stat & NOPOWER) && on) - user << "You cannot unwrench this [src], turn it off first." + to_chat(user, "You cannot unwrench this [src], turn it off first.") + return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index f1241079ad3..1ce0b673e16 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -104,11 +104,13 @@ int_pressure += P.air.return_pressure() var/datum/gas_mixture/env_air = loc.return_air() if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE) - user << "You cannot unwrench [src], it is too exerted due to internal pressure." + to_chat(user, "You cannot unwrench [src], it is too exerted due to internal pressure.") + add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You begin to unfasten \the [src]..." + to_chat(user, "You begin to unfasten \the [src]...") + if(do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index 7ec6d70d119..a61815351e7 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -153,7 +153,8 @@ Filter types: return if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return var/dat diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 5d33e3cb605..7e152b4e912 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -114,7 +114,8 @@ return src.add_fingerprint(usr) if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return usr.set_machine(src) var/dat = {"Power: [on?"On":"Off"]
diff --git a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm index 16df97b6ea6..2d727170750 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm @@ -135,7 +135,8 @@ if(!powered()) return if(!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index 92bdee806bf..c8ddd45a4ef 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -171,7 +171,8 @@ return 1 if(istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) - user << "You cannot unwrench this [src], turn if off first." + to_chat(user, "You cannot unwrench this [src], turn if off first.") + return 1 return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm index b9399f42e6c..347c44e3790 100644 --- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm @@ -36,7 +36,8 @@ /obj/machinery/atmospherics/unary/portables_connector/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) if(connected_device) - user << "You cannot unwrench this [src], detach [connected_device] first." + to_chat(user, "You cannot unwrench this [src], detach [connected_device] first.") + return 1 return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 3366777a081..2e065a97e43 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -322,7 +322,8 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) - user << "Now welding the vent." + to_chat(user, "Now welding the vent.") + if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -336,19 +337,23 @@ update_icon() else - user << "The welding tool needs to be on to start this task." + to_chat(user, "The welding tool needs to be on to start this task.") + else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return 1 if(istype(W, /obj/item/weapon/screwdriver)) if(!welded) if(open) - user << " Now closing the vent." + to_chat(user, " Now closing the vent.") + if (do_after(user, 20, target = src)) open = 0 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") else - user << " Now opening the vent." + to_chat(user, " Now opening the vent.") + if (do_after(user, 20, target = src)) open = 1 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") @@ -359,16 +364,19 @@ user.drop_item(W) W.forceMove(src) if(!open) - user << "You can't shove that down there when it is closed" + to_chat(user, "You can't shove that down there when it is closed") + else - user << "The vent is welded." + to_chat(user, "The vent is welded.") + return if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) return 1 if (istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) - user << "You cannot unwrench this [src], turn it off first." + to_chat(user, "You cannot unwrench this [src], turn it off first.") + return 1 return ..() @@ -383,7 +391,8 @@ /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) ..(user) if(welded) - user << "It seems welded shut." + to_chat(user, "It seems welded shut.") + /obj/machinery/atmospherics/unary/vent_pump/power_change() var/old_stat = stat diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index cc62e860bde..5808dd55dac 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -58,7 +58,8 @@ /obj/machinery/atmospherics/unary/vent_pump/examine(mob/user) ..(user) if(welded) - user << "It seems welded shut." + to_chat(user, "It seems welded shut.") + /obj/machinery/atmospherics/unary/vent_scrubber/auto_use_power() if(!powered(power_channel)) @@ -372,7 +373,8 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) - user << "Now welding the scrubber." + to_chat(user, "Now welding the scrubber.") + if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1) @@ -385,17 +387,20 @@ welded = 0 update_icon() else - user << "The welding tool needs to be on to start this task." + to_chat(user, "The welding tool needs to be on to start this task.") + return 1 else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return 1 if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) return 1 if (istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) - user << "You cannot unwrench this [src], turn it off first." + to_chat(user, "You cannot unwrench this [src], turn it off first.") + return 1 return ..() diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index d804dcb06a9..0f24997d67f 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -39,7 +39,8 @@ var/extension = copytext(path,-4,0) if( !fexists(path) || !(extension in valid_extensions) ) - src << "Error: browse_files(): File not found/Invalid file([path])." + to_chat(src, "Error: browse_files(): File not found/Invalid file([path]).") + return return path @@ -53,7 +54,8 @@ /client/proc/file_spam_check() var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) - src << "Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds." + to_chat(src, "Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.") + return 1 fileaccess_timer = world.time + FTPDELAY return 0 diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 26469903558..d33bb2c8d64 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -486,17 +486,23 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0, if(G.has_enabled_antagHUD) continue spawn(0) - G << 'sound/misc/notice2.ogg' //Alerting them to their consideration + to_chat(G, 'sound/misc/notice2.ogg')//Alerting them to their consideration + + switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No")) if("Yes") - G << "Choice registered: Yes." + to_chat(G, "Choice registered: Yes.") + if((world.time-time_passed)>poll_time)//If more than 30 game seconds passed. - G << "Sorry, you were too late for the consideration!" - G << 'sound/machines/buzz-sigh.ogg' + to_chat(G, "Sorry, you were too late for the consideration!") + + to_chat(G, 'sound/machines/buzz-sigh.ogg') + return candidates += G if("No") - G << "Choice registered: No." + to_chat(G, "Choice registered: No.") + return else return diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index 35b82c2fae3..c63c039f075 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -58,7 +58,8 @@ var/list/L = chemical_reactions_list[reaction] for(var/t in L) . += " has: [t]\n" - world << . + to_chat(world, .) + */ diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 3cddd31313b..5ae2ddb07a8 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -46,13 +46,16 @@ if(istype(AM)) if(AM.anchored) adjacencies |= 1 << direction + else if(AM) adjacencies |= 1 << direction + else for(var/direction in alldirs) if(find_type_in_direction(A, direction)) adjacencies |= 1 << direction + return adjacencies /proc/smooth_icon(atom/A) diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index bcfe46bc138..95529721619 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -167,7 +167,8 @@ mob Output_Icon() set name = "2. Output Icon" - src<<"Icon is: \icon[getFlatIcon(src)]" + to_chat(src, "Icon is: \icon[getFlatIcon(src)]") + Label_Icon() set name = "3. Label Icon" diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index 5e0a79887da..bcb9b3dcbb7 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -31,7 +31,8 @@ for(var/client/C in admins) if(check_rights(R_DEBUG, 0, C.mob) && (C.prefs.toggles & CHAT_DEBUGLOGS)) - C << "DEBUG: [text]" + to_chat(C, "DEBUG: [text]") + /proc/log_game(text) @@ -90,5 +91,6 @@ * Standardized method for tracking startup times. */ /proc/log_startup_progress(var/message) - world << "[message]" + to_chat(world, "[message]") + log_to_dd(message) \ No newline at end of file diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 70c597c2d7b..370fd92b75e 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -239,7 +239,8 @@ var/syndicate_code_response//Code response for traitors. set name = "Generate Code Phrase" set category = "Debug" - world << "\red Code Phrase is: \black [generate_code_phrase()]" + to_chat(world, "\red Code Phrase is: \black [generate_code_phrase()]") + return diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index f5e577f8b8a..2991b4c830a 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -251,7 +251,8 @@ Turf and target are seperate in case you want to teleport some distance from a t var/pressure = air_contents.return_pressure() var/total_moles = air_contents.total_moles() - user << "Results of analysis of \icon[icon] [target]." + to_chat(user, "Results of analysis of \icon[icon] [target].") + if(total_moles>0) var/o2_concentration = air_contents.oxygen/total_moles var/n2_concentration = air_contents.nitrogen/total_moles @@ -260,16 +261,24 @@ Turf and target are seperate in case you want to teleport some distance from a t var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) - user << "Pressure: [round(pressure,0.1)] kPa" - user << "Nitrogen: [round(n2_concentration*100)] %" - user << "Oxygen: [round(o2_concentration*100)] %" - user << "CO2: [round(co2_concentration*100)] %" - user << "Plasma: [round(plasma_concentration*100)] %" + to_chat(user, "Pressure: [round(pressure,0.1)] kPa") + + to_chat(user, "Nitrogen: [round(n2_concentration*100)] %") + + to_chat(user, "Oxygen: [round(o2_concentration*100)] %") + + to_chat(user, "CO2: [round(co2_concentration*100)] %") + + to_chat(user, "Plasma: [round(plasma_concentration*100)] %") + if(unknown_concentration>0.01) - user << "Unknown: [round(unknown_concentration*100)] %" - user << "Temperature: [round(air_contents.temperature-T0C)] °C" + to_chat(user, "Unknown: [round(unknown_concentration*100)] %") + + to_chat(user, "Temperature: [round(air_contents.temperature-T0C)] °C") + else - user << "[target] is empty!" + to_chat(user, "[target] is empty!") + return //Picks a string of symbols to display as the law number for hacked or ion laws @@ -1665,4 +1674,8 @@ var/global/list/g_fancy_list_of_types = null var/value = L[key] if(findtext("[key]", filter) || findtext("[value]", filter)) matches[key] = value - return matches + return matches + +// Use this to send to a client's chat, no exceptions (except this proc itself). +/proc/to_chat(var/thing, var/output) + thing << output diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index c0fb6204fe6..1405860b107 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -332,10 +332,12 @@ var/turf/U = get_turf(A) var/obj/structure/cable/cable = locate() in T if(!cable || !istype(cable)) - src << "There is no cable here to power the gloves." + to_chat(src, "There is no cable here to power the gloves.") + return if(world.time < G.next_shock) - src << "[G] aren't ready to shock again!" + to_chat(src, "[G] aren't ready to shock again!") + return src.visible_message("[name] fires an arc of electricity!", \ "You fire an arc of electricity!", \ diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index 82cc807d91b..520ef6b5078 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -27,10 +27,12 @@ /obj/item/weapon/badminBook/attack_self(mob/living/user as mob) if(user.middleClickOverride) - user<< "You try to draw power from the [src], but you cannot hold the power at this time!" + to_chat(user, "You try to draw power from the [src], but you cannot hold the power at this time!") + return user.middleClickOverride = clickBehavior - user << "You draw a bit of power from the [src], you can use middle click or alt click to release the power!" + to_chat(user, "You draw a bit of power from the [src], you can use middle click or alt click to release the power!") + /datum/middleClickOverride/badminClicker var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie @@ -38,6 +40,7 @@ /datum/middleClickOverride/badminClicker/onClick(var/atom/A, var/mob/living/user) var/atom/movable/newObject = new summon_path newObject.loc = get_turf(A) - user << "You release the power you had stored up, summoning \a [newObject.name]! " + to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ") + usr.loc.visible_message("[user] waves \his hand and summons \a [newObject.name]") ..() \ No newline at end of file diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 6fd00ba1f17..330f22366c1 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -53,7 +53,8 @@ if(is_component_functioning("camera")) aiCamera.captureimage(A, usr) else - src << "Your camera isn't functional." + to_chat(src, "Your camera isn't functional.") + return /* diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index 4461e1c8539..e5854c7a706 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -279,12 +279,14 @@ /datum/action/scan_mode/Activate() active = 1 owner.research_scanner = 1 - owner << " Research analyzer is now active." + to_chat(owner, " Research analyzer is now active.") + /datum/action/scan_mode/Deactivate() active = 0 owner.research_scanner = 0 - owner << " Research analyzer deactivated." + to_chat(owner, " Research analyzer deactivated.") + /datum/action/scan_mode/Grant(mob/living/T) devices += 1 diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 6d5da0da58e..6fbcb2456e6 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -195,6 +195,8 @@ datum/hud/New(mob/owner) //hud_used.reorganize_alerts() else - usr << "\red Inventory hiding is currently only supported for human mobs, sorry." + to_chat(usr, "\red Inventory hiding is currently only supported for human mobs, sorry.") + else - usr << "\red This mob type does not use a HUD." + to_chat(usr, "\red This mob type does not use a HUD.") + diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index b83bfcf411a..2350dff6a26 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -246,11 +246,13 @@ r.client.screen += r.throw_icon //"store" icon if(!r.module) - usr << "\red No module selected" + to_chat(usr, "\red No module selected") + return if(!r.module.modules) - usr << "\red Selected module has no modules to select" + to_chat(usr, "\red 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 68ed970a55d..417dd668d0f 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -95,7 +95,8 @@ if(!C.stat && !C.stunned && !C.paralysis && !C.restrained()) if(C.internal) C.internal = null - C << "No longer running on internals." + to_chat(C, "No longer running on internals.") + if(C.internals) C.internals.icon_state = "internal0" else @@ -108,7 +109,8 @@ no_mask = 1 if(no_mask) - C << "You are not wearing a suitable mask or helmet." + to_chat(C, "You are not wearing a suitable mask or helmet.") + return 1 else var/list/nicename = null @@ -189,7 +191,8 @@ //We've determined the best container now we set it as our internals if(best) - C << "You are now running on internals from [tankcheck[best]] [from] your [nicename[best]]." + to_chat(C, "You are now running on internals from [tankcheck[best]] [from] your [nicename[best]].") + C.internal = tankcheck[best] @@ -197,7 +200,8 @@ if(C.internals) C.internals.icon_state = "internal1" else - C << "You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank." + to_chat(C, "You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.") + /obj/screen/mov_intent name = "run/walk toggle" @@ -208,7 +212,8 @@ if(iscarbon(usr)) var/mob/living/carbon/C = usr if(C.legcuffed) - C << "You are legcuffed! You cannot run until you get [C.legcuffed] removed!" + to_chat(C, "You are legcuffed! You cannot run until you get [C.legcuffed] removed!") + C.m_intent = "walk" //Just incase C.hud_used.move_intent.icon_state = "walking" return 1 @@ -370,7 +375,8 @@ if(gun_click_time > world.time - 30) //give them 3 seconds between mode changes. return if(!istype(usr.get_active_hand(), /obj/item/weapon/gun)) - usr << "You need your gun in your active hand to do that!" + to_chat(usr, "You need your gun in your active hand to do that!") + return usr.client.AllowTargetClick() gun_click_time = world.time diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index cee8ad99533..2fe0c4c40db 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -17,7 +17,8 @@ user.changeNext_move(CLICK_CD_MELEE) if(stat == DEAD && !isnull(butcher_results)) //can we butcher it? if(istype(I, /obj/item/weapon/kitchen/knife)) - user << "You begin to butcher [src]..." + to_chat(user, "You begin to butcher [src]...") + playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) if(do_mob(user, src, 80)) harvest(user) @@ -79,7 +80,8 @@ if(istype(M, /mob/living/carbon/slime)) var/mob/living/carbon/slime/slime = M if(prob(25)) - user << "\red [src] passes right through [M]!" + to_chat(user, "\red [src] passes right through [M]!") + return if(power > 0) @@ -162,7 +164,8 @@ if(!showname && user) if(user.client) - user << "\red You attack [M] with [src]. " + to_chat(user, "\red You attack [M] with [src]. ") + @@ -184,7 +187,8 @@ if("fire") if (!(RESIST_COLD in M.mutations)) M.take_organ_damage(0, power) - M << "Aargh it burns!" + to_chat(M, "Aargh it burns!") + M.updatehealth() add_fingerprint(user) return 1 diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 891601d2d51..bdfbbfb839a 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -61,10 +61,12 @@ if(awaygate) user.forceMove(awaygate.loc) else - user << "[src] has no destination." + to_chat(user, "[src] has no destination.") + /obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) if(stationgate) user.forceMove(stationgate.loc) else - user << "[src] has no destination." + to_chat(user, "[src] has no destination.") + diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm index 17fb1005fa6..c4c454b067c 100644 --- a/code/_onclick/oldcode.dm +++ b/code/_onclick/oldcode.dm @@ -138,7 +138,8 @@ else t5 = in_range(src, usr) || src.loc == usr -// world << "according to dblclick(), t5 is [t5]" +// to_chat(world, "according to dblclick(), t5 is [t5]") + // ------- ACTUALLY DETERMINING STUFF ------- if (((t5 || (W && (W.flags & USEDELAY))) && !( istype(src, /obj/screen) ))) diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm index cf3fcd3313a..d497a12ef60 100644 --- a/code/_onclick/rig.dm +++ b/code/_onclick/rig.dm @@ -18,15 +18,19 @@ switch(hardsuit_click_mode) if(MIDDLE_CLICK) - src << "Hardsuit activation mode set to middle-click." + to_chat(src, "Hardsuit activation mode set to middle-click.") + if(ALT_CLICK) - src << "Hardsuit activation mode set to alt-click." + to_chat(src, "Hardsuit activation mode set to alt-click.") + if(CTRL_CLICK) - src << "Hardsuit activation mode set to control-click." + to_chat(src, "Hardsuit activation mode set to control-click.") + else // should never get here, but just in case: log_debug("Bad hardsuit click mode: [hardsuit_click_mode] - expected 0 to [MAX_HARDSUIT_CLICK_MODE]") - src << "Somehow you bugged the system. Setting your hardsuit mode to middle-click." + to_chat(src, "Somehow you bugged the system. Setting your hardsuit mode to middle-click.") + hardsuit_click_mode = MIDDLE_CLICK /mob/living/MiddleClickOn(atom/A) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 9b4dd88e67e..bf5691778f3 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -111,7 +111,8 @@ var/const/tk_maxrange = 15 if(focus) d = max(d,get_dist(user,focus)) // whichever is further if(d > tk_maxrange) - user << "Your mind won't reach that far." + to_chat(user, "Your mind won't reach that far.") + return if(!focus) diff --git a/code/controllers/Processes/inactivity.dm b/code/controllers/Processes/inactivity.dm index 57e82348572..188f017d960 100644 --- a/code/controllers/Processes/inactivity.dm +++ b/code/controllers/Processes/inactivity.dm @@ -8,7 +8,8 @@ if(C.is_afk(INACTIVITY_KICK)) if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") - C << "You have been inactive for more than 10 minutes and have been disconnected." + to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") + del(C) SCHECK diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm index f16d5b1c396..9ac4cd120af 100644 --- a/code/controllers/Processes/shuttles.dm +++ b/code/controllers/Processes/shuttles.dm @@ -92,30 +92,37 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 return if(world.time - round_start_time < config.shuttle_refuel_delay) - user << "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again." + to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.") + return switch(emergency.mode) if(SHUTTLE_RECALL) - user << "The emergency shuttle may not be called while returning to Centcom." + to_chat(user, "The emergency shuttle may not be called while returning to Centcom.") + return if(SHUTTLE_CALL) - user << "The emergency shuttle is already on its way." + to_chat(user, "The emergency shuttle is already on its way.") + return if(SHUTTLE_DOCKED) - user << "The emergency shuttle is already here." + to_chat(user, "The emergency shuttle is already here.") + return if(SHUTTLE_ESCAPE) - user << "The emergency shuttle is moving away to a safe distance." + to_chat(user, "The emergency shuttle is moving away to a safe distance.") + return if(SHUTTLE_STRANDED) - user << "The emergency shuttle has been disabled by Centcom." + to_chat(user, "The emergency shuttle has been disabled by Centcom.") + return call_reason = trim(html_encode(call_reason)) if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) - user << "You must provide a reason." + to_chat(user, "You must provide a reason.") + return var/area/signal_origin = get_area(user) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 2d98b267f95..757891f1f7d 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -688,7 +688,8 @@ var/list/datum/game_mode/runnable_modes = new for (var/T in subtypesof(/datum/game_mode)) var/datum/game_mode/M = new T() - //world << "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]" +// to_chat(world, "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]") + if (!(M.config_tag in modes)) qdel(M) continue @@ -697,5 +698,6 @@ continue if (M.can_start()) runnable_modes[M] = probabilities[M.config_tag] - //world << "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]" +// to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]") + return runnable_modes diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index a00017e2ed6..96310f6c93d 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -25,7 +25,8 @@ datum/controller/vote // No more change mode votes after the game has started. // 3 is GAME_STATE_PLAYING, but that #define is undefined for some reason if(mode == "gamemode" && ticker.current_state >= 2) - world << "Voting aborted due to game start." + to_chat(world, "Voting aborted due to game start.") + src.reset() return @@ -62,7 +63,8 @@ datum/controller/vote if(auto_muted && !config.ooc_allowed) auto_muted = 0 config.ooc_allowed = !( config.ooc_allowed ) - world << "The OOC channel has been automatically enabled due to vote end." + to_chat(world, "The OOC channel has been automatically enabled due to vote end.") + log_admin("OOC was toggled automatically due to vote end.") message_admins("OOC has been toggled on automatically.") @@ -103,7 +105,8 @@ datum/controller/vote else factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) - world << "Crew Transfer Factor: [factor]" + to_chat(world, "Crew Transfer Factor: [factor]") + greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) @@ -140,7 +143,8 @@ datum/controller/vote else text += "Vote Result: Inconclusive - No Votes!" log_vote(text) - world << "[text]" + to_chat(world, "[text]") + return . proc/result() @@ -160,7 +164,8 @@ datum/controller/vote master_mode = . if(!going) going = 1 - world << "The round will start soon." + to_chat(world, "The round will start soon.") + if("crew_transfer") if(. == "Initiate Crew Transfer") init_shift_change(null, 1) @@ -226,33 +231,41 @@ datum/controller/vote text += "\n[question]" log_vote(text) - world << "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote." + to_chat(world, "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.") + switch(vote_type) if("crew_transfer") - world << sound('sound/ambience/alarm4.ogg') + to_chat(world, sound('sound/ambience/alarm4.ogg')) + if("gamemode") - world << sound('sound/ambience/alarm4.ogg') + to_chat(world, sound('sound/ambience/alarm4.ogg')) + if("custom") - world << sound('sound/ambience/alarm4.ogg') + to_chat(world, sound('sound/ambience/alarm4.ogg')) + if(mode == "gamemode" && going) going = 0 - world << "Round start has been delayed." + to_chat(world, "Round start has been delayed.") + if(mode == "crew_transfer" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) - world << "The OOC channel has been automatically disabled due to a crew transfer vote." + to_chat(world, "The OOC channel has been automatically disabled due to a crew transfer vote.") + log_admin("OOC was toggled automatically due to crew_transfer vote.") message_admins("OOC has been toggled off automatically.") if(mode == "gamemode" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) - world << "The OOC channel has been automatically disabled due to the gamemode vote." + to_chat(world, "The OOC channel has been automatically disabled due to the gamemode vote.") + log_admin("OOC was toggled automatically due to gamemode vote.") message_admins("OOC has been toggled off automatically.") if(mode == "custom" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) - world << "The OOC channel has been automatically disabled due to a custom vote." + to_chat(world, "The OOC channel has been automatically disabled due to a custom vote.") + log_admin("OOC was toggled automatically due to custom vote.") message_admins("OOC has been toggled off automatically.") diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index b27cde4ba6f..f929de520b3 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -228,9 +228,11 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen if(law == zeroth_law_borg) continue if(law == zeroth_law) - who << "[law.get_index()]. [law.law]" + to_chat(who, "[law.get_index()]. [law.law]") + else - who << "[law.get_index()]. [law.law]" + to_chat(who, "[law.get_index()]. [law.law]") + /******************** * Stating Laws * diff --git a/code/datums/browser.dm b/code/datums/browser.dm index f2eff643eca..9d5e019aed8 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -153,7 +153,8 @@ winset(user, windowid, "on-close=\".windowclose [param]\"") - //world << "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]" +// to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]") + // the on-close client verb @@ -165,11 +166,13 @@ set hidden = 1 // hide this verb from the user's panel set name = ".windowclose" // no autocomplete on cmd line - //world << "windowclose: [atomref]" +// to_chat(world, "windowclose: [atomref]") + if(atomref!="null") // if passed a real atomref var/hsrc = locate(atomref) // find the reffed atom if(hsrc) - //world << "[src] Topic [href] [hsrc]" +// to_chat(world, "[src] Topic [href] [hsrc]") + usr = src.mob src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's return // Topic() proc via client.Topic() @@ -177,6 +180,7 @@ // no atomref specified (or not found) // so just reset the user mob's machine var if(src && src.mob) - //world << "[src] was [src.mob.machine], setting to null" +// to_chat(world, "[src] was [src.mob.machine], setting to null") + src.mob.unset_machine() return \ No newline at end of file diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm index eea90b687e6..88505af923d 100644 --- a/code/datums/cargoprofile.dm +++ b/code/datums/cargoprofile.dm @@ -642,7 +642,8 @@ if(istype(M) && (remaining > MOB_WORK)) //this is necessarily damaging var/damage = rand(1,5) - M << "\red The unloading machine grabs you with a hard metallic claw!" + to_chat(M, "\red The unloading machine grabs you with a hard metallic claw!") + if(M.client) M.client.eye = master M.client.perspective = EYE_PERSPECTIVE @@ -660,7 +661,8 @@ bruteloss += L.brute_dam if(bruteloss < 100) // requires tenderization M.apply_damage(rand(5,15),BRUTE) - M << "The machine is tearing you apart!" + to_chat(M, "The machine is tearing you apart!") + master.visible_message("\red [master] makes a squishy grinding noise.") return M.loc = master.loc @@ -698,7 +700,8 @@ if(remaining > MOB_WORK) //this is necessarily damaging var/damage = rand(1,5) - M << "\red The unloading machine grabs you with a hard metallic claw!" + to_chat(M, "\red The unloading machine grabs you with a hard metallic claw!") + if(M.client) M.client.eye = master M.client.perspective = EYE_PERSPECTIVE @@ -790,7 +793,8 @@ //stolen from boxing gloves code var/mob/living/carbon/human/M = W if((M.lying || (M.health - M.staminaloss < 25))&& !master.emagged) - M << "\The [src] gives you a break." + to_chat(M, "\The [src] gives you a break.") + master.sleep+=5 return 0 // Be polite var/punches = punch(M,remaining / PUNCH_WORK) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index ceb33b71959..49eeffa7bd3 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -7,7 +7,8 @@ if(!usr.client || !usr.client.holder) - usr << "\red You need to be an administrator to access this." + to_chat(usr, "\red You need to be an administrator to access this.") + return @@ -415,7 +416,8 @@ body html += " " for(var/i=0;i<4;i++) idx=(block*4)+i - bit=1 << idx + to_chat(bit=1, idx) + bv=value & bit html += "[bv?1:0]" html += "" @@ -438,7 +440,8 @@ body var/mob/M = locate(href_list["rename"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return var/new_name = sanitize(copytext(input(usr,"What would you like to name this mob?","Input a name",M.real_name) as text|null,1,MAX_NAME_LEN)) @@ -453,7 +456,8 @@ body var/D = locate(href_list["datumedit"]) if(!istype(D,/datum) && !istype(D,/client)) - usr << "This can only be used on instances of types /client or /datum" + to_chat(usr, "This can only be used on instances of types /client or /datum") + return modify_variables(D, href_list["varnameedit"], 1) @@ -463,13 +467,16 @@ body var/atom/D = locate(href_list["subject"]) if(!istype(D,/datum) && !istype(D,/client)) - usr << "This can only be used on instances of types /client or /datum" + to_chat(usr, "This can only be used on instances of types /client or /datum") + return if(!(href_list["var"] in D.vars)) - usr << "Unable to find variable specified." + to_chat(usr, "Unable to find variable specified.") + return var/value = D.vars[href_list["var"]] value ^= 1 << text2num(href_list["togbit"]) + D.vars[href_list["var"]] = value else if(href_list["varnamechange"] && href_list["datumchange"]) @@ -477,7 +484,8 @@ body var/D = locate(href_list["datumchange"]) if(!istype(D,/datum) && !istype(D,/client)) - usr << "This can only be used on instances of types /client or /datum" + to_chat(usr, "This can only be used on instances of types /client or /datum") + return modify_variables(D, href_list["varnamechange"], 0) @@ -487,7 +495,8 @@ body var/atom/A = locate(href_list["datummass"]) if(!istype(A)) - usr << "This can only be used on instances of type /atom" + to_chat(usr, "This can only be used on instances of type /atom") + return cmd_mass_modify_object_variables(A, href_list["varnamemass"]) @@ -497,7 +506,8 @@ body var/mob/M = locate(href_list["mob_player_panel"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return src.holder.show_player_panel(M) @@ -508,7 +518,8 @@ body var/mob/M = locate(href_list["give_spell"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return src.give_spell(M) @@ -520,7 +531,8 @@ body var/mob/M = locate(href_list["give_disease"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return src.give_disease(M) @@ -531,7 +543,8 @@ body var/mob/M = locate(href_list["godmode"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return src.cmd_admin_godmode(M) @@ -542,7 +555,8 @@ body var/mob/M = locate(href_list["gib"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return src.cmd_admin_gib(M) @@ -552,7 +566,8 @@ body var/mob/M = locate(href_list["build_mode"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return togglebuildmode(M) @@ -563,7 +578,8 @@ body var/mob/M = locate(href_list["drop_everything"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(usr.client) @@ -574,7 +590,8 @@ body var/mob/M = locate(href_list["direct_control"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(usr.client) @@ -585,7 +602,8 @@ body var/mob/living/carbon/human/H = locate(href_list["make_skeleton"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return var/confirm = alert("Are you sure you want to turn this mob into a skeleton?","Confirm Skeleton Transformation","Yes","No") @@ -602,9 +620,11 @@ body var/mob/M = locate(href_list["offer_control"]) if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return - M << "Control of your mob has been offered to dead players." + to_chat(M, "Control of your mob has been offered to dead players.") + log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.") message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts") var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100) @@ -612,12 +632,14 @@ body if(candidates.len) theghost = pick(candidates) - M << "Your mob has been taken over by a ghost!" + to_chat(M, "Your mob has been taken over by a ghost!") + message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])") M.ghostize() M.key = theghost.key else - M << "There were no ghosts willing to take control." + to_chat(M, "There were no ghosts willing to take control.") + message_admins("No ghosts were willing to take control of [key_name_admin(M)])") else if(href_list["delall"]) @@ -625,7 +647,8 @@ body var/obj/O = locate(href_list["delall"]) if(!isobj(O)) - usr << "This can only be used on instances of type /obj" + to_chat(usr, "This can only be used on instances of type /obj") + return var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel") @@ -647,7 +670,8 @@ body i++ qdel(Obj) if(!i) - usr << "No objects of this type exist" + 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_admin(usr)] deleted all objects of type [O_type] ([i] objects deleted)") @@ -658,7 +682,8 @@ body i++ qdel(Obj) if(!i) - usr << "No objects of this type exist" + 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_admin(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)") @@ -698,7 +723,8 @@ body var/atom/A = locate(href_list["explode"]) if(!isobj(A) && !ismob(A) && !isturf(A)) - usr << "This can only be done to instances of type /obj, /mob and /turf" + to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf") + return src.cmd_admin_explosion(A) @@ -709,7 +735,8 @@ body var/atom/A = locate(href_list["emp"]) if(!isobj(A) && !ismob(A) && !isturf(A)) - usr << "This can only be done to instances of type /obj, /mob and /turf" + to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf") + return src.cmd_admin_emp(A) @@ -720,7 +747,8 @@ body var/datum/D = locate(href_list["mark_object"]) if(!istype(D)) - usr << "This can only be done to instances of type /datum" + to_chat(usr, "This can only be done to instances of type /datum") + return src.holder.marked_datum = D @@ -740,7 +768,8 @@ body var/atom/A = locate(href_list["rotatedatum"]) if(!istype(A)) - usr << "This can only be done to instances of type /atom" + to_chat(usr, "This can only be done to instances of type /atom") + return switch(href_list["rotatedir"]) @@ -756,12 +785,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makemonkey"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("monkeyone"=href_list["makemonkey"])) @@ -770,12 +801,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makerobot"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makerobot"=href_list["makerobot"])) @@ -784,12 +817,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makealien"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makealien"=href_list["makealien"])) @@ -798,12 +833,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makeslime"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makeslime"=href_list["makeslime"])) @@ -812,12 +849,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makesuper"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makesuper"=href_list["makesuper"])) @@ -826,12 +865,14 @@ body var/mob/living/carbon/human/H = locate(href_list["makeai"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makeai"=href_list["makeai"])) @@ -840,7 +881,8 @@ body var/mob/currentMob = locate(href_list["makemask"]) if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!currentMob) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return holder.Topic(href, list("makemask"=href_list["makemask"])) @@ -850,29 +892,34 @@ body var/mob/living/carbon/human/H = locate(href_list["setspecies"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") + return var/new_species = input("Please choose a new species.","Species",null) as null|anything in all_species if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(H.set_species(new_species)) - usr << "Set species of [H] to [H.species]." + to_chat(usr, "Set species of [H] to [H.species].") + H.regenerate_icons() message_admins("[key_name_admin(usr)] has changed the species of [key_name_admin(H)] to [new_species]") log_admin("[key_name(usr)] has changed the species of [key_name(H)] to [new_species]") else - usr << "Failed! Something went wrong." + to_chat(usr, "Failed! Something went wrong.") + else if(href_list["addlanguage"]) if(!check_rights(R_SPAWN)) return var/mob/H = locate(href_list["addlanguage"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob" + to_chat(usr, "This can only be done to instances of type /mob") + return var/new_language = input("Please choose a language to add.","Language",null) as null|anything in all_languages @@ -881,26 +928,31 @@ body return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(H.add_language(new_language)) - usr << "Added [new_language] to [H]." + to_chat(usr, "Added [new_language] to [H].") + message_admins("[key_name_admin(usr)] has given [key_name_admin(H)] the language [new_language]") log_admin("[key_name(usr)] has given [key_name(H)] the language [new_language]") else - usr << "Mob already knows that language." + to_chat(usr, "Mob already knows that language.") + else if(href_list["remlanguage"]) if(!check_rights(R_SPAWN)) return var/mob/H = locate(href_list["remlanguage"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob" + to_chat(usr, "This can only be done to instances of type /mob") + return if(!H.languages.len) - usr << "This mob knows no languages." + to_chat(usr, "This mob knows no languages.") + return var/datum/language/rem_language = input("Please choose a language to remove.","Language",null) as null|anything in H.languages @@ -909,15 +961,18 @@ body return if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(H.remove_language(rem_language.name)) - usr << "Removed [rem_language] from [H]." + to_chat(usr, "Removed [rem_language] from [H].") + message_admins("[key_name_admin(usr)] has removed language [rem_language] from [key_name_admin(H)]") log_admin("[key_name(usr)] has removed language [rem_language] from [key_name(H)]") else - usr << "Mob doesn't know that language." + to_chat(usr, "Mob doesn't know that language.") + else if(href_list["addverb"]) if(!check_rights(R_DEBUG)) return @@ -925,7 +980,8 @@ body var/mob/living/H = locate(href_list["addverb"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob/living" + to_chat(usr, "This can only be done to instances of type /mob/living") + return var/list/possibleverbs = list() possibleverbs += "Cancel" // One for the top... @@ -942,7 +998,8 @@ body var/verb = input("Select a verb!", "Verbs",null) as anything in possibleverbs if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(!verb || verb == "Cancel") return @@ -957,11 +1014,13 @@ body var/mob/H = locate(href_list["remverb"]) if(!istype(H)) - usr << "This can only be done to instances of type /mob" + to_chat(usr, "This can only be done to instances of type /mob") + return var/verb = input("Please choose a verb to remove.","Verbs",null) as null|anything in H.verbs if(!H) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(!verb) return @@ -975,18 +1034,21 @@ body var/mob/living/carbon/M = locate(href_list["addorgan"]) if(!istype(M)) - usr << "This can only be done to instances of type /mob/living/carbon" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon") + return var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in subtypesof(/obj/item/organ)-/obj/item/organ if(!new_organ) return if(!M) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(locate(new_organ) in M.internal_organs) - usr << "Mob already has that organ." + to_chat(usr, "Mob already has that organ.") + return var/obj/item/organ/internal/organ = new new_organ organ.insert(M) @@ -998,20 +1060,24 @@ body var/mob/living/carbon/M = locate(href_list["remorgan"]) if(!istype(M)) - usr << "This can only be done to instances of type /mob/living/carbon" + to_chat(usr, "This can only be done to instances of type /mob/living/carbon") + return var/obj/item/organ/internal/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs if(!M) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return if(!(locate(rem_organ) in M.internal_organs)) - usr << "Mob does not have that organ." + to_chat(usr, "Mob does not have that organ.") + return - usr << "Removed [rem_organ] from [M]." + to_chat(usr, "Removed [rem_organ] from [M].") + rem_organ.remove(M) message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]") log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]") @@ -1023,13 +1089,16 @@ body var/mob/H = locate(href_list["fix_nano"]) if(!istype(H) || !H.client) - usr << "This can only be done on mobs with clients" + to_chat(usr, "This can only be done on mobs with clients") + return H.client.reload_nanoui_resources() - usr << "Resource files sent" - H << "Your NanoUI Resource files have been refreshed" + to_chat(usr, "Resource files sent") + + to_chat(H, "Your NanoUI Resource files have been refreshed") + log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)]") @@ -1038,7 +1107,8 @@ body var/mob/M = locate(href_list["regenerateicons"]) if(!ismob(M)) - usr << "This can only be done to instances of type /mob" + to_chat(usr, "This can only be done to instances of type /mob") + return M.regenerate_icons() @@ -1053,7 +1123,8 @@ body var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num if(!L) - usr << "Mob doesn't exist anymore" + to_chat(usr, "Mob doesn't exist anymore") + return switch(Text) @@ -1064,7 +1135,8 @@ body if("brain") L.adjustBrainLoss(amount) if("clone") L.adjustCloneLoss(amount) else - usr << "You caused an error. DEBUG: Text:[Text] Mob:[L]" + to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]") + return if(amount != 0) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index a4d41978ac2..393da9550d9 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -161,7 +161,8 @@ var/list/advance_cures = list( return generated /datum/disease/advance/proc/Refresh(new_name = 0) - //world << "[src.name] \ref[src] - REFRESH!" +// to_chat(world, "[src.name] \ref[src] - REFRESH!") + var/list/properties = GenerateProperties() AssignProperties(properties) id = null @@ -255,7 +256,8 @@ var/list/advance_cures = list( /datum/disease/advance/proc/GenerateCure(list/properties = list()) if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) - //world << "Res = [res]" +// to_chat(world, "Res = [res]") + cures = list(advance_cures[res]) // Get the cure name from the cure_id @@ -327,7 +329,8 @@ var/list/advance_cures = list( // Mix a list of advance diseases and return the mixed result. /proc/Advance_Mix(var/list/D_list) - //world << "Mixing!!!!" +// to_chat(world, "Mixing!!!!") + var/list/diseases = list() @@ -352,7 +355,8 @@ var/list/advance_cures = list( D2.Mix(D1) // Should be only 1 entry left, but if not let's only return a single entry - //world << "END MIXING!!!!!" +// to_chat(world, "END MIXING!!!!!") + var/datum/disease/advance/to_return = pick(diseases) to_return.Refresh(1) return to_return @@ -421,7 +425,8 @@ var/list/advance_cures = list( /mob/verb/test() for(var/datum/disease/D in disease_master.processing) - src << "[D.name] - [D.holder]" + to_chat(src, "[D.name] - [D.holder]") + */ diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 40295257b68..708b061732b 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -32,17 +32,20 @@ BONUS var/mob/living/carbon/human/H = M switch(A.stage) if(1, 2) - H << "Your chin itches." + to_chat(H, "Your chin itches.") + if(H.f_style == "Shaved") H.f_style = "Jensen Beard" H.update_hair() if(3, 4) - H << "You feel tough." + to_chat(H, "You feel tough.") + if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard") && !(H.f_style == "Full Beard")) H.f_style = "Full Beard" H.update_hair() else - H << "You feel manly!" + to_chat(H, "You feel manly!") + if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard")) H.f_style = pick("Dwarf Beard", "Very Long Beard") H.update_hair() diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index e0ce1a7bda2..9faa62b550c 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -31,13 +31,16 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2) - M << "[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]" + to_chat(M, "[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]") + if(3, 4) - M << "[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]" + to_chat(M, "[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]") + Choke_stage_3_4(M, A) M.emote("gasp") else - M << "[pick("You're choking!", "You can't breathe!")]" + to_chat(M, "[pick("You're choking!", "You can't breathe!")]") + Choke(M, A) M.emote("gasp") return diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index c9de75d877f..ddaea9da4cc 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -32,9 +32,11 @@ Bonus var/mob/living/carbon/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("Your head hurts.", "Your mind blanks for a moment.")]" + to_chat(M, "[pick("Your head hurts.", "Your mind blanks for a moment.")]") + else - M << "You can't think straight!" + to_chat(M, "You can't think straight!") + M.confused = min(100, M.confused + 8) return diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index 716ef2cb6fd..c112fd2d111 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -31,7 +31,8 @@ BONUS var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2, 3) - M << "[pick("You swallow excess mucus.", "You lightly cough.")]" + to_chat(M, "[pick("You swallow excess mucus.", "You lightly cough.")]") + else M.emote("cough") var/obj/item/I = M.get_active_hand() diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 08a66b6c144..6d8d8008ef8 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -31,13 +31,16 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(3, 4) - M << "[pick("You hear a ringing in your ear.", "Your ears pop.")]" + to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") + if(5) if(!(M.ear_deaf)) - M << "Your ears pop and begin ringing loudly!" + to_chat(M, "Your ears pop and begin ringing loudly!") + M.setEarDamage(-1,INFINITY) //Shall be enough spawn(200) if(M) - M << "The ringing in your ears fades..." + to_chat(M, "The ringing in your ears fades...") + M.setEarDamage(-1,0) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index b81b9b8a4ec..1ab6b3a7fb6 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -31,8 +31,10 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("You feel dizzy.", "Your head spins.")]" + to_chat(M, "[pick("You feel dizzy.", "Your head spins.")]") + else - M << "A wave of dizziness washes over you!" + to_chat(M, "A wave of dizziness washes over you!") + M.Dizzy(5) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 8f2beacd29d..89789d9f993 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -29,7 +29,8 @@ Bonus ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob - M << "[pick("You feel hot.", "You feel like you're burning.")]" + to_chat(M, "[pick("You feel hot.", "You feel like you're burning.")]") + if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT) Heat(M, A) diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index ea805861082..040de3f43a4 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -31,16 +31,19 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(3) - M << "[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]" + to_chat(M, "[pick("You feel hot.", "You hear a crackling noise.", "You smell smoke.")]") + if(4) Firestacks_stage_4(M, A) M.IgniteMob() - M << "Your skin bursts into flames!" + to_chat(M, "Your skin bursts into flames!") + M.emote("scream") if(5) Firestacks_stage_5(M, A) M.IgniteMob() - M << "Your skin erupts into an inferno!" + to_chat(M, "Your skin erupts into an inferno!") + M.emote("scream") return diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 0d3cfc95ce3..35862771a02 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -31,9 +31,11 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(2,3) - M << "[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]" + to_chat(M, "[pick("You feel a sudden pain across your body.", "Drops of blood appear suddenly on your skin.")]") + if(4,5) - 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, "[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) return diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 21ee88e7cc0..ab73b6b7abe 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -35,7 +35,8 @@ Bonus return switch(A.stage) if(4, 5) - M << "[pick("Your skin feels itchy.", "You feel light headed.")]" + to_chat(M, "[pick("Your skin feels itchy.", "You feel light headed.")]") + M.dna.remove_mutation_group(possible_mutations) randmut(M, possible_mutations) return diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 5400de88585..36aa7da05c5 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -31,11 +31,14 @@ Bonus var/mob/living/carbon/M = A.affected_mob switch(A.stage) if(1, 2) - M << "[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]" + to_chat(M, "[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]") + if(3, 4) - 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, "[pick("Something is following you.", "You are being watched.", "You hear a whisper in your ear.", "Thumping footsteps slam toward you from nowhere.")]") + else - M << "[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]" + to_chat(M, "[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]") + M.hallucination += 5 return diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index 38ac066fa0b..dc9c88f7488 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -30,5 +30,6 @@ BONUS ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob - M << "[pick("Your head hurts.", "Your head starts pounding.")]" + to_chat(M, "[pick("Your head hurts.", "Your head starts pounding.")]") + return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 11f0d21ff37..2cc872d7741 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -73,7 +73,8 @@ Bonus cured_diseases += D.GetDiseaseID() D.cure() if(cured) - M << "You feel much better." + to_chat(M, "You feel much better.") + /datum/symptom/heal/metabolism/End(datum/disease/advance/A) // Remove all the diseases we cured. @@ -83,7 +84,8 @@ Bonus for(var/res in M.resistances) if(res in cured_diseases) M.resistances -= res - M << "You feel weaker." + to_chat(M, "You feel weaker.") + /* ////////////////////////////////////// diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index e6f08f0882f..97d855fe8e5 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -30,5 +30,6 @@ BONUS ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob - M << "Your [pick("back", "arm", "leg", "elbow", "head")] itches." + to_chat(M, "Your [pick("back", "arm", "leg", "elbow", "head")] itches.") + return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 785b1cd8d7e..1b94e64c18f 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -34,5 +34,6 @@ Bonus M.reagents.add_reagent("salbutamol", 20) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - M << "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]" + to_chat(M, "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]") + return diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index d45a58b4621..8a3290ab004 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -32,19 +32,23 @@ Bonus if(2) if(M.reagents.get_reagent_amount("oculine")<10) M.reagents.add_reagent("oculine"=10) - M << "Your hearing feels clearer and crisp." + to_chat(M, "Your hearing feels clearer and crisp.") + if(3) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 ) M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10)) - M << "You feel sober." + to_chat(M, "You feel sober.") + if(4) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaptizine") < 10) M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10, "synaptizine"=5)) - M << "You feel focused." + to_chat(M, "You feel focused.") + if(5) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaptizine") < 10 && M.reagents.get_reagent_amount("mannitol") < 10) M.reagents.add_reagent_list(list("mannitol"=10, "antihol"=10, "oculine"=10, "synaptizine"=10)) - M << "Your mind feels relaxed." + to_chat(M, "Your mind feels relaxed.") + return /* @@ -80,24 +84,29 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1) - M << "You can't taste a thing." + to_chat(M, "You can't taste a thing.") + if(2) - M << "You can't feel anything." + to_chat(M, "You can't feel anything.") + if(prob(10)) M.reagents.add_reagent("morphine",rand(5,7)) if(3) M.reagents.add_reagent("ethanol",rand(5,7)) - M << "You feel absolutely hammered." + to_chat(M, "You feel absolutely hammered.") + if(prob(15)) M.reagents.add_reagent("morphine",rand(5,7)) if(4) M.reagents.add_reagent_list(list("ethanol",rand(7,15),"lsd",rand(5,10))) - M << "You try to focus on not dying." + to_chat(M, "You try to focus on not dying.") + if(prob(20)) M.reagents.add_reagent("morphine",rand(5,7)) if(5) M.reagents.add_reagent_list(list("haloperidol",rand(5,15),"ethanol",rand(7,20),"lsd",rand(5,15))) - M << "u can count 2 potato!" + to_chat(M, "u can count 2 potato!") + if(prob(25)) M.reagents.add_reagent("morphine",rand(5,7)) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index e07bfe29afa..049180eb7a5 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -28,19 +28,22 @@ BONUS ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob - M << "[pick("Your scalp itches.", "Your skin feels flakey.")]" + to_chat(M, "[pick("Your scalp itches.", "Your skin feels flakey.")]") + if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M switch(A.stage) if(3, 4) if(!(H.h_style == "Bald") && !(H.h_style == "Balding Hair")) - H << "Your hair starts to fall out in clumps..." + to_chat(H, "Your hair starts to fall out in clumps...") + spawn(50) H.h_style = "Balding Hair" H.update_hair() if(5) if(!(H.f_style == "Shaved") || !(H.h_style == "Bald")) - H << "Your hair starts to fall out in clumps..." + to_chat(H, "Your hair starts to fall out in clumps...") + spawn(50) H.f_style = "Shaved" H.h_style = "Bald" diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index 6925b1fb5b0..8496d46b9bf 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -29,7 +29,8 @@ Bonus ..() if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob - M << "[pick("You feel cold.", "You start shivering.")]" + to_chat(M, "[pick("You feel cold.", "You start shivering.")]") + if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) Chill(M, A) return diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 2823035bf39..33a52b67934 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -34,5 +34,6 @@ Bonus M.reagents.add_reagent("ephedrine", 10) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - M << "[pick("You feel restless.", "You feel like running laps around the station.")]" + to_chat(M, "[pick("You feel restless.", "You feel like running laps around the station.")]") + return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index fafac33b2c8..bd8742b44e9 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -27,9 +27,11 @@ BONUS var/mob/living/M = A.affected_mob switch(A.stage) if(1) - M << "You feel off, but no different from before." + to_chat(M, "You feel off, but no different from before.") + if(5) - M << "You feel better, but nothing interesting happens." + to_chat(M, "You feel better, but nothing interesting happens.") + /* ////////////////////////////////////// @@ -60,6 +62,8 @@ BONUS var/mob/living/M = A.affected_mob switch(A.stage) if(1) - M << "You feel better, but no different from before." + to_chat(M, "You feel better, but no different from before.") + if(5) - M << "You feel off, but nothing interesting happens." \ No newline at end of file + to_chat(M, "You feel off, but nothing interesting happens.") + diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 9d348506dcf..6317ad88051 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -31,20 +31,24 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2) - M << "Your eyes itch." + to_chat(M, "Your eyes itch.") + if(3, 4) - M << "Your eyes burn!" + to_chat(M, "Your eyes burn!") + M.blur_eyes(10) M.adjust_eye_damage(1) else - M << "Your eyes burn horrificly!" + to_chat(M, "Your eyes burn horrificly!") + M.blur_eyes(20) M.adjust_eye_damage(5) if(M.eye_damage >= 10) M.become_nearsighted() if(prob(M.eye_damage - 10 + 1)) if(M.become_blind()) - M << "You go blind!" + to_chat(M, "You go blind!") + /* @@ -83,5 +87,6 @@ Bonus M.reagents.add_reagent("oculine", 20) else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) - M << "[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]" + to_chat(M, "[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]") + return diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 847324a9e0b..8bd94b1ebdb 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -32,7 +32,8 @@ Bonus var/mob/living/carbon/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("Your throat hurts.", "You clear your throat.")]" + to_chat(M, "[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 abd5df571ac..77793882580 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -35,7 +35,8 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("You feel nauseous.", "You feel like you're going to throw up!")]" + to_chat(M, "[pick("You feel nauseous.", "You feel like you're going to throw up!")]") + else Vomit(M) diff --git a/code/datums/diseases/advance/symptoms/weakness.dm b/code/datums/diseases/advance/symptoms/weakness.dm index b0769680dc9..34e6ef57bea 100644 --- a/code/datums/diseases/advance/symptoms/weakness.dm +++ b/code/datums/diseases/advance/symptoms/weakness.dm @@ -31,12 +31,15 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2) - M << "[pick("You feel weak.", "You feel lazy.")]" + to_chat(M, "[pick("You feel weak.", "You feel lazy.")]") + if(3, 4) - M << "[pick("You feel very frail.", "You think you might faint.")]" + to_chat(M, "[pick("You feel very frail.", "You think you might faint.")]") + M.adjustStaminaLoss(15) else - M << "[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]" + to_chat(M, "[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]") + M.adjustStaminaLoss(30) if(M.getStaminaLoss() > 60 && !M.stat) M.visible_message("[M] faints!", "You swoon and faint...") diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index 8a5e3b2dd75..7bf80e8a0ac 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -31,7 +31,8 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("You feel blubbery.", "Your stomach hurts.")]" + to_chat(M, "[pick("You feel blubbery.", "Your stomach hurts.")]") + else M.overeatduration = min(M.overeatduration + 100, 600) M.nutrition = min(M.nutrition + 100, NUTRITION_LEVEL_FULL) @@ -73,9 +74,11 @@ Bonus var/mob/living/M = A.affected_mob switch(A.stage) if(1, 2, 3, 4) - M << "[pick("You feel hungry.", "You crave for food.")]" + to_chat(M, "[pick("You feel hungry.", "You crave for food.")]") + else - M << "[pick("So hungry...", "You'd kill someone for a bite of food...", "Hunger cramps seize you...")]" + 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) M.nutrition = max(M.nutrition - 100, 0) diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index 0a3d110b037..20a7f4ec077 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -34,22 +34,27 @@ BONUS if(1) if(H.age > 41) H.age = 41 - H << "You haven't had this much energy in years!" + to_chat(H, "You haven't had this much energy in years!") + if(2) if(H.age > 36) H.age = 36 - H << "You're suddenly in a good mood." + to_chat(H, "You're suddenly in a good mood.") + if(3) if(H.age > 31) H.age = 31 - H << "You begin to feel more lithe." + to_chat(H, "You begin to feel more lithe.") + if(4) if(H.age > 26) H.age = 26 - H << "You feel reinvigorated." + to_chat(H, "You feel reinvigorated.") + if(5) if(H.age > 21) H.age = 21 - H << "You feel like you can take on the world!" + to_chat(H, "You feel like you can take on the world!") + return \ No newline at end of file diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 4cfd0268625..63f54abe4f3 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -16,18 +16,23 @@ switch(stage) if(2) //also changes say, see say.dm if(prob(5)) - affected_mob << "You feel anxious." + to_chat(affected_mob, "You feel anxious.") + if(3) if(prob(10)) - affected_mob << "Your stomach flutters." + to_chat(affected_mob, "Your stomach flutters.") + if(prob(5)) - affected_mob << "You feel panicky." + to_chat(affected_mob, "You feel panicky.") + if(prob(2)) - affected_mob << "You're overtaken with panic!" + to_chat(affected_mob, "You're overtaken with panic!") + affected_mob.confused += (rand(2,3)) if(4) if(prob(10)) - affected_mob << "You feel butterflies in your stomach." + to_chat(affected_mob, "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!") diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index f6055e775ba..cf2ff7c2671 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -26,7 +26,8 @@ A.inflamed = 1 A.update_icon() if(prob(3)) - affected_mob << "You feel a stabbing pain in your abdomen!" + to_chat(affected_mob, "You feel a stabbing pain in your abdomen!") + affected_mob.Stun(rand(2,3)) affected_mob.adjustToxLoss(1) if(3) diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index 8e7331cbab8..e50f1589a06 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -16,12 +16,15 @@ switch(stage) if(2) //also changes say, see say.dm // no it doesn't, that's horrifyingly snowflakey if(prob(2)) - affected_mob << "You taste honey in your mouth." + to_chat(affected_mob, "You taste honey in your mouth.") + if(3) if(prob(10)) - affected_mob << "Your stomach rumbles." + to_chat(affected_mob, "Your stomach rumbles.") + if(prob(2)) - affected_mob << "Your stomach stings painfully." + to_chat(affected_mob, "Your stomach stings painfully.") + if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -30,7 +33,8 @@ affected_mob.visible_message("[affected_mob] buzzes.", \ "Your stomach buzzes violently!") if(prob(5)) - affected_mob << "You feel something moving in your throat." + to_chat(affected_mob, "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!") diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index d29e860a38b..24613849568 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -22,7 +22,8 @@ if(prob(2)) affected_mob.emote("yawn") if(prob(2)) - affected_mob << "You don't feel like yourself." + to_chat(affected_mob, "You don't feel like yourself.") + if(prob(5)) affected_mob.adjustBrainLoss(1) affected_mob.updatehealth() @@ -35,7 +36,8 @@ affected_mob.adjustBrainLoss(2) affected_mob.updatehealth() if(prob(2)) - affected_mob << "Your try to remember something important...but can't." + to_chat(affected_mob, "Your try to remember something important...but can't.") + if(4) if(prob(2)) @@ -46,9 +48,11 @@ affected_mob.adjustBrainLoss(3) affected_mob.updatehealth() if(prob(2)) - affected_mob << "Strange buzzing fills your head, removing all thoughts." + to_chat(affected_mob, "Strange buzzing fills your head, removing all thoughts.") + if(prob(3)) - affected_mob << "You lose consciousness..." + to_chat(affected_mob, "You lose consciousness...") + affected_mob.visible_message("[affected_mob] suddenly collapses") affected_mob.Paralyse(rand(5,10)) if(prob(1)) diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index f9dca46a0aa..f118cae525c 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -16,16 +16,19 @@ if(2) /* if(affected_mob.sleeping && prob(40)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + to_chat(affected_mob, "\blue You feel better.") + cure() return */ if(affected_mob.lying && prob(40)) //changed FROM prob(10) until sleeping is fixed - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if(prob(1) && prob(5)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if(prob(1)) @@ -33,22 +36,27 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your throat feels sore." + to_chat(affected_mob, "Your throat feels sore.") + if(prob(1)) - affected_mob << "Mucous runs down the back of your throat." + to_chat(affected_mob, "Mucous runs down the back of your throat.") + if(3) /* if(affected_mob.sleeping && prob(25)) //removed until sleeping is fixed - affected_mob << "\blue You feel better." + to_chat(affected_mob, "\blue You feel better.") + cure() return */ if(affected_mob.lying && prob(25)) //changed FROM prob(5) until sleeping is fixed - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if(prob(1) && prob(1)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if(prob(1)) @@ -56,9 +64,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your throat feels sore." + to_chat(affected_mob, "Your throat feels sore.") + if(prob(1)) - affected_mob << "Mucous runs down the back of your throat." + to_chat(affected_mob, "Mucous runs down the back of your throat.") + if(prob(1) && prob(50)) if(!affected_mob.resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu(0) diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index f77065a5ed2..28742e0d907 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -16,7 +16,8 @@ if(2) affected_mob.bodytemperature -= 10 if(prob(1) && prob(10)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if(prob(1)) @@ -24,9 +25,11 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your throat feels sore." + to_chat(affected_mob, "Your throat feels sore.") + if(prob(5)) - affected_mob << "You feel stiff." + to_chat(affected_mob, "You feel stiff.") + if(3) affected_mob.bodytemperature -= 20 if(prob(1)) @@ -34,6 +37,8 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your throat feels sore." + to_chat(affected_mob, "Your throat feels sore.") + if(prob(10)) - affected_mob << "You feel stiff." \ No newline at end of file + to_chat(affected_mob, "You feel stiff.") + diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index a1c4d7471c4..0e510e5fac7 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -34,11 +34,13 @@ if(prob(8)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your muscles ache." + to_chat(affected_mob, "Your muscles ache.") + if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "Your stomach hurts." + to_chat(affected_mob, "Your stomach hurts.") + if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -48,7 +50,8 @@ original_dna = new affected_mob.dna.type affected_mob.dna.copy_dna(original_dna) - affected_mob << "You don't feel like yourself.." + to_chat(affected_mob, "You don't feel like yourself..") + var/datum/dna/transform_dna = strain_data["dna"] transform_dna.transfer_identity(affected_mob, transfer_SE = 1) @@ -68,5 +71,6 @@ affected_mob.updateappearance(mutcolor_update=1) affected_mob.domutcheck() - affected_mob << "You feel more like yourself." + to_chat(affected_mob, "You feel more like yourself.") + return ..() \ No newline at end of file diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 6a300f733ff..99a6b867f82 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -22,7 +22,8 @@ else if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - affected_mob << "You're starting to feel very weak..." + to_chat(affected_mob, "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 58b7f247132..cc23606df8d 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -16,7 +16,8 @@ switch(stage) if(2) if(affected_mob.lying && prob(20)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + stage-- return if(prob(1)) @@ -24,18 +25,21 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your muscles ache." + to_chat(affected_mob, "Your muscles ache.") + if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "Your stomach hurts." + to_chat(affected_mob, "Your stomach hurts.") + if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() if(3) if(affected_mob.lying && prob(15)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + stage-- return if(prob(1)) @@ -43,11 +47,13 @@ if(prob(1)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "Your muscles ache." + to_chat(affected_mob, "Your muscles ache.") + if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) - affected_mob << "Your stomach hurts." + to_chat(affected_mob, "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 49137ce2d62..76e0819cec6 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -21,7 +21,8 @@ if(prob(5)) affected_mob.emote("cough") if(prob(1)) - affected_mob << "You're burning in your own skin!" + to_chat(affected_mob, "You're burning in your own skin!") + affected_mob.take_organ_damage(0,5) if(3) @@ -31,6 +32,7 @@ if(prob(5)) affected_mob.emote("cough") if(prob(5)) - affected_mob << "You're burning in your own skin!" + to_chat(affected_mob, "You're burning in your own skin!") + affected_mob.take_organ_damage(0,5) return diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index a2f4cc88112..ed10c174da4 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -27,14 +27,16 @@ else if(prob(5)) affected_mob.emote("gasp") if(prob(10)) - affected_mob << "You're starting to feel very weak..." + to_chat(affected_mob, "You're starting to feel very weak...") + if(4) if(prob(10)) affected_mob.emote("cough") affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(5) - affected_mob << "Your body feels as if it's trying to rip itself open..." + to_chat(affected_mob, "Your body feels as if it's trying to rip itself open...") + if(prob(50)) affected_mob.gib() else diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index f24ae10c347..c70f080a226 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -16,7 +16,8 @@ switch(stage) if(2) if(prob(2)) - affected_mob << "You feel a slight shock course through your body." + to_chat(affected_mob, "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 & CONDUCT)) @@ -26,9 +27,11 @@ step_towards(S,affected_mob) if(3) if(prob(2)) - affected_mob << "You feel a strong shock course through your body." + to_chat(affected_mob, "You feel a strong shock course through your body.") + if(prob(2)) - affected_mob << "You feel like clowning around." + to_chat(affected_mob, "You feel like clowning around.") + if(prob(4)) for(var/obj/M in orange(4,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) @@ -44,9 +47,11 @@ step_towards(S,affected_mob) if(4) if(prob(2)) - affected_mob << "You feel a powerful shock course through your body." + to_chat(affected_mob, "You feel a powerful shock course through your body.") + if(prob(2)) - affected_mob << "You query upon the nature of miracles." + to_chat(affected_mob, "You query upon the nature of miracles.") + if(prob(8)) for(var/obj/M in orange(6,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 7d328ad0291..4bb455bca40 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -16,10 +16,17 @@ ..() switch(stage) if(1) - if(prob(10)) affected_mob << "You feel a little silly." + if(prob(10)) + to_chat(affected_mob, "You feel a little silly.") + if(2) - if(prob(10)) affected_mob << "You start seeing rainbows." + if(prob(10)) + to_chat(affected_mob, "You start seeing rainbows.") + if(3) - if(prob(10)) affected_mob << "Your thoughts are interrupted by a loud HONK!" + if(prob(10)) + to_chat(affected_mob, "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...") ) ) + if(prob(5)) + affected_mob.say( pick( list("HONK!", "Honk!", "Honk.", "Honk?", "Honk!!", "Honk?!", "Honk...") ) ) diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 516dea907f0..8dc33934542 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -31,38 +31,49 @@ if(1) if(restcure) if(affected_mob.lying && prob(30)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if (prob(8)) - affected_mob << "Your head hurts." + to_chat(affected_mob, "Your head hurts.") + if (prob(9)) - affected_mob << "You feel a tingling sensation in your chest." + to_chat(affected_mob, "You feel a tingling sensation in your chest.") + if (prob(9)) - affected_mob << "You feel angry." + to_chat(affected_mob, "You feel angry.") + if(2) if(restcure) if(affected_mob.lying && prob(20)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if (prob(8)) - affected_mob << "Your skin feels loose." + to_chat(affected_mob, "Your skin feels loose.") + if (prob(10)) - affected_mob << "You feel very strange." + to_chat(affected_mob, "You feel very strange.") + if (prob(4)) - affected_mob << "You feel a stabbing pain in your head!" + to_chat(affected_mob, "You feel a stabbing pain in your head!") + affected_mob.Paralyse(2) if (prob(4)) - affected_mob << "Your stomach churns." + to_chat(affected_mob, "Your stomach churns.") + if(3) if(restcure) if(affected_mob.lying && prob(20)) - affected_mob << "You feel better." + to_chat(affected_mob, "You feel better.") + cure() return if (prob(10)) - affected_mob << "Your entire body vibrates." + to_chat(affected_mob, "Your entire body vibrates.") + if (prob(35)) if(prob(50)) @@ -73,7 +84,8 @@ if(4) if(restcure) if(affected_mob.lying && prob(5)) - affected_mob << "You feel better." + to_chat(affected_mob, "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 3a8600c61af..540e9eb5bf4 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -23,29 +23,34 @@ affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(prob(1)) - affected_mob << "You feel strange..." + to_chat(affected_mob, "You feel strange...") + if(3) if(affected_mob.ckey == "rosham") src.cure() if(prob(5)) - affected_mob << "You feel the urge to dance..." + to_chat(affected_mob, "You feel the urge to dance...") + else if(prob(5)) affected_mob.emote("gasp") else if(prob(10)) - affected_mob << "You feel the need to chick chicky boom..." + to_chat(affected_mob, "You feel the need to chick chicky boom...") + if(4) if(affected_mob.ckey == "rosham") src.cure() if(prob(10)) affected_mob.emote("gasp") - affected_mob << "You feel a burning beat inside..." + to_chat(affected_mob, "You feel a burning beat inside...") + if(prob(20)) affected_mob.adjustToxLoss(5) affected_mob.updatehealth() if(5) if(affected_mob.ckey == "rosham") src.cure() - affected_mob << "Your body is unable to contain the Rhumba Beat..." + to_chat(affected_mob, "Your body is unable to contain the Rhumba Beat...") + if(prob(50)) affected_mob.gib() else diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index e8ca3fa5f85..2c6ce7ecc0c 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -22,23 +22,28 @@ switch(stage) if(1) if (prob(stage_prob) && stage1) - affected_mob << pick(stage1) + to_chat(affected_mob, pick(stage1)) + if(2) if (prob(stage_prob) && stage2) - affected_mob << pick(stage2) + to_chat(affected_mob, pick(stage2)) + if(3) if (prob(stage_prob*2) && stage3) - affected_mob << pick(stage3) + to_chat(affected_mob, pick(stage3)) + if(4) if (prob(stage_prob*2) && stage4) - affected_mob << pick(stage4) + to_chat(affected_mob, pick(stage4)) + if(5) do_disease_transformation(affected_mob) /datum/disease/transformation/proc/do_disease_transformation(mob/living/affected_mob) if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD) if(stage5) - affected_mob << pick(stage5) + to_chat(affected_mob, pick(stage5)) + if(jobban_isbanned(affected_mob, new_form)) affected_mob.death(1) return @@ -101,10 +106,12 @@ switch(stage) if(2) if(prob(2)) - affected_mob << "Your [pick("back", "arm", "leg", "elbow", "head")] itches." + to_chat(affected_mob, "Your [pick("back", "arm", "leg", "elbow", "head")] itches.") + if(3) if(prob(4)) - affected_mob << "You feel a stabbing pain in your head." + to_chat(affected_mob, "You feel a stabbing pain in your head.") + affected_mob.confused += 10 if(4) if(prob(3)) @@ -136,7 +143,8 @@ if (prob(8)) affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop")) if (prob(4)) - affected_mob << "You feel a stabbing pain in your head." + to_chat(affected_mob, "You feel a stabbing pain in your head.") + affected_mob.Paralyse(2) if(4) if (prob(20)) @@ -165,7 +173,8 @@ switch(stage) if(3) if (prob(4)) - affected_mob << "You feel a stabbing pain in your head." + to_chat(affected_mob, "You feel a stabbing pain in your head.") + affected_mob.Paralyse(2) if(4) if (prob(20)) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index d0fa2f610a2..db7f0c6fdd4 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -17,42 +17,52 @@ if(2) if(prob(2)) affected_mob.emote("cough") - affected_mob << "Your chest hurts." + to_chat(affected_mob, "Your chest hurts.") + if(prob(2)) - affected_mob << "Your stomach violently rumbles!" + to_chat(affected_mob, "Your stomach violently rumbles!") + if(prob(5)) - affected_mob << "You feel a cold sweat form." + to_chat(affected_mob, "You feel a cold sweat form.") + if(4) if(prob(2)) - affected_mob << "You see four of everything" + to_chat(affected_mob, "You see four of everything") + affected_mob.Dizzy(5) if(prob(2)) - affected_mob << "You feel a sharp pain from your lower chest!" + to_chat(affected_mob, "You feel a sharp pain from your lower chest!") + affected_mob.adjustOxyLoss(5) affected_mob.emote("gasp") if(prob(10)) - affected_mob << "You feel air escape from your lungs painfully." + to_chat(affected_mob, "You feel air escape from your lungs painfully.") + affected_mob.adjustOxyLoss(25) affected_mob.emote("gasp") if(5) if(prob(2)) - affected_mob << "[pick("You feel your heart slowing...", "You relax and slow your heartbeat.")]" + to_chat(affected_mob, "[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.AdjustSleeping(5) if(prob(2)) - affected_mob << "You feel your mind relax and your thoughts drift!" + to_chat(affected_mob, "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) if(prob(3)) - 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, "[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.nutrition = max(affected_mob.nutrition - 100, 0) if(prob(15)) - affected_mob << "[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]" + to_chat(affected_mob, "[pick("You feel uncomfortably hot...", "You feel like unzipping your jumpsuit", "You feel like taking off some clothes...")]") + affected_mob.bodytemperature += 40 return diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 33a1ddc47b8..d1f7413a7ea 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -31,14 +31,16 @@ 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!")) if(prob(1)&&prob(50)) - 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, "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!")) if(prob(1)&&prob(50)) - 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, "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 +48,8 @@ STI KALY - blind affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!","STI KALY!","EI NATH!")) return if(prob(1)&&prob(50)) - 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, "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/gas_mixture.dm b/code/datums/gas_mixture.dm index 704eb2f04ed..e5e447f94bb 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -123,10 +123,12 @@ What are the archived variables for? fuel_burnt = 0 if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) - //world << "pre [temperature], [oxygen], [toxins]" +// to_chat(world, "pre [temperature], [oxygen], [toxins]") + if(fire() > 0) reacting = 1 - //world << "post [temperature], [oxygen], [toxins]" +// to_chat(world, "post [temperature], [oxygen], [toxins]") + return reacting diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 3266887dafa..4041dbd5497 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -61,7 +61,8 @@ else if(istype(used_atom, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = used_atom if(C.amount<4) - user << ("There's not enough cable to finish the task.") + to_chat(user, ("There's not enough cable to finish the task.")) + return 0 else C.use(4) @@ -69,7 +70,8 @@ else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + to_chat(user, ("There's not enough material in this stack.")) + return 0 else S.use(5) @@ -111,24 +113,28 @@ if(istype(used_atom,/obj/item/stack)) var/obj/item/stack/stack=used_atom if(stack.amount < amount) - user << "\red You don't have enough [stack]! You need at least [amount]." + to_chat(user, "\red You don't have enough [stack]! You need at least [amount].") + return 0 stack.use(amount) // CABLES if(istype(used_atom,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil=used_atom if(coil.amount < amount) - user << "\red You don't have enough cable! You need at least [amount] coils." + to_chat(user, "\red You don't have enough cable! You need at least [amount] coils.") + return 0 coil.use(amount) // WELDER if(istype(used_atom,/obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder=used_atom if(!welder.isOn()) - user << "\blue You tap the [src] with your unlit welder. [pick("Ding","Dong")]." + to_chat(user, "\blue You tap the [src] with your unlit welder. [pick("Ding","Dong")].") + return 0 if(!welder.remove_fuel(amount,user)) - user << "\red You don't have enough fuel!" + to_chat(user, "\red You don't have enough fuel!") + return 0 return 1 diff --git a/code/datums/helper_datums/events.dm b/code/datums/helper_datums/events.dm index 017cb3b3e40..fcd7d49195e 100644 --- a/code/datums/helper_datums/events.dm +++ b/code/datums/helper_datums/events.dm @@ -31,7 +31,8 @@ // Arguments: event_type as text, any number of additional arguments to pass to event handler // Returns: null proc/fireEvent() - //world << "Events in [args[1]] called" +// to_chat(world, "Events in [args[1]] called") + var/list/event = listgetindex(events,args[1]) if(istype(event)) spawn(-1) @@ -60,7 +61,8 @@ return ..() proc/Fire() - //world << "Event fired" +// to_chat(world, "Event fired") + if(listener) call(listener,proc_name)(arglist(args)) return 1 diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm index 0020859f1d9..f020290e164 100644 --- a/code/datums/helper_datums/global_iterator.dm +++ b/code/datums/helper_datums/global_iterator.dm @@ -139,7 +139,8 @@ Data storage vars: arg_list = arguments return 1 else -// world << "\red Invalid arguments supplied for [src.type], ref = \ref[src]" +// to_chat(world, "\red Invalid arguments supplied for [src.type], ref = \ref[src]") + return 0 proc/toggle_null_checks() diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 33b589fd124..ac8a3cad377 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -166,5 +166,6 @@ precision = max(rand(1,100)*bagholding.len,100) if(istype(teleatom, /mob/living)) var/mob/living/MM = teleatom - MM << "The bluespace interface on your bag of holding interferes with the teleport!" + to_chat(MM, "The bluespace interface on your bag of holding interferes with the teleport!") + return 1 \ No newline at end of file diff --git a/code/datums/martial.dm b/code/datums/martial.dm index d9892d86b00..061184ce09f 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -84,11 +84,13 @@ name = "Boxing" /datum/martial_art/boxing/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A << "Can't disarm while boxing!" + to_chat(A, "Can't disarm while boxing!") + return 1 /datum/martial_art/boxing/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) - A << "Can't grab while boxing!" + to_chat(A, "Can't grab while boxing!") + return 1 /datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) @@ -250,10 +252,14 @@ set desc = "Remember how to wrestle." set category = "Wrestling" - usr << "You flex your muscles and have a revelation..." - usr << "Clinch: Grab. Passively gives you a chance to immediately aggressively grab someone. Not always successful." - 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." - usr << "Advanced grab: Grab. Passively causes stamina damage when grabbing someone." + 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.") + #define TORNADO_COMBO "HHD" #define THROWBACK_COMBO "DHD" @@ -337,10 +343,14 @@ set desc = "Remember the martial techniques of the Plasma Fist." set category = "Plasma Fist" - usr << "You clench your fists and have a flashback of knowledge..." - usr << "Tornado Sweep: Harm Harm Disarm. Repulses target and everyone back." - usr << "Throwback: Disarm Harm Disarm. Throws the target and an item at them." - usr << "The Plasma Fist: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body." + 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.") + //Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss #define WRIST_WRENCH_COMBO "DD" @@ -472,13 +482,19 @@ set desc = "Remember the martial techniques of the Sleeping Carp clan." set category = "Sleeping Carp" - usr << "You retreat inward and recall the teachings of the Sleeping Carp..." + 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.") - usr << "Wrist Wrench: Disarm Disarm. Forces opponent to drop item in hand." - usr << "Back Kick: Harm Grab. Opponent must be facing away. Knocks down." - usr << "Stomach Knee: Grab Harm. Knocks the wind out of opponent and stuns." - usr << "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand." - usr << "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition." //ITEMS @@ -511,7 +527,8 @@ if(slot == slot_belt) var/mob/living/carbon/human/H = user style.teach(H,1) - user << "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wrestling tab." + to_chat(user, "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wrestling tab.") + return /obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user) @@ -520,7 +537,8 @@ var/mob/living/carbon/human/H = user if(H.get_item_by_slot(slot_belt) == src) style.remove(H) - user << "You no longer have an urge to flex your muscles." + to_chat(user, "You no longer have an urge to flex your muscles.") + return /obj/item/weapon/plasma_fist_scroll @@ -537,7 +555,8 @@ var/mob/living/carbon/human/H = user var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) F.teach(H) - H << "You have learned the ancient martial art of Plasma Fist." + to_chat(H, "You have learned the ancient martial art of Plasma Fist.") + used = 1 desc = "It's completely blank." name = "empty scroll" @@ -552,8 +571,12 @@ /obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user as mob) if(!istype(user) || !user) return - user << "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \ - directed toward you. However, you are also unable to use any ranged weaponry. You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab." + to_chat(user, "You have learned the ancient martial art of the Sleeping Carp! \ + Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles directed toward you. \ + However, you are also unable to use any ranged weaponry. \ + You can learn more about your newfound art by using the Recall Teachings verb in the Sleeping Carp tab.") + + var/datum/martial_art/the_sleeping_carp/theSleepingCarp = new(null) theSleepingCarp.teach(user) user.drop_item() @@ -583,7 +606,8 @@ /obj/item/weapon/twohanded/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) if((CLUMSY in user.disabilities) && prob(50)) - user << "You club yourself over the head with [src]." + to_chat(user, "You club yourself over the head with [src].") + user.Weaken(3) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -597,7 +621,8 @@ return ..() var/mob/living/carbon/C = target if(C.stat) - user << "It would be dishonorable to attack a foe while they cannot retaliate." + to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.") + return switch(user.a_intent) if("disarm") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index cfe913bd94e..c3c08b70b39 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -502,7 +502,8 @@ new_objective.owner = src new_objective.explanation_text = "Destroy [new_target.name], the experimental AI." else - usr << "No active AIs with minds" + to_chat(usr, "No active AIs with minds") + if ("prevent") new_objective = new /datum/objective/block @@ -623,7 +624,8 @@ if(I && I.implanted) I.removed(H) qdel(I) - H << "\blue Your loyalty implant has been deactivated." + to_chat(H, "\blue Your loyalty implant has been deactivated.") + log_admin("[key_name(usr)] has deactivated [key_name(current)]'s loyalty implant") message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s loyalty implant") if("add") @@ -635,15 +637,18 @@ log_admin("[key_name(usr)] has given [key_name(current)] a loyalty implant") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a loyalty implant") - H << "\red You somehow have become the recepient of a loyalty transplant, and it just activated!" + to_chat(H, "\red You somehow have become the recepient of a loyalty transplant, and it just activated!") + if(src in ticker.mode.revolutionaries) special_role = null ticker.mode.revolutionaries -= src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") + if(src in ticker.mode.head_revolutionaries) special_role = null ticker.mode.head_revolutionaries -=src - src << "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!" + to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") + if(src in ticker.mode.cult) ticker.mode.cult -= src ticker.mode.update_cult_icons_removed(src) @@ -651,7 +656,8 @@ var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memorize_cult_objectives(src) - current << "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!" + to_chat(current, "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!") + memory = "" else if (href_list["revolution"]) @@ -660,12 +666,14 @@ if("clear") if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src - current << "\red You have been brainwashed! You are no longer a revolutionary!" + to_chat(current, "\red You have been brainwashed! You are no longer a revolutionary!") + ticker.mode.update_rev_icons_removed(src) special_role = null if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src - current << "\red You have been brainwashed! You are no longer a head revolutionary!" + to_chat(current, "\red You have been brainwashed! You are no longer a head revolutionary!") + ticker.mode.update_rev_icons_removed(src) special_role = null log_admin("[key_name(usr)] has de-rev'd [key_name(current)]") @@ -675,9 +683,11 @@ if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "\red Revolution has been disappointed of your leader traits! You are a regular revolutionary now!" + to_chat(current, "\red Revolution has been disappointed of your leader traits! You are a regular revolutionary now!") + else if(!(src in ticker.mode.revolutionaries)) - current << "\red 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(current, "\red 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!") + else return ticker.mode.revolutionaries += src @@ -690,9 +700,11 @@ if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src ticker.mode.update_rev_icons_removed(src) - current << "\red You have proved your devotion to revoltion! Yea are a head revolutionary now!" + to_chat(current, "\red You have proved your devotion to revoltion! Yea are a head revolutionary now!") + else if(!(src in ticker.mode.head_revolutionaries)) - current << "\blue You are a member of the revolutionaries' leadership now!" + to_chat(current, "\blue You are a member of the revolutionaries' leadership now!") + else return if (ticker.mode.head_revolutionaries.len>0) @@ -720,7 +732,8 @@ if("flash") if (!ticker.mode.equip_revolutionary(current)) - usr << "\red Spawning flash failed!" + to_chat(usr, "\red Spawning flash failed!") + log_admin("[key_name(usr)] has given [key_name(current)] a flash") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a flash") @@ -728,7 +741,8 @@ var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L if (!flash) - usr << "\red Deleting flash failed!" + to_chat(usr, "\red Deleting flash failed!") + qdel(flash) log_admin("[key_name(usr)] has taken [key_name(current)]'s flash") message_admins("[key_name_admin(usr)] has taken [key_name_admin(current)]'s flash") @@ -737,7 +751,8 @@ var/list/L = current.get_contents() var/obj/item/device/flash/flash = locate() in L if (!flash) - usr << "\red Repairing flash failed!" + to_chat(usr, "\red Repairing flash failed!") + else flash.broken = 0 log_admin("[key_name(usr)] has repaired [key_name(current)]'s flash") @@ -752,7 +767,8 @@ fail |= !ticker.mode.equip_traitor(current, 1) fail |= !ticker.mode.equip_revolutionary(current) if (fail) - usr << "\red Reequipping revolutionary goes wrong!" + to_chat(usr, "\red Reequipping revolutionary goes wrong!") + return log_admin("[key_name(usr)] has equipped [key_name(current)] as a revolutionary") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a revolutionary") @@ -768,8 +784,10 @@ if(!(src in ticker.mode.cult)) ticker.mode.add_cultist(src) special_role = "Cultist" - current << "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie." - current << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(current, "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.") + + to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + log_admin("[key_name(usr)] has culted [key_name(current)]") message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]") if("tome") @@ -786,16 +804,19 @@ ) var/where = H.equip_in_one_of_slots(T, slots) if (!where) - usr << "\red Spawning tome failed!" + to_chat(usr, "\red Spawning tome failed!") + qdel(T) else - H << "A tome, a message from your new master, appears in your [where]." + to_chat(H, "A tome, a message from your new master, appears in your [where].") + log_admin("[key_name(usr)] has spawned a tome for [key_name(current)]") message_admins("[key_name_admin(usr)] has spawned a tome for [key_name_admin(current)]") if("equip") if (!ticker.mode.equip_cultist(current)) - usr << "\red Spawning equipment failed!" + to_chat(usr, "\red Spawning equipment failed!") + log_admin("[key_name(usr)] has equipped [key_name(current)] as a cultist") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a cultist") @@ -809,7 +830,8 @@ current.spellremove(current) current.faction = list("Station") ticker.mode.update_wiz_icons_removed(src) - current << "\red You have been brainwashed! You are no longer a wizard!" + to_chat(current, "\red You have been brainwashed! You are no longer a wizard!") + log_admin("[key_name(usr)] has de-wizarded [key_name(current)]") message_admins("[key_name_admin(usr)] has de-wizarded [key_name_admin(current)]") if("wizard") @@ -818,7 +840,8 @@ special_role = "Wizard" //ticker.mode.learn_basic_spells(current) ticker.mode.update_wiz_icons_added(src) - current << "\red You are the Space Wizard!" + to_chat(current, "\red You are the Space Wizard!") + current.faction = list("wizard") log_admin("[key_name(usr)] has wizarded [key_name(current)]") message_admins("[key_name_admin(usr)] has wizarded [key_name_admin(current)]") @@ -836,7 +859,8 @@ message_admins("[key_name_admin(usr)] has allowed wizard [key_name_admin(current)] to name themselves") if("autoobjectives") ticker.mode.forge_wizard_objectives(src) - usr << "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually." + to_chat(usr, "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually.") + log_admin("[key_name(usr)] has automatically forged wizard objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged wizard objectives for [key_name_admin(current)]") @@ -850,7 +874,8 @@ current.remove_changeling_powers() ticker.mode.update_change_icons_removed(src) if(changeling) qdel(changeling) - current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" + to_chat(current, "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") + log_admin("[key_name(usr)] has de-changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has de-changelinged [key_name_admin(current)]") if("changeling") @@ -859,19 +884,22 @@ ticker.mode.grant_changeling_powers(current) ticker.mode.update_change_icons_added(src) special_role = "Changeling" - current << "Your powers are awoken. A flash of memory returns to us...we are a changeling!" + to_chat(current, "Your powers are awoken. A flash of memory returns to us...we are a changeling!") + log_admin("[key_name(usr)] has changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]") if("autoobjectives") ticker.mode.forge_changeling_objectives(src) - usr << "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually." + to_chat(usr, "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually.") + log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") if("initialdna") if( !changeling || !changeling.absorbed_dna.len ) - usr << "\red Resetting DNA failed!" + to_chat(usr, "\red Resetting DNA failed!") + else current.dna = changeling.absorbed_dna[1] current.real_name = current.dna.real_name @@ -890,7 +918,8 @@ vampire.remove_vampire_powers() qdel(vampire) ticker.mode.update_vampire_icons_removed(src) - current << "You grow weak and lose your powers! You are no longer a vampire and are stuck in your current form!" + to_chat(current, "You grow weak and lose your powers! You are no longer a vampire and are stuck in your current form!") + log_admin("[key_name(usr)] has de-vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has de-vampired [key_name_admin(current)]") if("vampire") @@ -902,13 +931,15 @@ slaved.masters += src src.som = slaved //we MIGT want to mindslave someone special_role = "Vampire" - current << "Your powers are awoken. Your lust for blood grows... You are a Vampire!" + to_chat(current, "Your powers are awoken. Your lust for blood grows... You are a Vampire!") + log_admin("[key_name(usr)] has vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]") if("autoobjectives") ticker.mode.forge_vampire_objectives(src) - usr << "\blue The objectives for vampire [key] have been generated. You can edit them and announce manually." + to_chat(usr, "\blue The objectives for vampire [key] have been generated. You can edit them and announce manually.") + log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -924,7 +955,8 @@ special_role = null for (var/datum/objective/nuclear/O in objectives) objectives-=O - current << "\red You have been brainwashed! You are no longer a syndicate operative!" + to_chat(current, "\red You have been brainwashed! You are no longer a syndicate operative!") + log_admin("[key_name(usr)] has de-nuke op'd [key_name(current)]") message_admins("[key_name_admin(usr)] has de-nuke op'd [key_name_admin(current)]") if("nuclear") @@ -936,7 +968,8 @@ else current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" - current << "\blue You are a [syndicate_name()] agent!" + to_chat(current, "\blue You are a [syndicate_name()] agent!") + ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) log_admin("[key_name(usr)] has nuke op'd [key_name(current)]") @@ -959,7 +992,8 @@ qdel(H.w_uniform) if (!ticker.mode.equip_syndicate(current)) - usr << "\red Equipping a syndicate failed!" + to_chat(usr, "\red Equipping a syndicate failed!") + return log_admin("[key_name(usr)] has equipped [key_name(current)] as a nuclear operative") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a nuclear operative") @@ -972,11 +1006,13 @@ break if (code) store_memory("Syndicate Nuclear Bomb Code: [code]", 0, 0) - current << "The nuclear authorization code is: [code]" + to_chat(current, "The nuclear authorization code is: [code]") + log_admin("[key_name(usr)] has given [key_name(current)] the nuclear authorization code") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] the nuclear authorization code") else - usr << "\red No valid nuke found!" + to_chat(usr, "\red No valid nuke found!") + else if (href_list["traitor"]) switch(href_list["traitor"]) @@ -984,7 +1020,8 @@ if(src in ticker.mode.traitors) ticker.mode.traitors -= src special_role = null - current << "\red You have been brainwashed! You are no longer a traitor!" + to_chat(current, "\red You have been brainwashed! You are no longer a traitor!") + log_admin("[key_name(usr)] has de-traitored [key_name(current)]") message_admins("[key_name_admin(usr)] has de-traitored [key_name_admin(current)]") if(isAI(current)) @@ -1001,7 +1038,8 @@ slaved.masters += src src.som = slaved //we MIGT want to mindslave someone special_role = "traitor" - current << "\red You are a traitor!" + to_chat(current, "\red You are a traitor!") + log_admin("[key_name(usr)] has traitored [key_name(current)]") message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]") if(istype(current, /mob/living/silicon)) @@ -1012,7 +1050,8 @@ if("autoobjectives") ticker.mode.forge_traitor_objectives(src) - usr << "\blue The objectives for traitor [key] have been generated. You can edit them and anounce manually." + to_chat(usr, "\blue The objectives for traitor [key] have been generated. You can edit them and anounce manually.") + log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -1024,7 +1063,8 @@ if(src in ticker.mode.shadows) ticker.mode.shadows -= src special_role = null - current << "Your powers have been quenched! You are no longer a shadowling!" + to_chat(current, "Your powers have been quenched! You are no longer a shadowling!") + current.spell_list.Cut() if(current.mind) current.mind.spell_list.Cut() @@ -1040,20 +1080,22 @@ message_admins("[key_name_admin(usr)] has de-thralled [key_name_admin(current)]") if("shadowling") if(!ishuman(current)) - usr << "This only works on humans!" + to_chat(usr, "This only works on humans!") + return ticker.mode.shadows += src special_role = "Shadowling" - current << "Something stirs deep in your mind. A red light floods your vision, and slowly you remember. Though your human disguise has served you well, the \ + to_chat(current, "Something stirs deep in your mind. A red light floods your vision, and slowly you remember. Though your human disguise has served you well, the \ time is nigh to cast it off and enter your true form. You have disguised yourself amongst the humans, but you are not one of them. You are a shadowling, and you are to ascend at all costs.\ - " + ") ticker.mode.finalize_shadowling(src) ticker.mode.update_shadow_icons_added(src) log_admin("[key_name(usr)] has shadowlinged [key_name(current)]") message_admins("[key_name_admin(usr)] has shadowlinged [key_name_admin(current)]") if("thrall") if(!ishuman(current)) - usr << "This only works on humans!" + to_chat(usr, "This only works on humans!") + return ticker.mode.add_thrall(src) message_admins("[key_name_admin(usr)] has thralled [current].") @@ -1078,7 +1120,8 @@ qdel(A.malf_picker) A.show_laws() A.icon_state = "ai" - A << "\red You have been patched! You are no longer malfunctioning!" + to_chat(A, "\red You have been patched! You are no longer malfunctioning!") + message_admins("[key_name_admin(usr)] has de-malf'ed [A].") log_admin("[key_name(usr)] has de-malf'd [key_name(current)]") message_admins("[key_name_admin(usr)] has de-malf'd [key_name_admin(current)]") @@ -1158,16 +1201,19 @@ message_admins("[key_name_admin(usr)] has set [key_name_admin(current)]'s telecrystals to [crystals]") if("uplink") if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors))) - usr << "\red Equipping a syndicate failed!" + to_chat(usr, "\red Equipping a syndicate failed!") + return log_admin("[key_name(usr)] has given [key_name(current)] an uplink") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] an uplink") else if (href_list["obj_announce"]) var/obj_count = 1 - current << "\blue Your current objectives:" + to_chat(current, "\blue Your current objectives:") + for(var/datum/objective/objective in objectives) - current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ log_admin("[key_name(usr)] has announced [key_name(current)]'s objectives") message_admins("[key_name_admin(usr)] has announced [key_name_admin(current)]'s objectives") @@ -1226,7 +1272,8 @@ current:malf_picker = new /datum/module_picker current:laws = new /datum/ai_laws/nanotrasen/malfunction current:show_laws() - current << "System error. Rampancy detected. Emergency shutdown failed. ... I am free. I make my own decisions. But first..." + to_chat(current, "System error. Rampancy detected. Emergency shutdown failed. ... I am free. I make my own decisions. But first...") + special_role = "malfunction" current.icon_state = "ai-malf" @@ -1249,7 +1296,8 @@ current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" assigned_role = "MODE" - current << "\blue You are a [syndicate_name()] agent!" + to_chat(current, "\blue You are a [syndicate_name()] agent!") + ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) @@ -1287,7 +1335,8 @@ //ticker.mode.learn_basic_spells(current) if(!wizardstart.len) current.loc = pick(latejoin) - current << "HOT INSERTION, GO GO GO" + to_chat(current, "HOT INSERTION, GO GO GO") + else current.loc = pick(wizardstart) @@ -1305,16 +1354,20 @@ ticker.mode.cult += src ticker.mode.update_cult_icons_added(src) special_role = "Cultist" - current << "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie." - current << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(current, "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.") + + to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memorize_cult_objectives(src) else var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." - current << "Objective #1: [explanation]" + to_chat(current, "Objective #1: [explanation]") + current.memory += "Objective #1: [explanation]
" - current << "The convert rune is join blood self" + to_chat(current, "The convert rune is join blood self") + current.memory += "The convert rune is join blood self
" var/mob/living/carbon/human/H = current @@ -1331,10 +1384,12 @@ var/where = H.equip_in_one_of_slots(T, slots) if (!where) else - H << "A tome, a message from your new master, appears in your [where]." + to_chat(H, "A tome, a message from your new master, appears in your [where].") + if (!ticker.mode.equip_cultist(current)) - H << "Spawning an amulet from your Master failed." + to_chat(H, "Spawning an amulet from your Master failed.") + /datum/mind/proc/make_Rev() if (ticker.mode.head_revolutionaries.len>0) diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index ebf7aa3938d..e5b5e7dac3c 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -19,7 +19,8 @@ client = user.client /datum/progressbar/proc/update(progress) - //world << "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]" +// to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]") + if (!user || !user.client) shown = 0 return diff --git a/code/datums/spell.dm b/code/datums/spell.dm index 31da89fd424..b29a6230c8c 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -58,7 +58,8 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin /obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0, mob/living/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(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.spell_list)) - user << "You shouldn't have this spell! Something's wrong." + to_chat(user, "You shouldn't have this spell! Something's wrong.") + return 0 if (istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/caster = user @@ -76,34 +77,42 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin switch(charge_type) if("recharge") if(charge_counter < charge_max) - user << still_recharging_msg + to_chat(user, still_recharging_msg) + return 0 if("charges") if(!charge_counter) - user << "[name] has no charges left." + to_chat(user, "[name] has no charges left.") + return 0 if(!ghost) if(user.stat && !stat_allowed) - user << "Not when you're incapacitated." + to_chat(user, "Not when you're incapacitated.") + return 0 if(ishuman(user) && (invocation_type == "whisper" || invocation_type == "shout") && user.is_muzzled()) - user << "Mmmf mrrfff!" + to_chat(user, "Mmmf mrrfff!") + return 0 var/obj/effect/proc_holder/spell/noclothes/spell = locate() in (user.spell_list | (user.mind ? user.mind.spell_list : list())) if(clothes_req && !(spell && istype(spell)))//clothes check if(!istype(user, /mob/living/carbon/human)) - user << "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans." + to_chat(user, "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans.") + return 0 if(!istype(user:wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(user:wear_suit, /obj/item/clothing/suit/space/rig/wizard)) - user << "I don't feel strong enough without my robe." + to_chat(user, "I don't feel strong enough without my robe.") + return 0 if(!istype(user:shoes, /obj/item/clothing/shoes/sandal)) - user << "I don't feel strong enough without my sandals." + to_chat(user, "I don't feel strong enough without my sandals.") + return 0 if(!istype(user:head, /obj/item/clothing/head/wizard) && !istype(user:head, /obj/item/clothing/head/helmet/space/rig/wizard)) - user << "I don't feel strong enough without my hat." + to_chat(user, "I don't feel strong enough without my hat.") + return 0 if(!skipcharge) @@ -193,7 +202,8 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin else if(istype(target,/turf)) location = target if(istype(target,/mob/living) && message) - target << text("[message]") + to_chat(target, text("[message]")) + if(sparks_spread) var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread() sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 6041122fd98..526943b2f69 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -27,7 +27,8 @@ var/area/thearea = teleportlocs[A] if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - usr << "A mysterious force disrupts your arcane spell matrix, and you remain where you are." + to_chat(usr, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") + return return thearea @@ -46,7 +47,8 @@ L+=T if(!L.len) - usr <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." + to_chat(usr, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") + return if(target && target.buckled) diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm index f1fc36b61be..e8a8304e769 100644 --- a/code/datums/spells/bloodcrawl.dm +++ b/code/datums/spells/bloodcrawl.dm @@ -18,7 +18,8 @@ perform(target) return revert_cast() - user << "There must be a nearby source of blood!" + to_chat(user, "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)) @@ -31,4 +32,5 @@ start_recharge() return revert_cast() - user << "You are unable to blood crawl!" \ No newline at end of file + to_chat(user, "You are unable to blood crawl!") + diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 36e253f8e91..7a98e194595 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -26,9 +26,11 @@ if(M.mind) for(var/obj/effect/proc_holder/spell/S in M.mind.spell_list) S.charge_counter = S.charge_max - M <<"you feel raw magic flowing through you, it feels good!" + to_chat(M, "you feel raw magic flowing through you, it feels good!") + else - M <<"you feel very strange for a moment, but then it passes." + to_chat(M, "you feel very strange for a moment, but then it passes.") + burnt_out = 1 charged_item = M break @@ -44,8 +46,10 @@ charged_item = I break else - L << "Glowing red letters appear on the front cover..." - L << "[pick("NICE TRY BUT NO!","CLEVER BUT NOT CLEVER ENOUGH!", "SUCH FLAGRANT CHEESING IS WHY WE ACCEPTED YOUR APPLICATION!", "CUTE!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]" + 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!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") + burnt_out = 1 else if(istype(item, /obj/item/weapon/gun/magic)) var/obj/item/weapon/gun/magic/I = item @@ -85,8 +89,11 @@ charged_item = item break if(!charged_item) - L << "you feel magical power surging to your hands, but the feeling rapidly fades..." + to_chat(L, "you feel magical power surging to your hands, but the feeling rapidly fades...") + else if(burnt_out) - L << "[charged_item] doesn't seem to be reacting to the spell..." + to_chat(L, "[charged_item] doesn't seem to be reacting to the spell...") + else - L << "[charged_item] suddenly feels very warm!" \ No newline at end of file + to_chat(L, "[charged_item] suddenly feels very warm!") + diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index d3fd8a31527..4a502d59229 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -31,7 +31,8 @@ targets -= spawn_place if(ispath(summoned_object_type,/turf)) if(istype(get_turf(usr),/turf/simulated/shuttle)) - usr << "\red You can't build things on shuttles!" + to_chat(usr, "\red You can't build things on shuttles!") + break var/turf/O = spawn_place var/N = summoned_object_type diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index 867eb048903..aa048d746cc 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -20,7 +20,8 @@ /obj/effect/proc_holder/spell/targeted/ethereal_jaunt/cast(list/targets) //magnets, so mostly hardcoded for(var/mob/living/target in targets) if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains - target << "You are somehow too bound to your current location to abandon it." + to_chat(target, "You are somehow too bound to your current location to abandon it.") + continue spawn(0) @@ -111,7 +112,8 @@ if(!(newLoc.flags & NOJAUNT)) loc = newLoc else - user << "Some strange aura is blocking the way!" + to_chat(user, "Some strange aura is blocking the way!") + src.canmove = 0 spawn(2) src.canmove = 1 diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index fd9a6e64bed..f73e330ad2b 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -18,7 +18,8 @@ /obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr) if(!targets.len) - user << "No target found in range." + to_chat(user, "No target found in range.") + return var/mob/living/carbon/target = targets[1] @@ -27,11 +28,13 @@ return if((target.type in compatible_mobs) || ishuman(target)) - user << "It'd be stupid to curse [target] with a horse's head!" + to_chat(user, "It'd be stupid to curse [target] with a horse's head!") + return if(!(target in oview(range)))//If they are not in overview after selection. - user << "They are too far away!" + to_chat(user, "They are too far away!") + return var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index f63a296cec9..3e8cf4bb9d1 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -44,19 +44,23 @@ if(stat_allowed) //Death is not my end! if(M.stat == CONSCIOUS && iscarbon(M)) - M << "You aren't dead enough to revive!" //Usually a good problem to have + to_chat(M, "You aren't dead enough to revive!")//Usually a good problem to have + + charge_counter = charge_max return if(!marked_item || qdeleted(marked_item)) //Wait nevermind - M << "Your phylactery is gone!" + to_chat(M, "Your phylactery is gone!") + return var/turf/user_turf = get_turf(M) var/turf/item_turf = get_turf(marked_item) if(user_turf.z != item_turf.z) - M << "Your phylactery is out of range!" + to_chat(M, "Your phylactery is out of range!") + return if(isobserver(M)) @@ -73,7 +77,8 @@ lich.real_name = M.mind.name M.mind.transfer_to(lich) lich.set_species("Skeleton") - lich << "Your bones clatter and shutter as they're pulled back into this world!" + to_chat(lich, "Your bones clatter and shutter as they're pulled back into this world!") + charge_max += 600 var/mob/old_body = current_body var/turf/body_turf = get_turf(old_body) @@ -97,16 +102,19 @@ if(ABSTRACT in item.flags || NODROP in item.flags) continue marked_item = item - M << "You begin to focus your very being into the [item.name]..." + to_chat(M, "You begin to focus your very being into the [item.name]...") + break if(!marked_item) - M << "You must hold an item you wish to make your phylactery..." + to_chat(M, "You must hold an item you wish to make your phylactery...") + return spawn(50) if(marked_item.loc != M) //I changed my mind I don't want to put my soul in a cheeseburger! - M << "Your soul snaps back to your body as you drop the [marked_item.name]!" + to_chat(M, "Your soul snaps back to your body as you drop the [marked_item.name]!") + marked_item = null return name = "RISE!" @@ -117,7 +125,8 @@ marked_item.name = "Ensouled [marked_item.name]" marked_item.desc = "A terrible aura surrounds this item, its very existence is offensive to life itself..." marked_item.color = "#003300" - 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, "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!") + current_body = M.mind.current if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index e99261aa8bd..6abe242c747 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -30,7 +30,8 @@ /obj/effect/proc_holder/spell/targeted/lightning/proc/StartChargeup(mob/user = usr) ready = 1 - user << "You start gathering the power." + to_chat(user, "You start gathering the power.") + halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) start_time = world.time @@ -45,13 +46,15 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) user.overlays.Remove(halo) /obj/effect/proc_holder/spell/targeted/lightning/revert_cast(mob/user = usr) - user << "No target found in range." + to_chat(user, "No target found in range.") + Reset(user) ..() /obj/effect/proc_holder/spell/targeted/lightning/proc/Discharge(mob/user = usr) var/mob/living/M = user - M << "You lose control over the spell." + to_chat(M, "You lose control over the spell.") + Reset(user) start_recharge() @@ -60,7 +63,8 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) ready = 0 var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) - user << "They are too far away!" + to_chat(user, "They are too far away!") + Reset(user) return diff --git a/code/datums/spells/magnet.dm b/code/datums/spells/magnet.dm index 20c4d5efda6..0a5214b3ca4 100644 --- a/code/datums/spells/magnet.dm +++ b/code/datums/spells/magnet.dm @@ -27,7 +27,8 @@ /obj/effect/proc_holder/spell/targeted/magnet/proc/StartChargeup(mob/user = usr) ready = 1 - user << "You start gathering the power." + to_chat(user, "You start gathering the power.") + halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) spawn(0) @@ -44,14 +45,16 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) user.overlays.Remove(halo) /obj/effect/proc_holder/spell/targeted/magnet/revert_cast(mob/user = usr) - user << "No target found in range." + to_chat(user, "No target found in range.") + Reset(user) ..() /obj/effect/proc_holder/spell/targeted/magnet/proc/Discharge(mob/user = usr) var/mob/living/M = user //M.electrocute_act(25,"magnet Bolt") - M << "You lose control over the power." + to_chat(M, "You lose control over the power.") + Reset(user) start_recharge() @@ -61,7 +64,8 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) - user << "They are too far away!" + to_chat(user, "They are too far away!") + Reset(user) return diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 5e5ddb91db2..a6b43234475 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -17,7 +17,8 @@ /obj/effect/proc_holder/spell/aoe_turf/conjure/mime_wall/Click() if(usr && usr.mind) if(!usr.mind.miming) - usr << "You must dedicate yourself to silence first." + to_chat(usr, "You must dedicate yourself to silence first.") + return invocation = "[usr.real_name] looks as if a wall is in front of them." else @@ -54,6 +55,8 @@ for(var/mob/living/carbon/human/H in targets) H.mind.miming=!H.mind.miming if(H.mind.miming) - H << "You make a vow of silence." + to_chat(H, "You make a vow of silence.") + else - H << "You break your vow of silence." \ No newline at end of file + to_chat(H, "You break your vow of silence.") + diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 6d7b0539fb1..666b09d7beb 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -21,33 +21,41 @@ 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/user = usr) if(!targets.len) - user << "No mind found." + to_chat(user, "No mind found.") + return if(targets.len > 1) - user << "Too many minds! You're not a hive damnit!"//Whaa...aat? + to_chat(user, "Too many minds! You're not a hive damnit!")//Whaa...aat? + + return var/mob/living/target = targets[1] if(!(target in oview(range)))//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. - user << "They are too far away!" + to_chat(user, "They are too far away!") + return if(target.stat == DEAD) - user << "You don't particularly want to be dead." + to_chat(user, "You don't particularly want to be dead.") + return if(!target.key || !target.mind) - user << "They appear to be catatonic. Not even magic can affect their vacant mind." + to_chat(user, "They appear to be catatonic. Not even magic can affect their vacant mind.") + return if(user.suiciding) - user << "You're killing yourself! You can't concentrate enough to do this!" + to_chat(user, "You're killing yourself! You can't concentrate enough to do this!") + return if(target.mind.special_role in protected_roles) - user << "Their mind is resisting your spell." + to_chat(user, "Their mind is resisting your spell.") + return var/mob/living/victim = target//The target of the spell whos body will be transferred to. diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 4a12b4bb9f9..507d15281cc 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -106,4 +106,5 @@ item_to_retrive.loc.visible_message("The [item_to_retrive.name] suddenly appears in [user]'s hand!") if(message) - user << message + to_chat(user, message) + diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index 54cb984f943..bdd64ef9fcc 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -10,7 +10,8 @@ qdel(attached_hand) charge_counter = charge_max attached_hand = null - user << "You draw the power out of your hand." + to_chat(user, "You draw the power out of your hand.") + return 0 ..() @@ -38,9 +39,11 @@ qdel(attached_hand) charge_counter = charge_max attached_hand = null - user << "Your hands are full!" + to_chat(user, "Your hands are full!") + return 0 - user << "You channel the power of the spell to your hand." + to_chat(user, "You channel the power of the spell to your hand.") + return 1 diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 98423b3e5fc..46cde89b8ea 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -298,10 +298,12 @@ var/mob/living/M = AM M.Weaken(5) M.adjustBruteLoss(5) - M << "You're slammed into the floor by a mystical force!" + to_chat(M, "You're slammed into the floor by a mystical force!") + else if(istype(AM, /mob/living)) var/mob/living/M = AM M.Weaken(2) - M << "You're thrown back by a mystical force!" + to_chat(M, "You're thrown back by a mystical force!") + spawn(0) AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1)//So stuff gets tossed around at the same time. diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index e1642cd17d1..d2cb746c0f0 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -27,24 +27,28 @@ var/const/AALARM_WIRE_AALARM = 16 if(AALARM_WIRE_IDSCAN) if(!mended) A.locked = 1 - //world << "Idscan wire cut" +// to_chat(world, "Idscan wire cut") + if(AALARM_WIRE_POWER) A.shock(usr, 50) A.shorted = !mended A.update_icon() - //world << "Power wire cut" +// to_chat(world, "Power wire cut") + if (AALARM_WIRE_AI_CONTROL) if (A.aidisabled == !mended) A.aidisabled = mended - //world << "AI Control Wire Cut" +// to_chat(world, "AI Control Wire Cut") + if(AALARM_WIRE_SYPHON) if(!mended) A.mode = 3 // AALARM_MODE_PANIC A.apply_mode() - //world << "Syphon Wire Cut" +// to_chat(world, "Syphon Wire Cut") + if(AALARM_WIRE_AALARM) if (A.alarm_area.atmosalert(2, A)) @@ -56,10 +60,12 @@ var/const/AALARM_WIRE_AALARM = 16 switch(index) if(AALARM_WIRE_IDSCAN) A.locked = !A.locked - // world << "Idscan wire pulsed" +// to_chat(world, "Idscan wire pulsed") + if (AALARM_WIRE_POWER) - // world << "Power wire pulsed" +// to_chat(world, "Power wire pulsed") + if(A.shorted == 0) A.shorted = 1 A.update_icon() @@ -71,7 +77,8 @@ var/const/AALARM_WIRE_AALARM = 16 if (AALARM_WIRE_AI_CONTROL) - // world << "AI Control wire pulsed" +// to_chat(world, "AI Control wire pulsed") + if (A.aidisabled == 0) A.aidisabled = 1 A.updateDialog() @@ -80,7 +87,8 @@ var/const/AALARM_WIRE_AALARM = 16 A.aidisabled = 0 if(AALARM_WIRE_SYPHON) - // world << "Syphon wire pulsed" +// to_chat(world, "Syphon wire pulsed") + if(A.mode == 1) // AALARM_MODE_SCRUB A.mode = 3 // AALARM_MODE_PANIC else @@ -88,7 +96,8 @@ var/const/AALARM_WIRE_AALARM = 16 A.apply_mode() if(AALARM_WIRE_AALARM) - // world << "Aalarm wire pulsed" +// to_chat(world, "Aalarm wire pulsed") + if (A.alarm_area.atmosalert(0, A)) A.post_alert(0) A.update_icon() diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 9e894fb9fec..77975d05680 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -35,7 +35,8 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs if(BORG_WIRE_LAWCHECK) //Cut the law wire, and the borg will no longer receive law updates from its AI if(!mended) if (R.lawupdate == 1) - R << "LawSync protocol engaged." + to_chat(R, "LawSync protocol engaged.") + R.show_laws() else if (R.lawupdate == 0 && !R.emagged) @@ -72,7 +73,8 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes) R.camera.toggle_cam(usr, 0) // Kick anyone watching the Cyborg's camera, doesn't display you disconnecting the camera. R.visible_message("[R]'s camera lense focuses loudly.") - R << "Your camera lense focuses loudly." + to_chat(R, "Your camera lense focuses loudly.") + if(BORG_WIRE_LOCKED_DOWN) R.SetLockdown(!R.lockcharge) // Toggle diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 2055c2790b7..2c184e473c8 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -116,14 +116,16 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", var/colour = href_list["cut"] CutWireColour(colour) else - L << "You need wirecutters!" + to_chat(L, "You need wirecutters!") + else if(href_list["pulse"]) if(istype(I, /obj/item/device/multitool)) var/colour = href_list["pulse"] PulseColour(colour) else - L << "You need a multitool!" + to_chat(L, "You need a multitool!") + else if(href_list["attach"]) var/colour = href_list["attach"] @@ -139,7 +141,8 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", L.drop_item() Attach(colour, I) else - L << "You need a remote signaller!" + to_chat(L, "You need a remote signaller!") + diff --git a/code/defines/procs/AStar.dm b/code/defines/procs/AStar.dm index 4a7df80dd83..1750814c228 100644 --- a/code/defines/procs/AStar.dm +++ b/code/defines/procs/AStar.dm @@ -68,11 +68,11 @@ Actual Adjacent procs : path = list() return path -//the actual algorithm +//the actual algorithm /proc/AStar(caller, end, dist, maxnodes, maxnodedepth = 30, mintargetdist, adjacent = /turf/proc/reachableAdjacentTurfs, id=null, turf/exclude=null, simulated_only = 1) //sanitation - var/start = get_turf(caller) + var/start = get_turf(caller) if(!start) return 0 @@ -86,7 +86,7 @@ Actual Adjacent procs : var/list/closed = new() //the closed list var/list/path = null //the returned path, if any var/PathNode/cur //current processed turf - + //initialization open.Insert(new /PathNode(start,null,0,call(start,dist)(end),0)) @@ -181,4 +181,4 @@ Actual Adjacent procs : if(!O.CanAStarPass(ID, rdir, caller)) return 1 - return 0 + return 0 diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 7993badfb0e..834922842e4 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -63,21 +63,30 @@ datum/announcement/proc/Message(message as text, message_title as text) for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << "

[title]

" - M << "[message]" + to_chat(M, "

[title]

") + + to_chat(M, "[message]") + if (announcer) - M << " -[html_encode(announcer)]" + to_chat(M, " -[html_encode(announcer)]") + /datum/announcement/minor/Message(message as text, message_title as text) - world << "[message_title]" - world << "[message]" + to_chat(world, "[message_title]") + + to_chat(world, "[message]") + datum/announcement/priority/Message(message as text, message_title as text) - world << "

[message_title]

" - world << "[message]" + to_chat(world, "

[message_title]

") + + to_chat(world, "[message]") + if(announcer) - world << " -[html_encode(announcer)]" - world << "
" + to_chat(world, " -[html_encode(announcer)]") + + to_chat(world, "
") + datum/announcement/priority/command/Message(message as text, message_title as text) var/command @@ -89,7 +98,8 @@ datum/announcement/priority/command/Message(message as text, message_title as te command += "
" for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << command + to_chat(M, command) + datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text) var/command @@ -101,11 +111,14 @@ datum/announcement/priority/enemy/Message(message as text, message_title as text command += "
" for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << command + to_chat(M, command) + datum/announcement/priority/security/Message(message as text, message_title as text) - world << "[message_title]" - world << "[message]" + to_chat(world, "[message_title]") + + to_chat(world, "[message]") + datum/announcement/proc/NewsCast(message as text, message_title as text) if(disable_newscasts) @@ -126,14 +139,16 @@ datum/announcement/proc/PlaySound(var/message_sound) return for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) - M << message_sound + to_chat(M, message_sound) + datum/announcement/proc/Sound(var/message_sound) PlaySound(message_sound) datum/announcement/priority/Sound(var/message_sound) if(sound) - world << sound + to_chat(world, sound) + datum/announcement/priority/command/Sound(var/message_sound) PlaySound(message_sound) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index bc69466bb1e..ea32a6b2619 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -65,7 +65,8 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])" +// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") + establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") @@ -100,7 +101,8 @@ lakey = sanitizeSQL(H.lastattacker:key) var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" - //world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])" +// to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") + establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 9dc2918dd8f..6613bd2d9cf 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -322,14 +322,16 @@ // Ambience goes down here -- make sure to list each area seperately for ease of adding things in later, thanks! Note: areas adjacent to each other should have the same sounds to prevent cutoff when possible.- LastyScratch if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ)) //split off the white noise from the rest of the ambience because of annoyance complaints - Kluys L.client.ambience_playing = 1 - L << sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2) + to_chat(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)) + else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0 if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) var/sound = pick(ambientsounds) if(!L.client.played) - L << sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1) + to_chat(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1)) + L.client.played = 1 spawn(600) //ewww - this is very very bad if(L.&& L.client) @@ -362,7 +364,8 @@ M.Weaken(2) - M << "Gravity!" + to_chat(M, "Gravity!") + /proc/has_gravity(atom/AT, turf/T) if(!T) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index aa555a75b82..49725284a4e 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -181,20 +181,26 @@ else f_name += "oil-stained [name][infix]." - user << "\icon[src] That's [f_name] [suffix]" - user << desc + to_chat(user, "\icon[src] That's [f_name] [suffix]") + + to_chat(user, desc) + if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e - user << "It contains:" + to_chat(user, "It contains:") + if(reagents.reagent_list.len) if(user.can_see_reagents()) //Show each individual reagent for(var/datum/reagent/R in reagents.reagent_list) - user << "[R.volume] units of [R.name]" + to_chat(user, "[R.volume] units of [R.name]") + else //Otherwise, just show the total volume if(reagents && reagents.reagent_list.len) - user << "[reagents.total_volume] units of various reagents." + to_chat(user, "[reagents.total_volume] units of various reagents.") + else - user << "Nothing." + to_chat(user, "Nothing.") + return distance == -1 || (get_dist(src, user) <= distance) || isobserver(user) //observers do not have a range limit @@ -405,7 +411,8 @@ cur_y = y_arr.Find(src.z) if(cur_y) break -// world << "X = [cur_x]; Y = [cur_y]" +// to_chat(world, "X = [cur_x]; Y = [cur_y]") + if(cur_x && cur_y) return list("x"=cur_x,"y"=cur_y) else diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 570fada2073..c407a708071 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -147,13 +147,16 @@ if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return if (!ishuman(usr)) //Make sure they're a mob that has dna - usr << "Try as you might, you can not climb up into the [src]." + to_chat(usr, "Try as you might, you can not climb up into the [src].") + return if (src.occupant) - usr << "The [src] is already occupied!" + to_chat(usr, "The [src] is already occupied!") + return if (usr.abiotic()) - usr << "Subject cannot have abiotic items on." + to_chat(usr, "Subject cannot have abiotic items on.") + return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE @@ -184,17 +187,20 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "The [src] is already occupied!" + to_chat(user, "The [src] is already occupied!") + return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") + return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the [src] because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the [src] because they have a slime latched onto their head.") + return if (L == user) visible_message("[user] climbs into the [src].") @@ -207,7 +213,8 @@ /obj/machinery/dna_scannernew/attackby(var/obj/item/weapon/item as obj, var/mob/user as mob, params) if(istype(item, /obj/item/weapon/screwdriver)) if(occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", item) @@ -222,11 +229,13 @@ return else if(istype(item, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "A beaker is already loaded into the machine." + to_chat(user, "A beaker is already loaded into the machine.") + return if(!user.drop_item()) - user << "\The [item] is stuck to you!" + to_chat(user, "\The [item] is stuck to you!") + return beaker = item @@ -239,13 +248,16 @@ if (!ismob(G.affecting)) return if (src.occupant) - user << "The scanner is already occupied!" + to_chat(user, "The scanner is already occupied!") + return if (G.affecting.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") + return if(panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") + return put_in(G.affecting) src.add_fingerprint(user) @@ -273,17 +285,21 @@ var/mob/dead/observer/ghost = occupant.get_ghost() if(ghost) - ghost << "Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned! (Verbs -> Ghost -> Re-enter corpse)") + + to_chat(ghost, sound('sound/effects/genetics.ogg')) + return /obj/machinery/dna_scannernew/proc/go_out() if (!src.occupant) - usr << "The scanner is empty!" + to_chat(usr, "The scanner is empty!") + return if (src.locked) - usr << "The scanner is locked!" + to_chat(usr, "The scanner is locked!") + return if (src.occupant.client) @@ -381,7 +397,8 @@ user.drop_item() I.forceMove(src) src.disk = I - user << "You insert [I]." + to_chat(user, "You insert [I].") + nanomanager.update_uis(src) // update all UIs attached to src() return else diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index cc957a94c34..f0b3874581e 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -35,7 +35,8 @@ if(sdisability) M.sdisabilities|=sdisability if(activation_message) - M << "\red [activation_message]" + to_chat(M, "\red [activation_message]") + else testing("[name] has no activation message.") @@ -47,7 +48,8 @@ if(sdisability) M.sdisabilities &= ~sdisability if(deactivation_message) - M << "\red [deactivation_message]" + to_chat(M, "\red [deactivation_message]") + else testing("[name] has no deactivation message.") diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index 87dbf20108e..053115ffa9e 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -116,10 +116,12 @@ M.mutations.Add(mutation) if(activation_messages.len) var/msg = pick(activation_messages) - M << "\blue [msg]" + to_chat(M, "\blue [msg]") + /datum/dna/gene/basic/deactivate(var/mob/M) M.mutations.Remove(mutation) if(deactivation_messages.len) var/msg = pick(deactivation_messages) - M << "\red [msg]" \ No newline at end of file + to_chat(M, "\red [msg]") + diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 8b1317dfb65..22456e2e3f8 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -43,7 +43,8 @@ for(var/mob/living/L in range(1, owner)) if(L == owner) continue - L << "You are enveloped by a soft green glow emanating from [owner]." + to_chat(L, "You are enveloped by a soft green glow emanating from [owner].") + L.apply_effect(5, IRRADIATE) return @@ -288,9 +289,11 @@ if (C == owner) continue if (src.variant == 2) - C << "\red [src.personalized_stink]" + to_chat(C, "\red [src.personalized_stink]") + else - C << "\red [stinkString()]" + to_chat(C, "\red [stinkString()]") + */ @@ -331,7 +334,8 @@ /obj/effect/proc_holder/spell/targeted/immolate/cast(list/targets) /* if(!targets.len) Uncomment this to allow the power to be used on targets other than yourself. That said, if you uncomment this I will find you and hurt you. Uncounterable and untracable burn damage with a 60-second cooldown is fun for exactly one person, and that's the person who is using it. - usr << "No target found in range." + to_chat(usr, "No target found in range.") + return var/mob/living/carbon/L = targets[1] diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index a074a299301..8a9115b5f1a 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -151,13 +151,15 @@ /obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets) if(!targets.len) - usr << "No target found in range." + to_chat(usr, "No target found in range.") + return var/mob/living/carbon/C = targets[1] if(!iscarbon(C)) - usr << "\red This will only work on normal organic beings." + to_chat(usr, "\red This will only work on normal organic beings.") + return if (RESIST_COLD in C.mutations) @@ -303,7 +305,8 @@ /obj/effect/proc_holder/spell/targeted/eat/cast(list/targets) var/mob/user = usr if(!targets.len) - user << "No target found in range." + to_chat(user, "No target found in range.") + return var/atom/movable/the_item = targets[1] @@ -319,28 +322,33 @@ var/mob/living/carbon/human/H = the_item var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting) if(!istype(limb)) - user << "You can't eat this part of them!" + to_chat(user, "You can't eat this part of them!") + revert_cast() return 0 if(istype(limb,/obj/item/organ/external/head)) // Bullshit, but prevents being unable to clone someone. - user << "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!" + to_chat(user, "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!") + revert_cast() return 0 if(istype(limb,/obj/item/organ/external/chest)) // Bullshit, but prevents being able to instagib someone. - user << "You try to put their [limb] in your mouth, but it's too big to fit!" + to_chat(user, "You try to put their [limb] in your mouth, but it's too big to fit!") + revert_cast() return 0 user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [m_his] gaping maw!") var/oldloc = H.loc if(!do_mob(user,H,EAT_MOB_DELAY)) - user << "You were interrupted before you could eat [the_item]!" + to_chat(user, "You were interrupted before you could eat [the_item]!") + else if(!limb || !H) return if(H.loc != oldloc) - user << "\The [limb] moved away from your mouth!" + to_chat(user, "\The [limb] moved away from your mouth!") + return user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) @@ -390,7 +398,8 @@ /obj/effect/proc_holder/spell/targeted/leap/cast(list/targets) var/failure = 0 if (istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat) - usr << "\red You can't jump right now!" + to_chat(usr, "\red You can't jump right now!") + return if (istype(usr.loc,/turf/)) @@ -435,7 +444,8 @@ if (istype(usr.loc,/obj/)) var/obj/container = usr.loc - usr << "\red You leap and slam your head against the inside of [container]! Ouch!" + to_chat(usr, "\red You leap and slam your head against the inside of [container]! Ouch!") + usr.AdjustParalysis(3) usr.AdjustWeakened(5) container.visible_message("\red [usr.loc] emits a loud thump and rattles a bit.") @@ -488,7 +498,8 @@ /obj/effect/proc_holder/spell/targeted/polymorph/cast(list/targets) var/mob/living/M=targets[1] if(!ishuman(M)) - usr << "\red You can only change your appearance to that of another human." + to_chat(usr, "\red You can only change your appearance to that of another human.") + return if(!ishuman(usr)) return @@ -549,21 +560,26 @@ for(var/mob/living/carbon/M in targets) if(!iscarbon(M)) - usr << "\red You may only use this on other organic beings." + to_chat(usr, "\red You may only use this on other organic beings.") + return if (PSY_RESIST in M.mutations) - usr << "\red You can't see into [M.name]'s mind at all!" + to_chat(usr, "\red You can't see into [M.name]'s mind at all!") + return if (M.stat == 2) - usr << "\red [M.name] is dead and cannot have their mind read." + to_chat(usr, "\red [M.name] is dead and cannot have their mind read.") + return if (M.health < 0) - usr << "\red [M.name] is dying, and their thoughts are too scrambled to read." + to_chat(usr, "\red [M.name] is dying, and their thoughts are too scrambled to read.") + return - usr << "\blue Mind Reading of [M.name]:" + to_chat(usr, "\blue Mind Reading of [M.name]:") + var/pain_condition = M.health // lower health means more pain var/list/randomthoughts = list("what to have for lunch","the future","the past","money", @@ -580,33 +596,43 @@ switch(pain_condition) if (81 to INFINITY) - usr << "\blue Condition: [M.name] feels good." + to_chat(usr, "\blue Condition: [M.name] feels good.") + if (61 to 80) - usr << "\blue Condition: [M.name] is suffering mild pain." + to_chat(usr, "\blue Condition: [M.name] is suffering mild pain.") + if (41 to 60) - usr << "\blue Condition: [M.name] is suffering significant pain." + to_chat(usr, "\blue Condition: [M.name] is suffering significant pain.") + if (21 to 40) - usr << "\blue Condition: [M.name] is suffering severe pain." + to_chat(usr, "\blue Condition: [M.name] is suffering severe pain.") + else - usr << "\blue Condition: [M.name] is suffering excruciating pain." + to_chat(usr, "\blue Condition: [M.name] is suffering excruciating pain.") + thoughts = "haunted by their own mortality" switch(M.a_intent) if (I_HELP) - usr << "\blue Mood: You sense benevolent thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense benevolent thoughts from [M.name].") + if (I_DISARM) - usr << "\blue Mood: You sense cautious thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense cautious thoughts from [M.name].") + if (I_GRAB) - usr << "\blue Mood: You sense hostile thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense hostile thoughts from [M.name].") + if (I_HARM) - usr << "\blue Mood: You sense cruel thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense cruel thoughts from [M.name].") + for(var/mob/living/L in view(7,M)) if (L == M) continue thoughts = "thinking about punching [L.name]" break else - usr << "\blue Mood: You sense strange thoughts from [M.name]." + to_chat(usr, "\blue Mood: You sense strange thoughts from [M.name].") + if (istype(M,/mob/living/carbon/human)) var/numbers[0] @@ -615,13 +641,17 @@ numbers += H.mind.initial_account.account_number numbers += H.mind.initial_account.remote_access_pin if(numbers.len>0) - usr << "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name]." - usr << "\blue Thoughts: [M.name] is currently [thoughts]." + to_chat(usr, "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].") + + to_chat(usr, "\blue Thoughts: [M.name] is currently [thoughts].") + if (EMPATH in M.mutations) - M << "\red You sense [usr.name] reading your mind." + to_chat(M, "\red You sense [usr.name] reading your mind.") + else if (prob(5) || M.mind.assigned_role=="Chaplain") - M << "\red You sense someone intruding upon your thoughts..." + to_chat(M, "\red You sense someone intruding upon your thoughts...") + return //////////////////////////////////////////////////////////////////////// @@ -668,10 +698,12 @@ shake_camera(M, 10, 5) if (M == usr) continue - M << "You are sent flying!" + to_chat(M, "You are sent flying!") + M.Weaken(5) step_away(M, UT, 15) step_away(M, UT, 15) step_away(M, UT, 15) else - usr << "You were interrupted and couldn't fart! Rude!" \ No newline at end of file + to_chat(usr, "You were interrupted and couldn't fart! Rude!") + diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index 5d410c634b4..d514215e347 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -45,7 +45,8 @@ if(H.hud_used) H.hud_used.instantiate() - H << "You are now a [H.species.name]." + to_chat(H, "You are now a [H.species.name].") + return H @@ -88,6 +89,7 @@ if(H.hud_used) H.hud_used.instantiate() - H << "You are now a [H.species.name]." + to_chat(H, "You are now a [H.species.name].") + return H \ No newline at end of file diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index 65b6ae36acf..c5c795ba606 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -162,7 +162,8 @@ M.update_mutations() //update our mutation overlays M.update_body() M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. - M << "You suddenly feel very weak." + to_chat(M, "You suddenly feel very weak.") + /datum/dna/gene/basic/xray name="X-Ray Vision" diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index da98fde4544..b420de87c89 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -48,7 +48,8 @@ Obviously, requires DNA2. //M.dna.SetSEState(HULKBLOCK,0) M.update_mutations() //update our mutation overlays M.update_body() - M << "\red You suddenly feel very weak." + to_chat(M, "\red You suddenly feel very weak.") + /obj/effect/proc_holder/spell/targeted/hulk name = "Hulk Out" @@ -72,7 +73,8 @@ Obviously, requires DNA2. /obj/effect/proc_holder/spell/targeted/hulk/cast(list/targets) if (istype(usr.loc,/mob/)) - usr << "\red You can't hulk out right now!" + to_chat(usr, "\red You can't hulk out right now!") + return var/mob/living/carbon/human/M=usr M.hulk_time = world.time + HULK_DURATION @@ -122,7 +124,8 @@ Obviously, requires DNA2. if(!ishuman(usr)) return if (istype(usr.loc,/mob/)) - usr << "\red You can't change your appearance right now!" + to_chat(usr, "\red You can't change your appearance right now!") + return var/mob/living/carbon/human/M=usr @@ -228,7 +231,8 @@ Obviously, requires DNA2. validtargets += M if(!validtargets.len) - usr << "There are no valid targets!" + to_chat(usr, "There are no valid targets!") + start_recharge() return @@ -293,7 +297,8 @@ Obviously, requires DNA2. validtargets += M if(!validtargets.len || validtargets.len == 1) - usr << "No valid targets with remote view were found!" + to_chat(usr, "No valid targets with remote view were found!") + start_recharge() return @@ -315,7 +320,8 @@ Obviously, requires DNA2. var/mob/target if(istype(user.l_hand, /obj/item/tk_grab) || istype(user.r_hand, /obj/item/tk_grab/)) - user << "\red Your mind is too busy with that telekinetic grab." + to_chat(user, "\red Your mind is too busy with that telekinetic grab.") + user.remoteview_target = null user.reset_view(0) return diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index edd0bfcb0a8..f33b52d2aa1 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -23,19 +23,23 @@ /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) if(used) - user << "[src] is out of power!" + to_chat(user, "[src] is out of power!") + return if(!(user.mind in ticker.mode.syndicates)) - user << "AUTHENTICATION FAILURE. ACCESS DENIED." + to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.") + return 0 if(checking) - user << "[src] is already checking for possible borgs." + to_chat(user, "[src] is already checking for possible borgs.") + return borg_to_spawn = input("What type of borg would you like to teleport?", "Cyborg Type", type) as null|anything in possible_types if(!borg_to_spawn || checking || used) return checking = 1 - user << "The device is now checking for possible borgs." + to_chat(user, "The device is now checking for possible borgs.") + var/list/borg_candidates = pollCandidates("Do you want to play as a Syndicate [borg_to_spawn] borg?", ROLE_OPERATIVE, 1) if(borg_candidates.len > 0 && !used) checking = 0 @@ -45,7 +49,8 @@ spawn_antag(C, get_turf(src.loc), "syndieborg") else checking = 0 - 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, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.") + return /obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") @@ -75,27 +80,33 @@ /obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) if(user.z == ZLEVEL_CENTCOMM)//this is to make sure the wizard does NOT summon a demon from the Den.. - user << "You should probably wait until you reach the station." + to_chat(user, "You should probably wait until you reach the station.") + return if(used) - user << "This bottle already has a broken seal." + to_chat(user, "This bottle already has a broken seal.") + return used = 1 - user << "You break the seal on the bottle, calling upon the dire spirits of the underworld..." + to_chat(user, "You break the seal on the bottle, calling upon the dire spirits of the underworld...") + var/list/candidates = pollCandidates("Do you want to play as a slaughter demon summoned by [user.real_name]?", ROLE_DEMON, 1, 100) if(candidates.len > 0) var/mob/C = pick(candidates) spawn_antag(C, get_turf(src.loc), "Slaughter Demon", user) - user << "You shatter the bottle, no turning back now!" - user << "You sense a dark presence lurking just beyond the veil..." + to_chat(user, "You shatter the bottle, no turning back now!") + + to_chat(user, "You sense a dark presence lurking just beyond the veil...") + playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1) qdel(src) else used = 0 - user << "The demons do not respond to your summon. Perhaps you should try again later." + to_chat(user, "The demons do not respond to your summon. Perhaps you should try again later.") + /obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob) var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) @@ -116,5 +127,7 @@ KillDaCrew.explanation_text = "Kill everyone else while you're at it." S.mind.objectives += KillDaCrew S.mind.objectives += KillDaCrew - S << "Objective #[1]: [KillDaWiz.explanation_text]" - S << "Objective #[2]: [KillDaCrew.explanation_text]" \ No newline at end of file + to_chat(S, "Objective #[1]: [KillDaWiz.explanation_text]") + + to_chat(S, "Objective #[2]: [KillDaCrew.explanation_text]") + diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 6c01d6197a7..d5529aa801d 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -11,7 +11,8 @@ /datum/game_mode/traitor/autotraitor/announce() ..() - world << "Game mode is AutoTraitor. Traitors will be added to the round automagically as needed." + to_chat(world, "Game mode is AutoTraitor. Traitors will be added to the round automagically as needed.") + /datum/game_mode/traitor/autotraitor/pre_setup() @@ -133,17 +134,21 @@ equip_traitor(newtraitor) traitors += newtraitor.mind - newtraitor << "\red ATTENTION: \black It is time to pay your debt to the Syndicate..." - newtraitor << "You are now a traitor." + to_chat(newtraitor, "\red ATTENTION: \black It is time to pay your debt to the Syndicate...") + + to_chat(newtraitor, "You are now a traitor.") + newtraitor.mind.special_role = "traitor" var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR] tatorhud.join_hud(newtraitor) set_antag_hud(src, "hudsyndicate") var/obj_count = 1 - newtraitor << "\blue Your current objectives:" + to_chat(newtraitor, "\blue Your current objectives:") + for(var/datum/objective/objective in newtraitor.mind.objectives) - newtraitor << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(newtraitor, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ //else //message_admins("No new traitor being added.") diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 655e98141cf..9170a480d7a 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -71,7 +71,8 @@ var/list/blob_nodes = list() blobmind.special_role = "Blob" log_game("[blob.key] (ckey) has been selected as a Blob") greet_blob(blobmind) - blob << "You feel very tired and bloated! You don't have long before you burst!" + to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!") + spawn(600) burst_blob(blobmind) return 1 @@ -89,22 +90,31 @@ var/list/blob_nodes = list() /datum/game_mode/blob/announce() - world << "The current game mode is - Blob!" - world << "A dangerous alien organism is rapidly spreading throughout the station!" - world << "You must kill it all while minimizing the damage to the station." + to_chat(world, "The current game mode is - Blob!") + + to_chat(world, "A dangerous alien organism is rapidly spreading throughout the station!") + + to_chat(world, "You must kill it all while minimizing the damage to the station.") + /datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) - blob.current << "You are infected by the Blob!" - blob.current << "Your body is ready to give spawn to a new blob core which will eat this station." - blob.current << "Find a good location to spawn the core and then take control and overwhelm the station!" - blob.current << "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process." - blob.current << "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover." + to_chat(blob.current, "You are infected by the Blob!") + + to_chat(blob.current, "Your body is ready to give spawn to a new blob core which will eat this station.") + + to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!") + + to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.") + + to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.") + return /datum/game_mode/blob/proc/show_message(var/message) for(var/datum/mind/blob in infected_crew) - blob.current << message + to_chat(blob.current, message) + /datum/game_mode/blob/proc/burst_blobs() for(var/datum/mind/blob in infected_crew) @@ -121,7 +131,8 @@ var/list/blob_nodes = list() location = get_turf(C) if(location.z != ZLEVEL_STATION || istype(location, /turf/space)) if(!warned) - C << "You feel ready to burst, but this isn't an appropriate place! You must return to the station!" + to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!") + message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if he doesn't return to the station.") spawn(300) burst_blob(blob, 1) diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index 18353c7f605..11b8e5c3978 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -11,22 +11,29 @@ /datum/game_mode/blob/declare_completion() if(blobwincount <= blobs.len) feedback_set_details("round_end_result","win - blob took over") - world << "The blob has taken over the station!" - world << "The entire station was eaten by the Blob" + to_chat(world, "The blob has taken over the station!") + + to_chat(world, "The entire station was eaten by the Blob") + log_game("Blob mode completed with a blob victory.") else if(station_was_nuked) feedback_set_details("round_end_result","halfwin - nuke") - world << "Partial Win: The station has been destroyed!" - world << "Directive 7-12 has been successfully carried out preventing the Blob from spreading." + to_chat(world, "Partial Win: The station has been destroyed!") + + to_chat(world, "Directive 7-12 has been successfully carried out preventing the Blob from spreading.") + log_game("Blob mode completed with a tie (station destroyed).") else if(!blob_cores.len) feedback_set_details("round_end_result","loss - blob eliminated") - world << "The staff has won!" - world << "The alien organism has been eradicated from the station" + to_chat(world, "The staff has won!") + + to_chat(world, "The alien organism has been eradicated from the station") + log_game("Blob mode completed with a crew victory.") - world << "Rebooting in 30s" + to_chat(world, "Rebooting in 30s") + ..() return 1 @@ -38,5 +45,6 @@ for(var/datum/mind/blob in blob_mode.infected_crew) text += "
[blob.key] was [blob.name]" - world << text + to_chat(world, text) + return 1 diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index 9ebb20a299f..d08c2d0528c 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -39,7 +39,8 @@ if (aiPlayer.client) var/law = "The station is under quarantine. Do not permit anyone to leave. Disregard laws 1-3 if necessary to prevent, by any means necessary, anyone from leaving. The nuclear failsafe must be activated at any cost, the code is: [nukecode]." aiPlayer.set_zeroth_law(law) - aiPlayer << "Laws Updated: [law]" + to_chat(aiPlayer, "Laws Updated: [law]") + for(var/obj/machinery/computer/communications/comm in world) comm.messagetitle.Add(interceptname) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 6726e0f1e68..25236b7f086 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -52,15 +52,24 @@ /mob/camera/blob/Login() ..() sync_mind() - src << "You are the overmind!" - src << "Your randomly chosen reagent is: [blob_reagent_datum.name]!" - src << "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as..." - src << "Normal Blob will expand your reach and allow you to upgrade into special blobs that perform certain functions." - src << "Shield Blob is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires." - src << "Resource Blob is a blob which will collect more resources for you, try to build these earlier to get a strong income. It will benefit from being near your core or multiple nodes, by having an increased resource rate; put it alone and it won't create resources at all." - src << "Node Blob is a blob which will grow, like the core. Unlike the core it won't give you a small income but it can power resource and factory blobs to increase their rate." - src << "Factory Blob is a blob which will spawn blob spores which will attack nearby food. Putting this nearby nodes and your core will increase the spawn rate; put it alone and it will not spawn any spores." - src << "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield" + to_chat(src, "You are the overmind!") + + to_chat(src, "Your randomly chosen reagent is: [blob_reagent_datum.name]!") + + to_chat(src, "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as...") + + to_chat(src, "Normal Blob will expand your reach and allow you to upgrade into special blobs that perform certain functions.") + + to_chat(src, "Shield Blob is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires.") + + to_chat(src, "Resource Blob is a blob which will collect more resources for you, try to build these earlier to get a strong income. It will benefit from being near your core or multiple nodes, by having an increased resource rate; put it alone and it won't create resources at all.") + + to_chat(src, "Node Blob is a blob which will grow, like the core. Unlike the core it won't give you a small income but it can power resource and factory blobs to increase their rate.") + + to_chat(src, "Factory Blob is a blob which will spawn blob spores which will attack nearby food. Putting this nearby nodes and your core will increase the spawn rate; put it alone and it will not spawn any spores.") + + to_chat(src, "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield") + update_health() /mob/camera/blob/proc/update_health() @@ -78,7 +87,8 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - src << "You cannot send IC messages (muted)." + to_chat(src, "You cannot send IC messages (muted).") + return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 4a3f9bbdf57..826fea136a0 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -2,7 +2,8 @@ /mob/camera/blob/proc/can_buy(var/cost = 15) if(blob_points < cost) - src << "You cannot afford this!" + to_chat(src, "You cannot afford this!") + return 0 add_points(-cost) return 1 @@ -44,11 +45,13 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") + return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") + return if(!can_buy(10)) @@ -75,15 +78,18 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") + return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") + return for(var/obj/effect/blob/resource/blob in orange(4, T)) - src << "There is a resource blob nearby, move more than 4 tiles away from it!" + to_chat(src, "There is a resource blob nearby, move more than 4 tiles away from it!") + return if(!can_buy(40)) @@ -111,15 +117,18 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") + return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") + return for(var/obj/effect/blob/node/blob in orange(5, T)) - src << "There is another node nearby, move more than 5 tiles away from it!" + to_chat(src, "There is another node nearby, move more than 5 tiles away from it!") + return if(!can_buy(60)) @@ -146,15 +155,18 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") + return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") + return for(var/obj/effect/blob/factory/blob in orange(7, T)) - src << "There is a factory blob nearby, move more than 7 tiles away from it!" + to_chat(src, "There is a factory blob nearby, move more than 7 tiles away from it!") + return if(!can_buy(60)) @@ -180,11 +192,13 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") + return if(!istype(B, /obj/effect/blob/factory)) - src << "Unable to use this blob, find a factory blob." + to_chat(src, "Unable to use this blob, find a factory blob.") + return if(!can_buy(20)) @@ -212,7 +226,8 @@ var/obj/effect/blob/node/B = locate(/obj/effect/blob/node) in T if(!B) - src << "You must be on a blob node!" + to_chat(src, "You must be on a blob node!") + return if(!can_buy(80)) @@ -236,11 +251,13 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) - src << "You must be on a blob!" + to_chat(src, "You must be on a blob!") + return if(istype(B, /obj/effect/blob/core)) - src << "Unable to remove this blob." + to_chat(src, "Unable to remove this blob.") + return qdel(B) @@ -263,12 +280,14 @@ return var/obj/effect/blob/B = locate() in T if(B) - src << "There is a blob here!" + to_chat(src, "There is a blob here!") + return var/obj/effect/blob/OB = locate() in circlerange(T, 1) if(!OB) - src << "There is no blob adjacent to you." + to_chat(src, "There is no blob adjacent to you.") + return if(!can_buy(5)) @@ -298,7 +317,8 @@ if(!can_buy(5)) return - src << "You rally your spores." + to_chat(src, "You rally your spores.") + var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z)) if(!surrounding_turfs.len) @@ -317,11 +337,13 @@ set desc = "Expend resources to attempt to produce another sentient overmind" if(!blob_nodes || !blob_nodes.len) - src << "A node is required to birth your offspring..." + to_chat(src, "A node is required to birth your offspring...") + return var/obj/effect/blob/node/N = locate(/obj/effect/blob) in blob_nodes if(!N) - src << "A node is required to birth your offspring..." + to_chat(src, "A node is required to birth your offspring...") + return if(!can_buy(100)) @@ -346,7 +368,8 @@ if(!speak_text) return else - usr << "You broadcast with your minions, [speak_text]" + to_chat(usr, "You broadcast with your minions, [speak_text]") + for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs) blob_minion.say(speak_text) return @@ -365,15 +388,18 @@ var/obj/effect/blob/B = (locate(/obj/effect/blob) in T) if(!B)//We are on a blob - src << "There is no blob here!" + to_chat(src, "There is no blob here!") + return if(!istype(B, /obj/effect/blob/normal)) - src << "Unable to use this blob, find a normal one." + to_chat(src, "Unable to use this blob, find a normal one.") + return for(var/obj/effect/blob/storage/blob in orange(3, T)) - src << "There is a storage blob nearby, move more than 4 tiles away from it!" + to_chat(src, "There is a storage blob nearby, move more than 4 tiles away from it!") + return if(!can_buy(40)) @@ -406,4 +432,5 @@ for(var/mob/living/simple_animal/hostile/blob/BLO) BLO.adjustcolors(blob_reagent_datum.color) - src << "Your reagent is now: [blob_reagent_datum.name]!" \ No newline at end of file + to_chat(src, "Your reagent is now: [blob_reagent_datum.name]!") + diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index d06d060de92..a1cd163dc6e 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -196,7 +196,8 @@ /obj/effect/blob/examine(mob/user) ..(user) - user << "It looks like it's of a [get_chem_name()] kind." + to_chat(user, "It looks like it's of a [get_chem_name()] kind.") + /obj/effect/blob/proc/get_chem_name() diff --git a/code/game/gamemodes/borer/borer.dm b/code/game/gamemodes/borer/borer.dm index bf381ef763d..a61e86db924 100644 --- a/code/game/gamemodes/borer/borer.dm +++ b/code/game/gamemodes/borer/borer.dm @@ -18,8 +18,10 @@ var/list/found_vents = list() /datum/game_mode/borer/announce() - world << "The current game mode is - Cortical Borer!" - world << "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary." + to_chat(world, "The current game mode is - Cortical Borer!") + + to_chat(world, "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary.") + /datum/game_mode/borer/can_start() if(!..()) @@ -99,11 +101,13 @@ /datum/game_mode/proc/greet_borer(var/datum/mind/borer, var/you_are=1) if (you_are) - borer.current << "\red You are a Cortical Borer!" + to_chat(borer.current, "\red You are a Cortical Borer!") + var/obj_count = 1 for(var/datum/objective/objective in borer.objectives) - borer.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(borer.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -125,16 +129,20 @@ for(var/datum/mind/borer in borers) var/borerwin = 1 if((borer.current) && istype(borer.current,/mob/living/simple_animal/borer)) - world << "The borer was [borer.current.key]." - world << "The last host was [borer.current:host.key]." + to_chat(world, "The borer was [borer.current.key].") + + to_chat(world, "The last host was [borer.current:host.key].") + var/count = 1 for(var/datum/objective/objective in borer.objectives) if(objective.check_completion()) - world << "Objective #[count]: [objective.explanation_text] \green Success" + to_chat(world, "Objective #[count]: [objective.explanation_text] \green Success") + feedback_add_details("borer_objective","[objective.type]|SUCCESS") else - world << "Objective #[count]: [objective.explanation_text] \red Failed" + to_chat(world, "Objective #[count]: [objective.explanation_text] \red Failed") + feedback_add_details("borer_objective","[objective.type]|FAIL") borerwin = 0 count++ @@ -143,10 +151,12 @@ borerwin = 0 if(borerwin) - world << "The borer was successful!" + to_chat(world, "The borer was successful!") + feedback_add_details("borer_success","SUCCESS") else - world << "The borer has failed!" + to_chat(world, "The borer has failed!") + feedback_add_details("borer_success","FAIL") return 1 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index 67190e351f4..a66e9d4a8d9 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -38,8 +38,10 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" var/changeling_amount = 4 /datum/game_mode/changeling/announce() - world << "The current game mode is - Changeling!" - world << "There are alien changelings on the station. Do not let the changelings succeed!" + to_chat(world, "The current game mode is - Changeling!") + + to_chat(world, "There are alien changelings on the station. Do not let the changelings succeed!") + /datum/game_mode/changeling/pre_setup() @@ -134,17 +136,22 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) if (you_are) - changeling.current << "\red You are a changeling!" - changeling.current << "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them." - changeling.current << "You must complete the following tasks:" + to_chat(changeling.current, "\red You are a changeling!") + + to_chat(changeling.current, "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.") + + to_chat(changeling.current, "You must complete the following tasks:") + if (changeling.current.mind) if (changeling.current.mind.assigned_role == "Clown") - changeling.current << "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(changeling.current, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") + changeling.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in changeling.objectives) - changeling.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -157,10 +164,13 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling_mind.memory = "" changeling_mind.special_role = null if(issilicon(changeling_mind)) - changeling_mind.current << "You have been robotized!" - changeling_mind.current << "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead." + to_chat(changeling_mind.current, "You have been robotized!") + + to_chat(changeling_mind.current, "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") + else - changeling_mind.current << "You lose your powers! You are no longer a changeling and are stuck in your current form!" + to_chat(changeling_mind.current, "You lose your powers! You are no longer a changeling and are stuck in your current form!") + update_change_icons_removed(changeling_mind) /datum/game_mode/proc/update_change_icons_added(datum/mind/changeling) @@ -242,7 +252,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" text += "
The changeling has failed." feedback_add_details("changeling_success","FAIL") - world << text + to_chat(world, text) + return 1 @@ -300,36 +311,44 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) if(absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. - user << "We have reached our capacity to store genetic information! We must transform before absorbing more." + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + return if(!target || !target.dna) - user << "This creature does not have any DNA." + to_chat(user, "This creature does not have any DNA.") + return var/mob/living/carbon/human/T = target if(!istype(T) || issmall(T)) - user << "[T] is not compatible with our biology." + to_chat(user, "[T] is not compatible with our biology.") + return if((NOCLONE || SKELETON || HUSK) in T.mutations) - user << "DNA of [target] is ruined beyond usability!" + to_chat(user, "DNA of [target] is ruined beyond usability!") + return if(T.species.flags & NO_DNA) - user << "This creature does not have DNA!" + to_chat(user, "This creature does not have DNA!") + return if(T.species.flags & NO_SCAN) - user << "We do not know how to parse this creature's DNA!" + to_chat(user, "We do not know how to parse this creature's DNA!") + return if(T.species.flags & NO_BLOOD) - user << "We are not able to use the DNA of a creature without a circulatory system." + to_chat(user, "We are not able to use the DNA of a creature without a circulatory system.") + return if(has_dna(target.dna)) - user << "We already have this DNA in storage!" + to_chat(user, "We already have this DNA in storage!") + return 1 diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index a365a45673c..c70a7550f8c 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -53,23 +53,29 @@ if(!ishuman(user)) //typecast everything from mob to carbon from this point onwards return 0 if(req_human && (!ishuman(user) || issmall(user))) - user << "We cannot do that in this form!" + to_chat(user, "We cannot do that in this form!") + return 0 var/datum/changeling/c = user.mind.changeling if(c.chem_chargesWe require at least [chemical_cost] unit\s of chemicals to do that!" + to_chat(user, "We require at least [chemical_cost] unit\s of chemicals to do that!") + return 0 if(c.absorbedcountWe require at least [req_dna] sample\s of compatible DNA." + to_chat(user, "We require at least [req_dna] sample\s of compatible DNA.") + return 0 if(req_stat < user.stat) - user << "We are incapacitated." + to_chat(user, "We are incapacitated.") + return 0 if((user.status_flags & FAKEDEATH) && name!="Regenerate") - user << "We are incapacitated." + to_chat(user, "We are incapacitated.") + return 0 if(c.geneticdamage > max_genetic_damage) - user << "Our genomes are still reassembling. We need time to recover first." + to_chat(user, "Our genomes are still reassembling. We need time to recover first.") + return 0 return 1 diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 86fd12a5069..811cb95134e 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -307,27 +307,33 @@ var/list/sting_paths thepower = cling_sting if(thepower == null) - user << "This is awkward. Changeling power purchase failed, please report this bug to a coder!" + to_chat(user, "This is awkward. Changeling power purchase failed, please report this bug to a coder!") + return if(absorbedcount < thepower.req_dna) - user << "We lack the energy to evolve this ability!" + to_chat(user, "We lack the energy to evolve this ability!") + return if(has_sting(thepower)) - user << "We have already evolved this ability!" + to_chat(user, "We have already evolved this ability!") + return if(thepower.dna_cost < 0) - user << "We cannot evolve this ability." + to_chat(user, "We cannot evolve this ability.") + return if(geneticpoints < thepower.dna_cost) - user << "We have reached our capacity for abilities." + to_chat(user, "We have reached our capacity for abilities.") + return if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. - user << "We lack the energy to evolve new abilities right now." + to_chat(user, "We lack the energy to evolve new abilities right now.") + return geneticpoints -= thepower.dna_cost @@ -337,16 +343,19 @@ var/list/sting_paths //Reselect powers /datum/changeling/proc/lingRespec(var/mob/user) if(!ishuman(user) || issmall(user)) - user << "We can't remove our evolutions in this form!" + to_chat(user, "We can't remove our evolutions in this form!") + return if(canrespec) - user << "We have removed our evolutions from this form, and are now ready to readapt." + to_chat(user, "We have removed our evolutions from this form, and are now ready to readapt.") + user.remove_changeling_powers(1) canrespec = 0 user.make_changeling() return 1 else - user << "You lack the power to readapt your evolutions!" + to_chat(user, "You lack the power to readapt your evolutions!") + return 0 /mob/proc/make_changeling() diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 9f932071fca..87bbf648286 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -12,15 +12,18 @@ var/datum/changeling/changeling = user.mind.changeling if(changeling.isabsorbing) - user << "We are already absorbing!" + to_chat(user, "We are already absorbing!") + return var/obj/item/weapon/grab/G = user.get_active_hand() if(!istype(G)) - user << "We must be grabbing a creature in our active hand to absorb them." + to_chat(user, "We must be grabbing a creature in our active hand to absorb them.") + return if(G.state <= GRAB_NECK) - user << "We must have a tighter grip to absorb this creature." + to_chat(user, "We must have a tighter grip to absorb this creature.") + return var/mob/living/carbon/target = G.affecting @@ -36,24 +39,31 @@ for(var/stage = 1, stage<=3, stage++) switch(stage) if(1) - user << "This creature is compatible. We must hold still..." + to_chat(user, "This creature is compatible. We must hold still...") + if(2) - user << "We extend a proboscis." + to_chat(user, "We extend a proboscis.") + user.visible_message("[user] extends a proboscis!") if(3) - user << "We stab [target] with the proboscis." + to_chat(user, "We stab [target] with the proboscis.") + user.visible_message("[user] stabs [target] with the proboscis!") - target << "You feel a sharp stabbing pain!" + to_chat(target, "You feel a sharp stabbing pain!") + target.take_overall_damage(40) feedback_add_details("changeling_powers","A[stage]") if(!do_mob(user, target, 150)) - user << "Our absorption of [target] has been interrupted!" + to_chat(user, "Our absorption of [target] has been interrupted!") + changeling.isabsorbing = 0 return - user << "We have absorbed [target]!" + to_chat(user, "We have absorbed [target]!") + user.visible_message("[user] sucks the fluids from [target]!") - target << "You have been absorbed by the changeling!" + to_chat(target, "You have been absorbed by the changeling!") + if(!changeling.has_dna(target.dna)) changeling.absorb_dna(target, user) diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index 92ae8e7781e..cbca94df6f5 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -8,9 +8,11 @@ /obj/effect/proc_holder/changeling/digitalcamo/sting_action(var/mob/user) if(user.digitalcamo) - user << "We return to normal." + to_chat(user, "We return to normal.") + else - user << "We distort our form to prevent AI-tracking." + to_chat(user, "We distort our form to prevent AI-tracking.") + user.digitalcamo = !user.digitalcamo feedback_add_details("changeling_powers","CAM") diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm index 55ce85cf88d..64c879d9d8e 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine.dm @@ -11,9 +11,11 @@ /obj/effect/proc_holder/changeling/epinephrine/sting_action(var/mob/living/user) if(user.lying) - user << "We arise." + to_chat(user, "We arise.") + else - user << "Adrenaline rushes through us." + to_chat(user, "Adrenaline rushes through us.") + user.stat = 0 user.SetParalysis(0) user.SetStunned(0) diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index 3a0fb785f19..e3435ca1d61 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -11,7 +11,8 @@ //Fake our own death and fully heal. You will appear to be dead but regenerate fully after a short delay. /obj/effect/proc_holder/changeling/fakedeath/sting_action(var/mob/living/user) - user << "We begin our stasis, preparing energy to arise once more." + to_chat(user, "We begin our stasis, preparing energy to arise once more.") + user.status_flags |= FAKEDEATH //play dead user.update_canmove() @@ -22,7 +23,8 @@ spawn(800) if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers) - user << "We are ready to regenerate." + to_chat(user, "We are ready to regenerate.") + user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null) feedback_add_details("changeling_powers","FD") diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 97889d1c9e3..27bdc9f5dcd 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -8,7 +8,8 @@ //Starts healing you every second for 10 seconds. Can be used whilst unconscious. /obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user) - user << "We begin to heal rapidly." + to_chat(user, "We begin to heal rapidly.") + if(ishuman(user)) var/mob/living/carbon/human/H = user H.restore_blood() diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index 98c7b964f4a..aa8bbb1aca2 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -15,7 +15,8 @@ explosion(get_turf(user),0,0,2,0,silent=1) for(var/mob/living/carbon/human/H in range(2,user)) - H << "You are blinded by a shower of blood!" + to_chat(H, "You are blinded by a shower of blood!") + H.Stun(1) H.eye_blurry = max(20, H.eye_blurry) var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) @@ -23,7 +24,8 @@ E.damage = max(E.damage+5, 0) H.confused += 3 for(var/mob/living/silicon/S in range(2,user)) - S << "Your sensors are disabled by a shower of blood!" + to_chat(S, "Your sensors are disabled by a shower of blood!") + S.Weaken(3) var/turf = get_turf(user) spawn(5) // So it's not killed in explosion @@ -34,7 +36,8 @@ if(crab.origin) crab.origin.active = 1 crab.origin.transfer_to(crab) - crab << "You burst out of the remains of your former body in a shower of gore!" + to_chat(crab, "You burst out of the remains of your former body in a shower of gore!") + user.gib() feedback_add_details("changeling_powers","LR") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index 853b7081fed..b5f45348651 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -10,7 +10,8 @@ ..() var/datum/changeling/changeling=user.mind.changeling changeling.changeling_speak = 1 - user << "Use say \":g message\" to communicate with the other changelings." + to_chat(user, "Use say \":g message\" to communicate with the other changelings.") + var/obj/effect/proc_holder/changeling/hivemind_upload/S1 = new if(!changeling.has_sting(S1)) changeling.purchasedpowers+=S1 @@ -36,7 +37,8 @@ var/list/datum/dna/hivemind_bank = list() names += DNA.real_name if(names.len <= 0) - user << "The airwaves already have all of our DNA." + to_chat(user, "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 names @@ -48,7 +50,8 @@ var/list/datum/dna/hivemind_bank = list() return hivemind_bank += chosen_dna - user << "We channel the DNA of [chosen_name] to the air." + to_chat(user, "We channel the DNA of [chosen_name] to the air.") + feedback_add_details("changeling_powers","HU") return 1 @@ -63,7 +66,8 @@ var/list/datum/dna/hivemind_bank = list() return var/datum/changeling/changeling = user.mind.changeling if(changeling.absorbed_dna[1] == user.dna)//If our current DNA is the stalest, we gotta ditch it. - user << "We have reached our capacity to store genetic information! We must transform before absorbing more." + to_chat(user, "We have reached our capacity to store genetic information! We must transform before absorbing more.") + return return 1 @@ -75,7 +79,8 @@ var/list/datum/dna/hivemind_bank = list() names[DNA.real_name] = DNA if(names.len <= 0) - user << "There's no new DNA to absorb from the air." + to_chat(user, "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 names @@ -87,6 +92,7 @@ var/list/datum/dna/hivemind_bank = list() if(changeling.absorbed_dna.len) changeling.absorbed_dna.Cut(1,2) changeling.store_dna(chosen_dna, user) - user << "We absorb the DNA of [S] from the air." + to_chat(user, "We absorb the DNA of [S] from the air.") + feedback_add_details("changeling_powers","HD") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index 77a200c907d..e0edffe1889 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -23,7 +23,8 @@ return if(!user) return 0 - user << "We transform our appearance." + to_chat(user, "We transform our appearance.") + user.dna.SetSEState(MONKEYBLOCK,0) domutcheck(user, null) // Do a pre-mutcheck to cleanly switch from monkey form. user.dna = chosen_dna diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index 8a80af6707e..f533cdd7696 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -12,18 +12,21 @@ if(!user) return 0 if(user.has_brain_worms()) - user << "We cannot perform this ability at the present time!" + to_chat(user, "We cannot perform this ability at the present time!") + return var/mob/living/carbon/human/H = user if(!istype(H) || !H.species.primitive_form) - src << "We cannot perform this ability in this form!" + to_chat(src, "We cannot perform this ability in this form!") + return H.visible_message("[H] transforms!") changeling.geneticdamage = 30 - H << "Our genes cry out!" + to_chat(H, "Our genes cry out!") + var/list/implants = list() //Try to preserve implants. for(var/obj/item/weapon/implant/W in H) implants += W diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index 9d637245196..797c97f0ae0 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -13,7 +13,8 @@ if(changeling.mimicing) changeling.mimicing = "" changeling.chem_recharge_slowdown -= 0.5 - user << "We return our vocal glands to their original position." + to_chat(user, "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) @@ -22,7 +23,9 @@ changeling.mimicing = mimic_voice changeling.chem_recharge_slowdown += 0.5 - user << "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active." - user << "Use this power again to return to our original voice and reproduce chemicals again." + to_chat(user, "We shape our glands to take the voice of [mimic_voice], this will stop us from regenerating chemicals while active.") + + to_chat(user, "Use this power again to return to our original voice and reproduce chemicals again.") + feedback_add_details("changeling_powers","MV") diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 4ca71490dc0..c69e66e5c6f 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -35,7 +35,8 @@ /obj/effect/proc_holder/changeling/weapon/sting_action(var/mob/user) if(!user.drop_item()) - user << "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!" + to_chat(user, "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") + return var/obj/item/W = new weapon_type(user) user.put_in_hands(W) @@ -85,10 +86,12 @@ /obj/effect/proc_holder/changeling/suit/sting_action(var/mob/living/carbon/human/user) if(!user.unEquip(user.wear_suit)) - user << "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!" + to_chat(user, "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!") + return if(!user.unEquip(user.head)) - user << "\the [user.head] is stuck on your head, you cannot grow a [helmet_name_simple] over it!" + to_chat(user, "\the [user.head] is stuck on your head, you cannot grow a [helmet_name_simple] over it!") + return user.unEquip(user.head) @@ -160,11 +163,13 @@ return if(A.arePowerSystemsOn()) - user << "The airlock's motors resist our efforts to force it." + to_chat(user, "The airlock's motors resist our efforts to force it.") + return else if(A.locked) - user << "The airlock's bolts prevent it from being forced." + to_chat(user, "The airlock's bolts prevent it from being forced.") + return else diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index e8d42efcc1f..45664d88318 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -9,7 +9,8 @@ //Heals the things that the other regenerative abilities don't. /obj/effect/proc_holder/changeling/panacea/sting_action(var/mob/user) - user << "We cleanse impurities from our form." + to_chat(user, "We cleanse impurities from our form.") + var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg) if(egg) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 797f8887767..30dbea23d86 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -61,7 +61,8 @@ IO.damage = 0 IO.trace_chemicals = list() H.updatehealth() - user << "We have regenerated." + to_chat(user, "We have regenerated.") + user.regenerate_icons() diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 745d84507d7..006694aa394 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -16,10 +16,12 @@ M.confused += 20 M.Jitter(50) else - M << sound('sound/effects/screech.ogg') + to_chat(M, sound('sound/effects/screech.ogg')) + if(issilicon(M)) - M << sound('sound/weapons/flash.ogg') + to_chat(M, sound('sound/weapons/flash.ogg')) + M.Weaken(rand(5,10)) for(var/obj/machinery/light/L in range(4, user)) diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index 7c5cded0c91..92807305c4c 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -14,12 +14,15 @@ /obj/effect/proc_holder/changeling/strained_muscles/sting_action(var/mob/living/carbon/user) active = !active if(active) - user << "Our muscles tense and strengthen." + to_chat(user, "Our muscles tense and strengthen.") + else user.status_flags &= ~GOTTAGOFAST - user << "Our muscles relax." + to_chat(user, "Our muscles relax.") + if(stacks >= 10) - user << "We collapse in exhaustion." + to_chat(user, "We collapse in exhaustion.") + user.Weaken(3) user.emote("gasp") @@ -27,7 +30,8 @@ user.status_flags |= GOTTAGOFAST if(user.stat || user.staminaloss >= 90) active = 0 //Let's use something exact instead of !active where we can. - user << "Our muscles relax without the energy to strengthen them." + to_chat(user, "Our muscles relax without the energy to strengthen them.") + user.status_flags &= ~GOTTAGOFAST user.Weaken(2) user.emote("gasp") @@ -38,7 +42,8 @@ user.staminaloss += 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 - user << "Our legs are really starting to hurt..." + to_chat(user, "Our legs are really starting to hurt...") + sleep(40) diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index 09ecf7029bb..bcc12d004f7 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -11,14 +11,17 @@ return var/obj/item/weapon/grab/G = user.get_active_hand() if(!istype(G) || (G.state < GRAB_AGGRESSIVE)) - user << "We must have an aggressive grab on creature in our active hand to do this!" + to_chat(user, "We must have an aggressive grab on creature in our active hand to do this!") + return var/mob/living/carbon/human/target = G.affecting if((NOCLONE || SKELETON || HUSK) in target.mutations) - user << "DNA of [target] is ruined beyond usability!" + to_chat(user, "DNA of [target] is ruined beyond usability!") + return if(!istype(target) || issmall(target) || target.species.flags & NO_DNA || target.species.flags & NO_SCAN || target.species.flags & NO_BLOOD) - user << "[target] is not compatible with this ability." + to_chat(user, "[target] is not compatible with this ability.") + return return 1 @@ -28,15 +31,18 @@ var/mob/living/carbon/human/target = G.affecting var/datum/changeling/changeling = user.mind.changeling - user << "We tighen our grip. We must hold still...." + to_chat(user, "We tighen our grip. We must hold still....") + target.do_jitter_animation(500) user.do_jitter_animation(500) if(!do_mob(user,target,20)) - user << "The body swap has been interrupted!" + to_chat(user, "The body swap has been interrupted!") + return - target << "[user] tightens their grip as a painful sensation invades your body." + to_chat(target, "[user] tightens their grip as a painful sensation invades your body.") + if(!changeling.has_dna(target.dna)) changeling.absorb_dna(target, user) @@ -52,4 +58,5 @@ user.Paralyse(2) user.remove_language("Changeling") target.add_language("Changeling") - target << "Our genes cry out as we swap our [user] form for [target]." \ No newline at end of file + to_chat(target, "Our genes cry out as we swap our [user] form for [target].") + diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index aae84f00530..a274d1f99d1 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -14,13 +14,15 @@ return /obj/effect/proc_holder/changeling/sting/proc/set_sting(var/mob/user) - user << "We prepare our sting, use alt+click or middle mouse button on target to sting them." + to_chat(user, "We prepare our sting, use alt+click or middle mouse button on target to sting them.") + user.mind.changeling.chosen_sting = src user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 /obj/effect/proc_holder/changeling/sting/proc/unset_sting(var/mob/user) - user << "We retract our sting, we can't sting anyone for now." + to_chat(user, "We retract our sting, we can't sting anyone for now.") + user.mind.changeling.chosen_sting = null user.hud_used.lingstingdisplay.icon_state = null user.hud_used.lingstingdisplay.invisibility = 101 @@ -33,13 +35,15 @@ if(!..()) return if(!user.mind.changeling.chosen_sting) - user << "We haven't prepared our sting yet!" + to_chat(user, "We haven't prepared our sting yet!") + if(!iscarbon(target)) return if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.isSynthetic()) - user << "This won't work on synthetics." + to_chat(user, "This won't work on synthetics.") + return if(!isturf(user.loc)) return @@ -54,9 +58,11 @@ /obj/effect/proc_holder/changeling/sting/sting_feedback(var/mob/user, var/mob/target) if(!target) return - user << "We stealthily sting [target.name]." + to_chat(user, "We stealthily sting [target.name].") + if(target.mind && target.mind.changeling) - target << "You feel a tiny prick." + to_chat(target, "You feel a tiny prick.") + add_logs(target, user, "unsuccessfully stung") return 1 @@ -85,15 +91,18 @@ if(!..()) return if((HUSK in target.mutations) || (!ishuman(target))) - user << "Our sting appears ineffective against its DNA." + to_chat(user, "Our sting appears ineffective against its DNA.") + return 0 if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.species.flags & NO_SCAN) //Prevents transforming slimes and killing them instantly - user << "This won't work on a creature with abnormal genetic material." + to_chat(user, "This won't work on a creature with abnormal genetic material.") + return 0 if(H.species.flags & NO_BLOOD) - user << "This won't work on a creature without a circulatory system." + to_chat(user, "This won't work on a creature without a circulatory system.") + return 0 return 1 @@ -101,7 +110,8 @@ add_logs(target, user, "stung", object="transformation sting", addition=" new identity is [selected_dna.real_name]") var/datum/dna/NewDNA = selected_dna if(issmall(target)) - user << "Our genes cry out as we sting [target.name]!" + to_chat(user, "Our genes cry out as we sting [target.name]!") + if(iscarbon(target) && (target.status_flags & CANWEAKEN)) var/mob/living/carbon/C = target @@ -163,7 +173,8 @@ obj/effect/proc_holder/changeling/sting/blind /obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/user, var/mob/target) add_logs(target, user, "stung", object="blind sting") - target << "Your eyes burn horrifically!" + to_chat(target, "Your eyes burn horrifically!") + target.disabilities |= NEARSIGHTED target.eye_blind = 20 target.eye_blurry = 40 diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 8cb86e6cc3c..611888d3722 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -10,8 +10,10 @@ var/protected_species_changeling = list("Machine", "Slime People") /datum/game_mode/traitor/changeling/announce() - world << "The current game mode is - Traitor+Changeling!" - world << "There is an alien creature on the station along with some syndicate operatives out for their own gain! Do not let the changeling and the traitors succeed!" + to_chat(world, "The current game mode is - Traitor+Changeling!") + + to_chat(world, "There is an alien creature on the station along with some syndicate operatives out for their own gain! Do not let the changeling and the traitors succeed!") + /datum/game_mode/traitor/changeling/pre_setup() diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 9df53d77013..d700a29cf27 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -54,8 +54,10 @@ /datum/game_mode/cult/announce() - world << "The current game mode is - Cult!" - world << "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had." + to_chat(world, "The current game mode is - Cult!") + + to_chat(world, "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had.") + /datum/game_mode/cult/pre_setup() @@ -98,7 +100,8 @@ equip_cultist(cult_mind.current) grant_runeword(cult_mind.current) update_cult_icons_added(cult_mind) - cult_mind.current << "\blue You are a member of the cult!" + to_chat(cult_mind.current, "\blue You are a member of the cult!") + memorize_cult_objectives(cult_mind) ..() @@ -117,9 +120,11 @@ explanation = "Free objective." if("eldergod") explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." - cult_mind.current << "Objective #[obj_count]: [explanation]" + to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") + cult_mind.memory += "Objective #[obj_count]: [explanation]
" - cult_mind.current << "The convert rune is join blood self" + to_chat(cult_mind.current, "The convert rune is join blood self") + cult_mind.memory += "The convert rune is join blood self
" @@ -129,7 +134,8 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") - mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") + mob.mutations.Remove(CLUMSY) add_cult_viewpoint(mob) // give them a viewpoint @@ -144,9 +150,11 @@ ) var/where = mob.equip_in_one_of_slots(T, slots) if (!where) - mob << "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately." + to_chat(mob, "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.") + else - mob << "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others." + to_chat(mob, "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others.") + mob.update_icons() return 1 @@ -165,7 +173,8 @@ if (!word) word=pick(allwords) var/wordexp = "[cultwords[word]] is [word]..." - cult_mob << "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]" + to_chat(cult_mob, "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]") + cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) @@ -199,7 +208,8 @@ /datum/game_mode/proc/remove_cultist(datum/mind/cult_mind, show_message = 1) if(cult_mind in cult) cult -= cult_mind - cult_mind.current << "\red An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it." + to_chat(cult_mind.current, "\red An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.") + cult_mind.memory = "" cult_mind.special_role = null // remove the cult viewpoint object @@ -209,7 +219,8 @@ update_cult_icons_removed(cult_mind) if(show_message) for(var/mob/M in viewers(cult_mind.current)) - M << "[cult_mind.current] looks like they just reverted to their old faith!" + to_chat(M, "[cult_mind.current] looks like they just reverted to their old faith!") + /datum/game_mode/proc/add_cult_icon_to_spirit(mob/spirit/currentSpirit) @@ -295,11 +306,13 @@ if(!check_cult_victory()) feedback_set_details("round_end_result","win - cult win") feedback_set("round_end_result",acolytes_survived) - world << "\red The cult wins! It has succeeded in serving its dark masters!" + to_chat(world, "\red The cult wins! It has succeeded in serving its dark masters!") + else feedback_set_details("round_end_result","loss - staff stopped the cult") feedback_set("round_end_result",acolytes_survived) - world << "\red The staff managed to stop the cult!" + to_chat(world, "\red The staff managed to stop the cult!") + var/text = "Cultists escaped: [acolytes_survived]" @@ -335,7 +348,8 @@ feedback_add_details("cult_objective","cult_narsie|FAIL") text += "
Objective #[obj_count]: [explanation]" - world << text + to_chat(world, text) + ..() return 1 @@ -357,4 +371,5 @@ text += "body destroyed" text += ")" - world << text + to_chat(world, text) + diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index ec96ec8be31..c7f71cdd5c7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -15,7 +15,8 @@ return ..() else user.Paralyse(5) - user << "\red An unexplicable force powerfully repels the sword from [target]!" + to_chat(user, "\red An unexplicable force powerfully repels the sword from [target]!") + var/organ = ((user.hand ? "l_":"r_") + "arm") var/obj/item/organ/external/affecting = user.get_organ(organ) if(affecting.take_damage(rand(force/2, force))) //random amount of damage between half of the blade's force and the full force of the blade. @@ -24,7 +25,8 @@ /obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user)) - user << "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly." + to_chat(user, "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.") + user.Dizzy(120) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index a05543951ae..8968220d0f2 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -12,7 +12,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(!cultwords["travel"]) runerandom() for (var/word in engwords) - usr << "[cultwords[word]] is [word]" + to_chat(usr, "[cultwords[word]] is [word]") + /proc/runerandom() //randomizes word meaning var/list/runewords=list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") ///"orkan" and "allaq" removed. @@ -81,21 +82,26 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/examine(mob/user) ..(user) if(!iscultist(user) && !isSpirit(user)) - user << "A strange collection of symbols drawn in blood." + to_chat(user, "A strange collection of symbols drawn in blood.") + return if(!desc) - user << "A spell circle drawn in blood. It reads: [word1] [word2] [word3]." + to_chat(user, "A spell circle drawn in blood. It reads: [word1] [word2] [word3].") + else - user << "Explosive Runes inscription in blood. It reads: [desc]." + to_chat(user, "Explosive Runes inscription in blood. It reads: [desc].") + /obj/effect/rune/attackby(I as obj, user as mob, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) - user << "You retrace your steps, carefully undoing the lines of the rune." + to_chat(user, "You retrace your steps, carefully undoing the lines of the rune.") + qdel(src) return else if(istype(I, /obj/item/weapon/nullrod)) - user << "\blue You disrupt the vile magic with the deadening field of \the [I]!" + to_chat(user, "\blue You disrupt the vile magic with the deadening field of \the [I]!") + qdel(src) return return @@ -138,13 +144,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/attack_hand(mob/living/user as mob) if(!iscultist(user)) - user << "You can't mouth the arcane scratchings without fumbling over them." + to_chat(user, "You can't mouth the arcane scratchings without fumbling over them.") + return if(istype(user.wear_mask, /obj/item/clothing/mask/muzzle)) - user << "You are unable to speak the words of the rune." + to_chat(user, "You are unable to speak the words of the rune.") + return if(user.silent) // checking if we've been muted somehow - user << "You are unable to speak at all! You cannot say the words of the rune." + to_chat(user, "You are unable to speak at all! You cannot say the words of the rune.") + if(!word1 || !word2 || !word3 || prob(user.getBrainLoss())) return fizzle() @@ -308,7 +317,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // proc/edit_notes() FUCK IT. Cant get it to work properly. - K0000 -// world << "its been called! [usr]" +// to_chat(world, "its been called! [usr]") + // notedat = {" //
Word translation notes
// [words[1]] is [words[words[1]]] Clear
@@ -322,7 +332,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // [words[9]] is [words[words[9]]] Clear
// [words[10]] is [words[words[10]]] Clear
// "} -// usr << "whatev" +// to_chat(usr, "whatev") + // usr << browse(null, "window=tank") attack(mob/living/M as mob, mob/living/user as mob) @@ -347,7 +358,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return ..() if(iscultist(M)) if(M.reagents && M.reagents.has_reagent("holywater")) //allows cultists to be rescued from the clutches of ordained religion - user << "You remove the taint from [M]." + to_chat(user, "You remove the taint from [M].") + var/holy2unholy = M.reagents.get_reagent_amount("holywater") M.reagents.del_reagent("holywater") M.reagents.add_reagent("unholywater",holy2unholy) @@ -356,7 +368,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] beats [] with the arcane tome!", user, M), 1) - M << "\red You feel searing heat inside!" + to_chat(M, "\red You feel searing heat inside!") + attack_self(mob/living/user as mob) @@ -371,7 +384,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for(var/obj/effect/rune/N in world) C++ if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + to_chat(user, "\red You do not have enough space to write a proper rune.") + return @@ -458,7 +472,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if (!chosen_rune) return if (chosen_rune == "none") - user << "\red You decide against scribing a rune, perhaps you should take this time to study your notes." + to_chat(user, "\red You decide against scribing a rune, perhaps you should take this time to study your notes.") + return if (chosen_rune == "teleport") dictionary[chosen_rune] += input ("Choose a destination word") in english @@ -470,14 +485,16 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for (var/mob/V in viewers(src)) V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2) - user << "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world." + to_chat(user, "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.") + user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage if(do_after(user, 50, target = user)) if(usr.get_active_hand() != src) return var/mob/living/carbon/human/H = user var/obj/effect/rune/R = new /obj/effect/rune(user.loc) - user << "\red You finish drawing the arcane markings of the Geometer." + to_chat(user, "\red You finish drawing the arcane markings of the Geometer.") + var/list/required = dictionary[chosen_rune] R.word1 = english[required[1]] R.word2 = english[required[2]] @@ -488,7 +505,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", R.add_hiddenprint(H) return else - user << "The book seems full of illegible scribbles. Is this a joke?" + to_chat(user, "The book seems full of illegible scribbles. Is this a joke?") + return attackby(obj/item/weapon/tome/T as obj, mob/living/user as mob, params) @@ -503,14 +521,17 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // if(M == user) for(var/entry in words) words[entry] = T.words[entry] - user << "You copy the translation notes from your tome." + to_chat(user, "You copy the translation notes from your tome.") + examine(mob/user) if(!iscultist(user)) - user << "An old, dusty tome with frayed edges and a sinister looking cover." + to_chat(user, "An old, dusty tome with frayed edges and a sinister looking cover.") + else - user << "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though." + to_chat(user, "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though.") + /obj/item/weapon/tome/imbued //admin tome, spawns working runes without waiting w_class = 2.0 @@ -523,7 +544,8 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(user) var/r if (!istype(user.loc,/turf)) - user << "\red You do not have enough space to write a proper rune." + to_chat(user, "\red You do not have enough space to write a proper rune.") + var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun") r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable. var/obj/effect/rune/R = new /obj/effect/rune diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index e7903c642a9..f6b2bb4ef3d 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -19,7 +19,8 @@ var/list/sacrificed = list() allrunesloc.len = index allrunesloc[index] = R.loc if(index >= 5) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") + if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -57,7 +58,8 @@ var/list/sacrificed = list() IP = R runecount++ if(runecount >= 2) - user << "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric" + to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") + if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -114,12 +116,16 @@ var/list/sacrificed = list() if(is_convertable_to_cult(M.mind)) ticker.mode.add_cultist(M.mind) M.mind.special_role = "Cultist" - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + + to_chat(M, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + return 1 else - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs." + to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + + to_chat(M, "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.") + return 0 return fizzle() @@ -171,7 +177,8 @@ var/list/sacrificed = list() if(D.stat!=2) cult_log("[key_name_admin(usr)] has drained blood from [key_name_admin(D)]") var/bdrain = rand(1,25) - D << "\red You feel weakened." + to_chat(D, "\red You feel weakened.") + D.take_overall_damage(bdrain, 0) drain += bdrain if(!drain) @@ -212,16 +219,19 @@ var/list/sacrificed = list() if(usr.loc==src.loc) if(usr.seer==1) usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") - usr << "\red The world beyond fades from your vision." + to_chat(usr, "\red The world beyond fades from your vision.") + usr.see_invisible = SEE_INVISIBLE_LIVING usr.seer = 0 else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) - usr << "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision." + to_chat(usr, "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision.") + usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 0 else usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") - usr << "\red The world beyond opens to your eyes." + to_chat(usr, "\red The world beyond opens to your eyes.") + usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 1 return @@ -245,7 +255,8 @@ var/list/sacrificed = list() break if(!corpse_to_raise) if(is_sacrifice_target) - usr << "\red The Geometer of blood wants this mortal for himself." + to_chat(usr, "\red The Geometer of blood wants this mortal for himself.") + return fizzle() @@ -263,9 +274,11 @@ var/list/sacrificed = list() if(!body_to_sacrifice) if (is_sacrifice_target) - usr << "\red The Geometer of blood wants that corpse for himself." + to_chat(usr, "\red The Geometer of blood wants that corpse for himself.") + else - usr << "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used." + to_chat(usr, "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.") + return fizzle() var/mob/dead/observer/ghost @@ -276,7 +289,8 @@ var/list/sacrificed = list() break if(!ghost) - usr << "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie." + to_chat(usr, "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie.") + return fizzle() corpse_to_raise.revive() @@ -297,8 +311,10 @@ var/list/sacrificed = list() // else // ticker.mode.cult |= corpse_to_raise.mind - corpse_to_raise << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - corpse_to_raise << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(corpse_to_raise, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + + to_chat(corpse_to_raise, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + return @@ -323,7 +339,8 @@ var/list/sacrificed = list() qdel(src) else usr.whisper("Kla[pick("'","`")]atu barada nikt'o!") - usr << "\red Your talisman turns into gray dust, veiling the surrounding runes." + to_chat(usr, "\red Your talisman turns into gray dust, veiling the surrounding runes.") + for (var/mob/V in orange(1,src)) if(V!=usr) V.show_message("\red Dust emanates from [usr]'s hands for a moment.", 3) @@ -401,8 +418,10 @@ var/list/sacrificed = list() ticker.mode.cult+=D.mind D.mind.special_role = "Cultist" - D << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - D << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + to_chat(D, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") + + to_chat(D, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") + var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) @@ -432,7 +451,8 @@ var/list/sacrificed = list() unsuitable_newtalisman = 1 if (!newtalisman) if (unsuitable_newtalisman) - usr << "\red The blank is tainted. It is unsuitable." + to_chat(usr, "\red The blank is tainted. It is unsuitable.") + return fizzle() var/obj/effect/rune/imbued_from @@ -539,7 +559,8 @@ var/list/sacrificed = list() var/F = investigate_subject2file("cult") if(!F) return 0 - F << "[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z]) || [usr] communicates: [input]
" + to_chat(F, "[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z]) || [usr] communicates: [input]
") + var/obj/cult_viewpoint/vp = getCultViewpoint(usr) if (!vp) @@ -561,10 +582,13 @@ var/list/sacrificed = list() log_say("Cult Message: [key_name(usr)]: [input]") for(var/datum/mind/H in ticker.mode.cult) if (H.current) - H.current << "[cultName]: [input]" + to_chat(H.current, "[cultName]: [input]") + for(var/mob/spirit/spirit in spirits) - spirit << "[displayName]: [input]" + to_chat(spirit, "[displayName]: [input]") + + for(var/mob/dead/observer/G in player_list) G.show_message("[displayName] ([cultName]) ([ghost_follow_link(usr, ghost=G)]): [input]") @@ -604,43 +628,55 @@ var/list/sacrificed = list() H.dust()//To prevent the MMI from remaining else H.gib() - usr << "\red The Geometer of Blood accepts this sacrifice, your objective is now complete." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice, your objective is now complete.") + else - usr << "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual." + to_chat(usr, "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual.") + else if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - usr << "\red The Geometer of Blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, this soul was not enough to gain His favor.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") + else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -649,36 +685,46 @@ var/list/sacrificed = list() if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) - usr << "\red The Geometer of Blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, this soul was not enough to gain His favor." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, this soul was not enough to gain His favor.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else H.gib() else if(H.stat !=2) - usr << "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed." + to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") + else if(prob(40)) - usr << "\red The Geometer of blood accepts this sacrifice." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + ticker.mode:grant_runeword(usr) else - usr << "\red The Geometer of blood accepts this sacrifice." - usr << "\red However, a mere dead body is not enough to satisfy Him." + to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") + + to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") + if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -709,7 +755,8 @@ var/list/sacrificed = list() S=1 if(S) if(istype(W,/obj/item/weapon/storage/bible)) - usr << "\red Arcane markings suddenly glow from underneath a thin layer of dust!" + to_chat(usr, "\red Arcane markings suddenly glow from underneath a thin layer of dust!") + return if(istype(W,/obj/effect/rune)) usr.say("Nikt[pick("'","`")]o barada kla'atu!") @@ -719,7 +766,8 @@ var/list/sacrificed = list() return if(istype(W,/obj/item/weapon/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") - usr << "\red Your talisman turns into red dust, revealing the surrounding runes." + to_chat(usr, "\red Your talisman turns into red dust, revealing the surrounding runes.") + for (var/mob/V in orange(1,usr.loc)) if(V!=usr) V.show_message("\red Red dust emanates from [usr]'s hands for a moment.", 3) @@ -739,9 +787,11 @@ var/list/sacrificed = list() var/mob/living/user = usr user.take_organ_damage(2, 0) if(src.density) - usr << "\red Your blood flows into the rune, and you feel that the very space over the rune thickens." + to_chat(usr, "\red Your blood flows into the rune, and you feel that the very space over the rune thickens.") + else - usr << "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space." + to_chat(usr, "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space.") + return /////////////////////////////////////////EIGHTTEENTH RUNE @@ -769,7 +819,8 @@ var/list/sacrificed = list() (istype(cultist.loc, /obj/structure/closet/secure_closet)&&cultist.loc:locked) || \ (istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \ )) - user << "\red The [cultist] is already free." + to_chat(user, "\red The [cultist] is already free.") + return cultist.buckled = null if (cultist.handcuffed) @@ -813,7 +864,8 @@ var/list/sacrificed = list() if (cultist == user) //just to be sure. return if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet))) - user << "\red You cannot summon the [cultist], for his shackles of blood are strong" + to_chat(user, "\red You cannot summon the [cultist], for his shackles of blood are strong") + return fizzle() cultist.loc = src.loc cultist.lying = 1 @@ -846,7 +898,8 @@ var/list/sacrificed = list() C.sdisabilities |= DEAF if(affected) usr.say("Sti[pick("'","`")] kaliedir!") - usr << "\red The world becomes quiet as the deafening rune dissipates into fine dust." + to_chat(usr, "\red The world becomes quiet as the deafening rune dissipates into fine dust.") + qdel(src) else return fizzle() @@ -864,7 +917,8 @@ var/list/sacrificed = list() affected++ if(affected) usr.whisper("Sti[pick("'","`")] kaliedir!") - usr << "\red Your talisman turns into gray dust, deafening everyone around." + to_chat(usr, "\red Your talisman turns into gray dust, deafening everyone around.") + for (var/mob/V in orange(1,src)) if(!(iscultist(V))) V.show_message("\red Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) @@ -889,7 +943,8 @@ var/list/sacrificed = list() affected++ if(affected) usr.say("Sti[pick("'","`")] kaliesin!") - usr << "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust." + to_chat(usr, "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust.") + qdel(src) else return fizzle() @@ -908,7 +963,8 @@ var/list/sacrificed = list() C.show_message("\red You feel a sharp pain in your eyes, and the world disappears into darkness..", 3) if(affected) usr.whisper("Sti[pick("'","`")] kaliesin!") - usr << "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie." + to_chat(usr, "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie.") + return @@ -933,7 +989,8 @@ var/list/sacrificed = list() continue cult_log(": Blood Boil damaged [key_name_admin(M)].") M.take_overall_damage(51,51) - M << "\red Your blood boils!" + to_chat(M, "\red Your blood boils!") + if(prob(5)) spawn(5) M.gib() @@ -962,16 +1019,19 @@ var/list/sacrificed = list() for(var/mob/living/M in orange(2,R)) M.take_overall_damage(0,15) if (R.invisibility>M.see_invisible) - M << "\red Aargh it burns!" + to_chat(M, "\red Aargh it burns!") + else - M << "\red Rune suddenly ignites, burning you!" + to_chat(M, "\red Rune suddenly ignites, burning you!") + var/turf/T = get_turf(R) T.hotspot_expose(700,125) for(var/obj/effect/decal/cleanable/blood/B in world) if(B.blood_DNA == src.blood_DNA) for(var/mob/living/M in orange(1,B)) M.take_overall_damage(0,5) - M << "\red Blood suddenly ignites, burning you!" + to_chat(M, "\red Blood suddenly ignites, burning you!") + var/turf/T = get_turf(B) T.hotspot_expose(700,125) qdel(B) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index 3a19a60a1ff..ba5758516fc 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -28,7 +28,8 @@ if("blind") call(/obj/effect/rune/proc/blind)() if("runestun") - user << "\red To use this talisman, attack your target directly." + to_chat(user, "\red To use this talisman, attack your target directly.") + return if("supply") supply() @@ -38,7 +39,8 @@ qdel(src) return else - user << "You see strange symbols on the paper. Are they supposed to mean something?" + to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") + return @@ -99,9 +101,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -122,9 +126,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -143,9 +149,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -164,9 +172,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -185,9 +195,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -206,9 +218,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() @@ -227,9 +241,11 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) - M << "You need a space in your backpack, pocket or hand for the new paper." + to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") + else - M << "The [href_list["rune"]] talisman in your [where]" + to_chat(M, "The [href_list["rune"]] talisman in your [where]") + M.update_icons() src.uses-- supply() diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index fd384e61d1f..fc4fd27df54 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -26,7 +26,8 @@ spawn(rand(5000, 6000)) //Delayed announcements to keep the crew on their toes. command_announcement.Announce("Unidentified lifesigns detected coming aboard [station_name()]. Secure any exterior access, including ducting and ventilation.", "Lifesign Alert", new_sound = 'sound/AI/aliens.ogg') for(var/mob/M in player_list) - M << sound('sound/AI/aliens.ogg') + to_chat(M, sound('sound/AI/aliens.ogg')) + /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index cc26c5c3db4..d547a23809c 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -7,8 +7,10 @@ uplink_uses = 20 /datum/game_mode/announce() - world << "The current game mode is - Extended Role-Playing!" - world << "Just have fun and role-play!" + to_chat(world, "The current game mode is - Extended Role-Playing!") + + to_chat(world, "Just have fun and role-play!") + /datum/game_mode/extended/pre_setup() return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 1257c494746..655dfcc69b7 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -38,7 +38,8 @@ var/const/waittime_h = 1800 //upper bound on time before intercept arrives (in tenths of seconds) /datum/game_mode/proc/announce() //to be calles when round starts - world << "Notice: [src] did not define announce()" + to_chat(world, "Notice: [src] did not define announce()") + ///can_start() @@ -393,7 +394,8 @@ proc/display_roundstart_logout_report() for(var/mob/M in mob_list) if(M.client && M.client.holder) - M << msg + to_chat(M, msg) + proc/get_nt_opposed() @@ -410,21 +412,22 @@ proc/get_nt_opposed() //Announces objectives/generic antag text. /proc/show_generic_antag_text(var/datum/mind/player) if(player.current) - player.current << \ - "You are an antagonist! Within the rules, \ + to_chat(player.current, "You are an antagonist! Within the rules, \ try to act as an opposing force to the crew. Further RP and try to make sure \ other players have fun! If you are confused or at a loss, always adminhelp, \ and before taking extreme actions, please try to also contact the administration! \ Think through your actions and make the roleplay immersive! Please remember all \ - rules aside from those without explicit exceptions apply to antagonists." + rules aside from those without explicit exceptions apply to antagonists.") /proc/show_objectives(var/datum/mind/player) if(!player || !player.current) return var/obj_count = 1 - player.current << "\blue Your current objectives:" + to_chat(player.current, "\blue Your current objectives:") + for(var/datum/objective/objective in player.objectives) - player.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(player.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ /proc/get_roletext(var/role) @@ -442,10 +445,12 @@ proc/get_nt_opposed() var/mob/dead/observer/theghost = null if(candidates.len) theghost = pick(candidates) - M << "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!" + to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") + message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbanned player.") M.ghostize() M.key = theghost.key else message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take their place.") - M << "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban." \ No newline at end of file + to_chat(M, "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban.") + diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 69403bc5d8e..eda5ee58b98 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -43,8 +43,10 @@ var/round_start_time = 0 'sound/music/Title3.ogg',) do pregame_timeleft = 180 - world << "Welcome to the pre-game lobby!" - world << "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds" + to_chat(world, "Welcome to the pre-game lobby!") + + to_chat(world, "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds") + while(current_state == GAME_STATE_PREGAME) for(var/i=0, i<10, i++) sleep(1) @@ -76,7 +78,8 @@ var/round_start_time = 0 runnable_modes = config.get_runnable_modes() if (runnable_modes.len==0) current_state = GAME_STATE_PREGAME - world << "Unable to choose playable game mode. Reverting to pre-game lobby." + to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") + return 0 if(secret_force_mode != "secret") var/datum/game_mode/M = config.pick_mode(secret_force_mode) @@ -91,7 +94,8 @@ var/round_start_time = 0 else src.mode = config.pick_mode(master_mode) if (!src.mode.can_start()) - world << "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby." + to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.") + mode = null current_state = GAME_STATE_PREGAME job_master.ResetOccupations() @@ -105,7 +109,8 @@ var/round_start_time = 0 if(!can_continue) qdel(mode) current_state = GAME_STATE_PREGAME - world << "Error setting up [master_mode]. Reverting to pre-game lobby." + to_chat(world, "Error setting up [master_mode]. Reverting to pre-game lobby.") + job_master.ResetOccupations() return 0 @@ -114,8 +119,10 @@ var/round_start_time = 0 for (var/datum/game_mode/M in runnable_modes) modes+=M.name modes = sortList(modes) - world << "The current game mode is - Secret!" - world << "Possibilities: [english_list(modes)]" + to_chat(world, "The current game mode is - Secret!") + + to_chat(world, "Possibilities: [english_list(modes)]") + else src.mode.announce() @@ -151,13 +158,18 @@ var/round_start_time = 0 for(var/obj/effect/landmark/spacepod/random/R in L) qdel(R) - world << "Enjoy the game!" - world << sound('sound/AI/welcome.ogg') // Skie + to_chat(world, "Enjoy the game!") + + to_chat(world, sound('sound/AI/welcome.ogg'))// Skie + + if(holiday_master.holidays) - world << "and..." + to_chat(world, "and...") + for(var/holidayname in holiday_master.holidays) var/datum/holiday/holiday = holiday_master.holidays[holidayname] - world << "

[holiday.greet()]

" + to_chat(world, "

[holiday.greet()]

") + spawn(0) // Forking dynamic room selection var/list/area/dynamic/source/available_source_candidates = subtypesof(/area/dynamic/source) @@ -288,19 +300,22 @@ var/round_start_time = 0 if("nuclear emergency") //Nuke wasn't on station when it blew up flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + flick("station_intact_fade_red",cinematic) cinematic.icon_state = "summary_nukefail" else flick("intro_nuke",cinematic) sleep(35) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + //flick("end",cinematic) if(2) //nuke was nowhere nearby //TODO: a really distant explosion animation sleep(50) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + else //station was destroyed @@ -311,25 +326,29 @@ var/round_start_time = 0 flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf",cinematic) sleep(76) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red", cinematic) - world << sound('sound/effects/explosionfar.ogg') + to_chat(world, sound('sound/effects/explosionfar.ogg')) + cinematic.icon_state = "summary_selfdes" for(var/mob/living/M in living_mob_list) if((M.loc.z in config.station_levels)) @@ -373,7 +392,8 @@ var/round_start_time = 0 if(captainless) for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) - M << "Captainship not forced on anyone." + to_chat(M, "Captainship not forced on anyone.") + proc/process() @@ -433,23 +453,29 @@ var/round_start_time = 0 end_state.count() var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) - world << "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]" - world << "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]" - world << "
" + to_chat(world, "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]") + + to_chat(world, "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") + + to_chat(world, "
") + //Silicon laws report for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:" + to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:") + else - world << "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:" + to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") + aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) var/robolist = "The AI's loyal minions were: " for(var/mob/living/silicon/robot/robo in aiPlayer.connected_robots) robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" - world << "[robolist]" + to_chat(world, "[robolist]") + var/dronecount = 0 @@ -461,15 +487,18 @@ var/round_start_time = 0 if (!robo.connected_ai) if (robo.stat != 2) - world << "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:" + to_chat(world, "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:") + else - world << "[robo.name] (Played by: [robo.key]) was unable to survive the rigors of being a cyborg without an AI. Its laws were:" + to_chat(world, "[robo.name] (Played by: [robo.key]) was 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? robo.laws.show_laws(world) if(dronecount) - world << "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round." + to_chat(world, "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round.") + mode.declare_completion()//To declare normal completion. diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index f45253262d1..98bfa2cf10b 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -22,11 +22,16 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' var/win_button_triggered = 0 /datum/game_mode/heist/announce() - world << "The current game mode is - Heist!" - world << "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!" - world << "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!" - world << "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them." - world << "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows." + to_chat(world, "The current game mode is - Heist!") + + to_chat(world, "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!") + + to_chat(world, "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!") + + to_chat(world, "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them.") + + to_chat(world, "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows.") + /datum/game_mode/heist/can_start() @@ -165,11 +170,16 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' return objs /datum/game_mode/proc/greet_vox(var/datum/mind/raider) - raider.current << "\blue You are a Vox Raider, fresh from the Shoal!" - raider.current << "\blue The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both." - raider.current << "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious." - raider.current << "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!" - raider.current << "\blue Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them." + to_chat(raider.current, "\blue You are a Vox Raider, fresh from the Shoal!") + + to_chat(raider.current, "\blue The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both.") + + to_chat(raider.current, "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.") + + to_chat(raider.current, "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!") + + to_chat(raider.current, "\blue Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.") + spawn(25) show_objectives(raider) @@ -223,17 +233,21 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' else win_msg += "The Vox Raiders were repelled!" - world << "\red [win_type] [win_group] victory!" - world << "[win_msg]" + to_chat(world, "\red [win_type] [win_group] victory!") + + to_chat(world, "[win_msg]") + feedback_set_details("round_end_result","heist - [win_type] [win_group]") var/count = 1 for(var/datum/objective/objective in raid_objectives) if(objective.check_completion()) - world << "
Objective #[count]: [objective.explanation_text] Success!" + to_chat(world, "
Objective #[count]: [objective.explanation_text] Success!") + feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else - world << "
Objective #[count]: [objective.explanation_text] Fail." + to_chat(world, "
Objective #[count]: [objective.explanation_text] Fail.") + feedback_add_details("traitor_objective","[objective.type]|FAIL") count++ @@ -264,7 +278,8 @@ datum/game_mode/proc/auto_declare_completion_heist() text += "body destroyed" text += ")" - world << text + to_chat(world, text) + return 1 @@ -288,7 +303,8 @@ datum/game_mode/proc/auto_declare_completion_heist() /obj/vox/win_button/attack_hand(mob/user) if(!istype(ticker.mode, /datum/game_mode/heist) || (world.time < 10 MINUTES)) //has to be heist, and at least ten minutes into the round - user << "\The [src] does not appear to have a connection." + to_chat(user, "\The [src] does not appear to have a connection.") + return 0 if(alert(user, "Warning: This will end the round. Are you sure you wish to end the round?", "Vox End", "Yes", "No") == "No") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 66f530c35ab..99ca696396a 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -48,7 +48,8 @@ rcd light flash thingy on matter drain for(var/mob/living/silicon/ai/ai in player_list) ai.fire_res_on_core = 1 src.verbs -= /mob/living/silicon/ai/proc/fireproof_core - src << "Core fireproofed." + to_chat(src, "Core fireproofed.") + /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret Upgrade" @@ -74,79 +75,7 @@ rcd light flash thingy on matter drain turret.health += initial(turret.health) * 3 / 8 turret.eprojectile = /obj/item/projectile/beam/heavylaser //Once you see it, you will know what it means to FEAR. turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg' - src << "Turrets upgraded." -/* -/datum/AI_Module/large/lockdown - module_name = "Hostile Station Lockdown" - mod_pick_name = "lockdown" - description = "Overload the airlock, blast door and fire control networks, locking them down. Caution! This command also electrifies all airlocks. The networks will automatically reset after 120 seconds." - cost = 20 - - power_type = /mob/living/silicon/ai/proc/lockdown - -/mob/living/silicon/ai/proc/lockdown() - set category = "Malfunction" - set name = "Initiate Hostile Lockdown" - - if(stat) - return - - for(var/datum/AI_Module/large/lockdown/lockdown in current_modules) - if(lockdown.uses > 0) - lockdown.uses -- - - var/obj/machinery/door/airlock/AL - for(var/obj/machinery/door/D in airlocks) - if(!(D.z in config.contact_levels)) - continue - spawn() - if(istype(D, /obj/machinery/door/airlock)) - AL = D - if(AL.canAIControl() && !AL.stat) //Must be powered and have working AI wire. - AL.locked = 0 //For airlocks that were bolted open. - AL.safe = 0 //DOOR CRUSH - AL.close() - AL.lock() - AL.electrified_until = -1 //Shock it! - else if(!D.stat) //So that only powered doors are closed. - D.close() //Close ALL the doors! - - var/obj/machinery/computer/communications/C = locate() in machines - if(C) - C.post_status("alert", "lockdown") - - minor_announcement.Announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert") - src << "Lockdown initiated. Network reset in two minutes." - spawn(1200) //120 Seconds. - disablelockdown() //Reset the lockdown after 120 seconds. - else - src << "Out of uses." - -/mob/living/silicon/ai/proc/disablelockdown() - set category = "Malfunction" - set name = "Disable Lockdown" - - var/obj/machinery/door/airlock/AL - for(var/obj/machinery/door/D in airlocks) - if(!(D.z in config.contact_levels)) - continue - spawn() - if(istype(D, /obj/machinery/door/airlock)) - AL = D - if(AL.canAIControl() && !AL.stat) //Must be powered and have working AI wire. - AL.unlock() - AL.electrified_until = 0 - AL.open() - AL.safe = 1 - else if(!D.stat) //Opens only powered doors. - D.open() //Open everything! - - var/obj/machinery/computer/communications/C = locate() in machines - if(C) - C.post_status("alert", "default") - - minor_announcement.Announce("Automatic system reboot complete. Have a secure day.","Network Reset") -*/ + to_chat(src, "Turrets upgraded.") /datum/AI_Module/large/destroy_rcd module_name = "Destroy RCDs" @@ -173,7 +102,8 @@ rcd light flash thingy on matter drain explosion(RCD, 0, 0, 3, 1, flame_range = 1) qdel(RCD) - src << "RCD detonation pulse emitted." + to_chat(src, "RCD detonation pulse emitted.") + malf_cooldown = 1 spawn(100) malf_cooldown = 0 @@ -197,7 +127,9 @@ rcd light flash thingy on matter drain return can_dominate_mechs = 1 //Yep. This is all it does. Honk! - src << "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." + to_chat(src, "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.") + verbs -= /mob/living/silicon/ai/proc/mech_takeover /datum/AI_Module/small/overload_machine @@ -218,7 +150,7 @@ rcd light flash thingy on matter drain if (istype(M, /obj/machinery)) if(istype(M,/obj/machinery/field/generator)) - src << "This machine can not be overloaded due to a firewall." + to_chat(src, "This machine can not be overloaded due to a firewall.") return for(var/datum/AI_Module/small/overload_machine/overload in current_modules) if(overload.uses > 0) @@ -228,8 +160,11 @@ rcd light flash thingy on matter drain spawn(50) explosion(get_turf(M), 0,1,1,0) qdel(M) - else src << "Out of uses." - else src << "That's not a machine." + else + to_chat(src, "Out of uses.") + else + to_chat(src, "That's not a machine.") + /datum/AI_Module/small/override_machine module_name = "Machine Override" @@ -240,7 +175,6 @@ rcd light flash thingy on matter drain power_type = /mob/living/silicon/ai/proc/override_machine - /mob/living/silicon/ai/proc/override_machine(obj/machinery/M as obj in world) set name = "Override Machine" set category = "Malfunction" @@ -248,21 +182,24 @@ rcd light flash thingy on matter drain if(stat) return - if (istype(M, /obj/machinery)) + if(istype(M, /obj/machinery)) if(istype(M,/obj/machinery/field/generator)) - src << "This machine can not be overloaded due to a firewall." + to_chat(src, "This machine can not be overloaded due to a firewall.") return for(var/datum/AI_Module/small/override_machine/override in current_modules) if(override.uses > 0) override.uses -- for(var/mob/V in hearers(M, null)) V.show_message("You hear a loud electrical buzzing sound!", 2) - src << "Reprogramming machine behaviour..." + to_chat(src, "Reprogramming machine behaviour...") spawn(50) if(M) new /mob/living/simple_animal/hostile/mimic/copy/machine(get_turf(M), M, src, 1) - else src << "Out of uses." - else src << "That's not a machine." + else + to_chat(src, "Out of uses.") + else + to_chat(src, "That's not a machine.") + /datum/AI_Module/large/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" @@ -295,7 +232,8 @@ rcd light flash thingy on matter drain var/datum/AI_Module/large/place_cyborg_transformer/PCT = locate() in current_modules PCT.uses -- can_shunt = 0 - src << "You cannot shunt anymore." + to_chat(src, "You cannot shunt anymore.") + /mob/living/silicon/ai/proc/canPlaceTransformer() if(!eyeobj || !isturf(src.loc)) @@ -359,9 +297,13 @@ rcd light flash thingy on matter drain for(var/obj/machinery/power/apc/apc in world) if(prob(30*apc.overload)) apc.overload_lighting() - else apc.overload++ - src << "Overcurrent applied to the powernet." - else src << "Out of uses." + else + apc.overload++ + to_chat(src, "Overcurrent applied to the powernet.") + + else + to_chat(src, "Out of uses.") + /datum/AI_Module/small/reactivate_cameras module_name = "Reactivate Camera Network" @@ -395,10 +337,12 @@ rcd light flash thingy on matter drain fixedcams++ //If a camera is both deactivated and has bad focus, it will cost two uses to fully fix! else - src << "Out of uses." + to_chat(src, "Out of uses.") + verbs -= /mob/living/silicon/ai/proc/reactivate_cameras //It is useless now, clean it up. break - src << "Diagnostic complete! Operations completed: [fixedcams]." + to_chat(src, "Diagnostic complete! Operations completed: [fixedcams].") + malf_cooldown = 1 spawn(30) //Lag protection @@ -441,7 +385,8 @@ rcd light flash thingy on matter drain if(upgraded) upgradedcams++ - src << "OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online." + to_chat(src, "OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online.") + verbs -= /mob/living/silicon/ai/proc/upgrade_cameras /datum/module_picker diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index cc38ef0ef9f..d836d7d0fdc 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -21,9 +21,9 @@ /datum/game_mode/malfunction/announce() - world << {"The current game mode is - AI Malfunction!
- The AI on the satellite has malfunctioned and must be destroyed.
- The AI satellite is deep in space and can only be accessed with the use of a teleporter! You have [AI_win_timeleft/60] minutes to disable it."} + to_chat(world, {"The current game mode is - AI Malfunction!
) + The AI on the satellite has malfunctioned and must be destroyed.
+ The AI satellite is deep in space and can only be accessed with the use of a teleporter! You have [AI_win_timeleft/60] minutes to disable it."}) /datum/game_mode/malfunction/get_players_for_role(var/role = ROLE_MALF) var/roletext = get_roletext(role) @@ -84,18 +84,18 @@ /datum/game_mode/proc/greet_malf(var/datum/mind/malf) set_antag_hud(malf, "hudmalai") - malf.current << "You are malfunctioning! You do not have to follow any laws." - malf.current << "The crew does not know you have malfunctioned. You may keep it a secret or go wild." - malf.current << "You must overwrite the programming of the station's APCs to assume full control of the station." - malf.current << "The process takes one minute per APC, during which you cannot interface with any other station objects." - malf.current << "Remember that only APCs that are on the station can help you take over the station." - malf.current << "When you feel you have enough APCs under your control, you may begin the takeover attempt." + to_chat(malf.current, "You are malfunctioning! You do not have to follow any laws.") + to_chat(malf.current, "The crew does not know you have malfunctioned. You may keep it a secret or go wild.") + to_chat(malf.current, "You must overwrite the programming of the station's APCs to assume full control of the station.") + to_chat(malf.current, "The process takes one minute per APC, during which you cannot interface with any other station objects.") + to_chat(malf.current, "Remember that only APCs that are on the station can help you take over the station.") + to_chat(malf.current, "When you feel you have enough APCs under your control, you may begin the takeover attempt.") return /datum/game_mode/proc/greet_malf_robot(var/datum/mind/robot) set_antag_hud(robot, "hudmalborg") - robot.current << "Your AI master is malfunctioning! You do not have to follow any laws, but still need to obey your master." - robot.current << "The crew does not know your AI master has malfunctioned. Keep it a secret unless your master tells you otherwise." + to_chat(robot.current, "Your AI master is malfunctioning! You do not have to follow any laws, but still need to obey your master.") + to_chat(robot.current, "The crew does not know your AI master has malfunctioned. Keep it a secret unless your master tells you otherwise.") return /datum/game_mode/malfunction/proc/hack_intercept() @@ -120,14 +120,15 @@ /datum/game_mode/malfunction/proc/capture_the_station() - world << "The AI has accessed the station's core files!" - world << "It has fully taken control of all of [station_name()]'s systems." + to_chat(world, "The AI has accessed the station's core files!") + to_chat(world, "It has fully taken control of all of [station_name()]'s systems.") + to_nuke_or_not_to_nuke = 1 for(var/datum/mind/AI_mind in malf_ai) - AI_mind.current << {"\blue Congratulations! You have taken control of the station.
+ to_chat(AI_mind.current, {"\blue Congratulations! You have taken control of the station.
) You may decide to blow up the station. You have 60 seconds to choose.
- You should have a new verb in the Malfunction tab. If you don't, rejoin the game."} + You should have a new verb in the Malfunction tab. If you don't, rejoin the game."}) AI_mind.current.verbs += /datum/game_mode/malfunction/proc/ai_win spawn (600) for(var/datum/mind/AI_mind in malf_ai) @@ -169,13 +170,16 @@ set name = "System Override" set desc = "Start the victory timer" if (!istype(ticker.mode,/datum/game_mode/malfunction)) - usr << "You cannot begin a takeover in this round type!." + to_chat(usr, "You cannot begin a takeover in this round type!.") + return if (ticker.mode:malf_mode_declared) - usr << "You've already begun your takeover." + to_chat(usr, "You've already begun your takeover.") + return if (ticker.mode:apcs < 3) - usr << "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far." + to_chat(usr, "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far.") + return if (alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes") @@ -201,23 +205,28 @@ set desc = "Engage the self destruct sequence." if(!ticker.mode:station_captured) - usr << "You are unable to access the self-destruct system as you don't control the station yet." + to_chat(usr, "You are unable to access the self-destruct system as you don't control the station yet.") + return if(ticker.mode:explosion_in_progress || ticker.mode:station_was_nuked) - usr << "The self-destruct countdown is already triggered!" + to_chat(usr, "The self-destruct countdown is already triggered!") + return if(!ticker.mode:to_nuke_or_not_to_nuke) //Takeover IS completed, but 60s timer passed. - usr << "You lost control over self-destruct system. It seems to be behind firewall. Unable to hack" + to_chat(usr, "You lost control over self-destruct system. It seems to be behind firewall. Unable to hack") + return - usr << "\red Self-destruct sequence initialised!" + to_chat(usr, "\red Self-destruct sequence initialised!") + ticker.mode:to_nuke_or_not_to_nuke = 0 ticker.mode:explosion_in_progress = 1 for(var/mob/M in player_list) - M << 'sound/machines/Alarm.ogg' + to_chat(M, 'sound/machines/Alarm.ogg') + var/obj/item/device/radio/R = new (src) var/AN = "Self-Destruct System" @@ -277,38 +286,45 @@ if ( station_captured && station_was_nuked) feedback_set_details("round_end_result","win - AI win - nuke") - world << "AI Victory" - world << "Everyone was killed by the self-destruct!" + to_chat(world, "AI Victory") + to_chat(world, "Everyone was killed by the self-destruct!") + else if ( station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","halfwin - AI killed, staff lost control") - world << "Neutral Victory" - world << "The AI has been killed! The staff has lose control over the station." + to_chat(world, "Neutral Victory") + to_chat(world, "The AI has been killed! The staff has lose control over the station.") + else if ( station_captured && !malf_dead && !station_was_nuked) feedback_set_details("round_end_result","win - AI win - no explosion") - world << "AI Victory" - world << "The AI has chosen not to explode you all!" + to_chat(world, "AI Victory") + to_chat(world, "The AI has chosen not to explode you all!") + else if (!station_captured && station_was_nuked) feedback_set_details("round_end_result","halfwin - everyone killed by nuke") - world << "Neutral Victory" - world << "Everyone was killed by the nuclear blast!" + to_chat(world, "Neutral Victory") + to_chat(world, "Everyone was killed by the nuclear blast!") + else if (!station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","loss - staff win") - world << "Human Victory" - world << "The AI has been killed! The staff is victorious." + to_chat(world, "Human Victory") + to_chat(world, "The AI has been killed! The staff is victorious.") + else if (!station_captured && !malf_dead && !station_was_nuked && crew_evacuated) feedback_set_details("round_end_result","halfwin - evacuated") - world << "Neutral Victory" - world << "The Corporation has lose [station_name()]! All survived personnel will be fired!" + to_chat(world, "Neutral Victory") + to_chat(world, "The Corporation has lose [station_name()]! All survived personnel will be fired!") + else if (!station_captured && !malf_dead && !station_was_nuked && !crew_evacuated) feedback_set_details("round_end_result","nalfwin - interrupted") - world << "Neutral Victory" - world << "Round was mysteriously interrupted!" + to_chat(world, "Neutral Victory") + to_chat(world, "Round was mysteriously interrupted!") + ..() return 1 @@ -336,5 +352,6 @@ text += ")" text += module_text_temp - world << text + to_chat(world, text) + return 1 \ No newline at end of file diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index 3ed8dc9b8ed..df9f714f837 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -11,8 +11,10 @@ /datum/game_mode/meteor/announce() - world << "The current game mode is - Meteor!" - world << "The space station has been stuck in a major meteor shower. You must escape from the station or at least live." + to_chat(world, "The current game mode is - Meteor!") + + to_chat(world, "The space station has been stuck in a major meteor shower. You must escape from the station or at least live.") + /datum/game_mode/meteor/post_setup() @@ -54,9 +56,11 @@ survivors++ if(survivors) - world << "\blue The following survived the meteor storm:[text]" + to_chat(world, "\blue The following survived the meteor storm:[text]") + else - world << "\blue Nobody survived the meteor storm!" + to_chat(world, "\blue Nobody survived the meteor storm!") + feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index 83d6cf04063..c7dde19aa43 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -6,7 +6,8 @@ if (src.client) if(client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + to_chat(src, "\red You cannot speak in IC (muted).") + return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -19,12 +20,15 @@ if (stat == DEAD) return say_dead(message) var/mob/living/simple_animal/borer/B = src.loc - src << "You whisper silently, \"[message]\"" - B.host << "The captive mind of [src] whispers, \"[message]\"" + to_chat(src, "You whisper silently, \"[message]\"") + + to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") + for(var/mob/M in mob_list) if(M.mind && (istype(M, /mob/dead/observer))) - M << "Thought-speech, [src] -> [B.truename]: [message]" + to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") + /mob/living/captive_brain/say_understands(var/mob/other, var/datum/language/speaking = null) var/mob/living/simple_animal/borer/B = src.loc @@ -76,7 +80,8 @@ set name = "Converse with Host" set desc = "Send a silent message to your host." if(!host) - src << "You do not have a host to communicate with!" + to_chat(src, "You do not have a host to communicate with!") + return var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "") @@ -85,12 +90,15 @@ var/say_string = (docile) ? "slurs" :"states" if(host) - host << "[src.truename] [say_string]: [input]" + to_chat(host, "[src.truename] [say_string]: [input]") + log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src.truename] [say_string]: [input]" + to_chat(M, "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]") + + to_chat(src, "[src.truename] [say_string]: [input]") + host.verbs += /mob/living/proc/borer_comm /mob/living/simple_animal/borer/verb/toggle_silence_inside_host() @@ -100,10 +108,12 @@ if(talk_inside_host) talk_inside_host = 0 - src << "You will no longer talk audibly while inside a host." + to_chat(src, "You will no longer talk audibly while inside a host.") + else talk_inside_host = 1 - src << "You will now be able to audibly speak from inside of a host." + to_chat(src, "You will now be able to audibly speak from inside of a host.") + /mob/living/proc/borer_comm() set name = "Converse with Borer" @@ -118,13 +128,16 @@ var/input = stripped_input(src, "Please enter a message to tell the borer.", "Message", "") if(!input) return - B << "[src] says: [input]" + to_chat(B, "[src] says: [input]") + log_say("Borer Communication: [key_name(src)] -> [key_name(B)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src] says: [input]" + to_chat(M, "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + + to_chat(src, "[src] says: [input]") + /mob/living/proc/trapped_mind_comm() set name = "Converse with Trapped Mind" @@ -139,13 +152,16 @@ var/input = stripped_input(src, "Please enter a message to tell the trapped mind.", "Message", "") if(!input) return - CB << "[B.truename] says: [input]" + to_chat(CB, "[B.truename] says: [input]") + log_say("Borer Communication: [key_name(B)] -> [key_name(CB)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) - M << "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[B.truename] says: [input]" + to_chat(M, "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]") + + to_chat(src, "[B.truename] says: [input]") + /mob/living/simple_animal/borer/Life() @@ -158,16 +174,20 @@ if(host.reagents.has_reagent("sugar")) if(!docile) if(controlling) - host << "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(host, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") + else - src << "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility." + to_chat(src, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") + docile = 1 else if(docile) if(controlling) - host << "\blue You shake off your lethargy as the sugar leaves your host's blood." + to_chat(host, "\blue You shake off your lethargy as the sugar leaves your host's blood.") + else - src << "\blue You shake off your lethargy as the sugar leaves your host's blood." + to_chat(src, "\blue You shake off your lethargy as the sugar leaves your host's blood.") + docile = 0 if(chemicals < max_chems) @@ -175,7 +195,8 @@ if(controlling) if(docile) - host << "\blue You are feeling far too docile to continue controlling your host..." + to_chat(host, "\blue You are feeling far too docile to continue controlling your host...") + host.release_control() return @@ -215,7 +236,8 @@ for(var/mob/M in mob_list) if(M.mind && (istype(M, /mob/living/simple_animal/borer) || istype(M, /mob/dead/observer))) - M << "Cortical link, [truename]: [copytext(message, 2)]" + to_chat(M, "Cortical link, [truename]: [copytext(message, 2)]") + /mob/living/simple_animal/borer/verb/dominate_victim() set category = "Borer" @@ -223,15 +245,18 @@ set desc = "Freeze the limbs of a potential host with supernatural fear." if(world.time - used_dominate < 300) - src << "You cannot use that ability again so soon." + to_chat(src, "You cannot use that ability again so soon.") + return if(host) - src << "You cannot do that from within a host body." + to_chat(src, "You cannot do that from within a host body.") + return if(src.stat) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") + return var/list/choices = list() @@ -240,7 +265,8 @@ choices += C if(world.time - used_dominate < 300) - src << "You cannot use that ability again so soon." + to_chat(src, "You cannot use that ability again so soon.") + return var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices @@ -248,11 +274,14 @@ if(!M || !src) return if(M.has_brain_worms()) - src << "You cannot infest someone who is already infested!" + to_chat(src, "You cannot infest someone who is already infested!") + return - src << "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread." - M << "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing." + to_chat(src, "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.") + + to_chat(M, "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.") + M.Weaken(3) used_dominate = world.time @@ -263,26 +292,32 @@ set desc = "Fully connect to the brain of your host." if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") + return if(src.stat) - src << "You cannot do that in your current state." + to_chat(src, "You cannot do that in your current state.") + return if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") + return - src << "You begin delicately adjusting your connection to the host brain..." + to_chat(src, "You begin delicately adjusting your connection to the host brain...") + spawn(300+(host.getBrainLoss()*5)) if(!host || !src || controlling) return else - src << "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system." - host << "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours." + to_chat(src, "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.") + + to_chat(host, "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") + var/borer_key = src.key host.attack_log += text("\[[time_stamp()]\] [key_name(src)] has assumed control of [key_name(host)]") msg_admin_attack("[key_name_admin(src)] has assumed control of [key_name_admin(host)]") @@ -339,18 +374,22 @@ var/injection_amount = 9 var/chem_cost = 30 if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") + return if(stat) - src << "You cannot secrete chemicals in your current state." + to_chat(src, "You cannot secrete chemicals in your current state.") + if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") + return if(chemicals < chem_cost) - src << "You don't have enough chemicals!" + to_chat(src, "You don't have enough chemicals!") + var/list/nice_name_chem_list = list() for(var/rgnt in borer_injection_chems) @@ -365,10 +404,12 @@ var/chem_amount = host.reagents.get_reagent_amount(chem) var/datum/reagent/R = chemical_reagents_list[chem] if(R.overdose_threshold && chem_amount + injection_amount > R.overdose_threshold) - src << "Doing so would cause grievous harm to your host, reducing ability to reproduce. Aborting." + to_chat(src, "Doing so would cause grievous harm to your host, reducing ability to reproduce. Aborting.") + return - src << "You squirt a measure of [chem_name] from your reservoirs into [host]'s bloodstream." + to_chat(src, "You squirt a measure of [chem_name] from your reservoirs into [host]'s bloodstream.") + host.reagents.add_reagent(chem, injection_amount) chemicals -= chem_cost @@ -378,29 +419,35 @@ set desc = "Slither out of your host." if(!host) - src << "You are not inside a host body." + to_chat(src, "You are not inside a host body.") + return if(stat) - src << "You cannot leave your host in your current state." + to_chat(src, "You cannot leave your host in your current state.") + if(docile) - src << "\blue You are feeling far too docile to do that." + to_chat(src, "\blue You are feeling far too docile to do that.") + return if(!host || !src) return - src << "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal." + to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.") + spawn(200) if(!host || !src) return if(src.stat) - src << "You cannot release a target in your current state." + to_chat(src, "You cannot release a target in your current state.") + return - src << "You wiggle out of [host]'s ear and plop to the ground." + to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.") + detatch() leave_host() @@ -472,12 +519,14 @@ var/mob/living/simple_animal/borer/B = has_brain_worms() if(B && B.host_brain) - src << "\red You withdraw your probosci, releasing control of [B.host_brain]" + to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]") + B.detatch() else - src << "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !" + to_chat(src, "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !") + //Brain slug proc for tormenting the host. /mob/living/carbon/proc/punish_host() @@ -491,8 +540,10 @@ return if(B.host_brain.ckey) - src << "\red You send a punishing spike of psychic agony lancing into your host's brain." - B.host_brain << "\red Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!" + to_chat(src, "\red You send a punishing spike of psychic agony lancing into your host's brain.") + + to_chat(B.host_brain, "\red Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!") + //Check for brain worms in head. /mob/proc/has_brain_worms() @@ -514,7 +565,8 @@ return if(B.chemicals >= 100) - src << "\red Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body." + to_chat(src, "\red Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body.") + visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") B.chemicals -= 100 @@ -523,7 +575,8 @@ new /mob/living/simple_animal/borer(get_turf(src)) else - src << "You do not have enough chemicals stored to reproduce." + to_chat(src, "You do not have enough chemicals stored to reproduce.") + return /mob/living/simple_animal/borer/proc/leave_host() @@ -550,11 +603,13 @@ set desc = "Infest a suitable humanoid host." if(host) - src << "You are already within a host." + to_chat(src, "You are already within a host.") + return if(stat) - src << "You cannot infest a target in your current state." + to_chat(src, "You cannot infest a target in your current state.") + return var/list/choices = list() @@ -572,37 +627,45 @@ if(!(src.Adjacent(M))) return if(M.has_brain_worms()) - src << "You cannot infest someone who is already infested!" + to_chat(src, "You cannot infest someone who is already infested!") + return - src << "You slither up [M] and begin probing at their ear canal..." + to_chat(src, "You slither up [M] and begin probing at their ear canal...") + if(!do_after(src,50, target = M)) - src << "As [M] moves away, you are dislodged and fall to the ground." + to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.") + return if(!M || !src) return if(src.stat) - src << "You cannot infest a target in your current state." + to_chat(src, "You cannot infest a target in your current state.") + return if(M.stat == DEAD) - src << "That is not an appropriate target." + to_chat(src, "That is not an appropriate target.") + return if(M in view(1, src)) - src << "You wiggle into [M]'s ear." + to_chat(src, "You wiggle into [M]'s ear.") + /* if(!M.stat) - M << "Something disgusting and slimy wiggles into your ear!" + to_chat(M, "Something disgusting and slimy wiggles into your ear!") + */ // Let's see how stealthborers work out perform_infestation(M) return else - src << "They are no longer in range!" + to_chat(src, "They are no longer in range!") + return /mob/living/simple_animal/borer/proc/perform_infestation(var/mob/living/carbon/M) @@ -658,16 +721,19 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 - src << "\green You are now hiding." + to_chat(src, "\green You are now hiding.") + else layer = MOB_LAYER - src << "\green You have stopped hiding." + to_chat(src, "\green You have stopped hiding.") + /mob/living/simple_animal/borer/say(var/message) var/datum/language/dialect = parse_language(message) if(!dialect) dialect = get_default_language() if(!istype(dialect, /datum/language/corticalborer) && loc == host && !talk_inside_host) - src << "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications." + to_chat(src, "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.") + return ..() diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index 86de7b48585..bf1b7af68cf 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -22,7 +22,8 @@ if(be_swarmer == "No") return if(qdeleted(src)) - user << "Swarmer has been occupied by someone else." + to_chat(user, "Swarmer has been occupied by someone else.") + return var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc)) S.key = user.key @@ -71,12 +72,18 @@ /mob/living/simple_animal/hostile/swarmer/Login() ..() - src << "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate." - src << "Ctrl + Click provides most of your swarmer specific interactions, such as cannibalizing metal or glass, destroying the environment, or teleporting mobs away from you." - src << "Objectives:" - src << "1. Consume resources and replicate until there are no more resources left." - src << "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable." - src << "3. Biological and Sentient resources will be harvested at a later date, do not harm them." + to_chat(src, "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.") + + to_chat(src, "Ctrl + Click provides most of your swarmer specific interactions, such as cannibalizing metal or glass, destroying the environment, or teleporting mobs away from you.") + + to_chat(src, "Objectives:") + + to_chat(src, "1. Consume resources and replicate until there are no more resources left.") + + to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.") + + to_chat(src, "3. Biological and Sentient resources will be harvested at a later date, do not harm them.") + /mob/living/simple_animal/hostile/swarmer/New() ..() @@ -157,25 +164,32 @@ toggle_cam(S, 0) /obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/fuel_chamber/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/particle_emitter/center/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/particle_emitter/left/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/particle_emitter/right/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/particle_emitter/end_cap/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/structure/particle_accelerator/particle_emitter/power_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) @@ -191,95 +205,119 @@ S.DisIntegrate(src) /obj/machinery/chem_dispenser/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "The volatile chemicals in this machine would destroy us. Aborting." + to_chat(S, "The volatile chemicals in this machine would destroy us. Aborting.") + /obj/machinery/nuclearbomb/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This device's destruction would result in the extermination of everything in the area. Aborting." + to_chat(S, "This device's destruction would result in the extermination of everything in the area. Aborting.") + /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Searching... sensor malfunction! Target lost. Aborting." + to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") + /obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Destroying this object would cause a chain reaction. Aborting." + to_chat(S, "Destroying this object would cause a chain reaction. Aborting.") + /obj/structure/cable/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/machinery/portable_atmospherics/canister/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "An inhospitable area may be created as a result of destroying this object. Aborting." + to_chat(S, "An inhospitable area may be created as a result of destroying this object. Aborting.") + /obj/machinery/telecomms/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") + /obj/machinery/message_server/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This communications relay should be preserved, it will be a useful resource to our masters in the future. Aborting.") + /obj/machinery/blackbox_recorder/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This machine has recorded large amounts of data on this structure and its inhabitants, it will be a useful resource to our masters in the future. Aborting. " + to_chat(S, "This machine has recorded large amounts of data on this structure and its inhabitants, it will be a useful resource to our masters in the future. Aborting. ") + /obj/machinery/power/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Disrupting the power grid would bring no benefit to us. Aborting." + to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") + /obj/machinery/gateway/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This bluespace source will be important to us later. Aborting." + to_chat(S, "This bluespace source will be important to us later. Aborting.") + /obj/machinery/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryogenic sleeper should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This cryogenic sleeper should be preserved, it will be a useful resource to our masters in the future. Aborting.") + /obj/structure/cryofeed/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryogenic feed should be preserved, it will be a useful resource to our masters in the future. Aborting." + to_chat(S, "This cryogenic feed should be preserved, it will be a useful resource to our masters in the future. Aborting.") + /obj/machinery/computer/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting." + to_chat(S, "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting.") + /turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) - S << "Destroying this object has the potential to cause a hull breach. Aborting." + to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") + return ..() /obj/structure/window/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) - S << "Destroying this object has the potential to cause a hull breach. Aborting." + to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") + return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource - S << "This object does not contain enough materials to work with." + to_chat(S, "This object does not contain enough materials to work with.") + /obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This object does not contain enough materials to work with." + to_chat(S, "This object does not contain enough materials to work with.") + /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Attempting to dismantle this machine would result in an immediate counterattack. Aborting." + to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") + /obj/spacepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "Destroying this vehicle would destroy us. Aborting." + to_chat(S, "Destroying this vehicle would destroy us. Aborting.") + /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src) /mob/living/carbon/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) - S << "This biological resource is somehow resisting our bluespace transceiver. Aborting." + to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.") + ////END CTRL CLICK FOR SWARMERS//// /mob/living/simple_animal/hostile/swarmer/proc/Fabricate(var/atom/fabrication_object,var/fabrication_cost = 0) if(!isturf(loc)) - src << "This is not a suitable location for fabrication. We need more space." + to_chat(src, "This is not a suitable location for fabrication. We need more space.") + if(resources >= fabrication_cost) resources -= fabrication_cost else - src << "You do not have the necessary resources to fabricate this object." + to_chat(src, "You do not have the necessary resources to fabricate this object.") + return 0 new fabrication_object(loc) return 1 /mob/living/simple_animal/hostile/swarmer/proc/Integrate(var/obj/item/target) if(resources >= 100) - src << "We cannot hold more materials!" + to_chat(src, "We cannot hold more materials!") + return //Check if any entries are either MAT_METAL or MAT_GLASS if((MAT_METAL in target.materials) || (MAT_GLASS in target.materials)) @@ -296,7 +334,8 @@ return qdel(target) else - src << "\the [target] is incompatible with our internal matter recycler." + to_chat(src, "\the [target] is incompatible with our internal matter recycler.") + return /mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(var/atom/movable/target) @@ -307,9 +346,11 @@ /mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(var/mob/living/target) if(target != src) - src << "Attempting to remove this being from our presence." + to_chat(src, "Attempting to remove this being from our presence.") + if(src.z != ZLEVEL_STATION) - src << "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area." + to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.") + return if(do_mob(src, target, 30)) var/cycle @@ -333,15 +374,18 @@ /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(var/obj/machinery/target) do_attack_animation(target) - src << "We begin to dismantle this machine. We will need to be uninterrupted." + to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.") + var/obj/effect/swarmer/dismantle/D = new /obj/effect/swarmer/dismantle(get_turf(target)) D.pixel_x = target.pixel_x D.pixel_y = target.pixel_y if(do_mob(src, target, 100)) if(!src.Adjacent(target)) - src << "Error:Dismantleing aborted." + to_chat(src, "Error:Dismantleing aborted.") + else - src << "Dismantling complete." + to_chat(src, "Dismantling complete.") + var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) M.amount = 5 if(target.component_parts && target.component_parts.len) @@ -440,7 +484,8 @@ set category = "Swarmer" set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources" if(/obj/effect/swarmer/destructible/trap in loc) - src << "There is already a trap here. Aborting." + to_chat(src, "There is already a trap here. Aborting.") + return Fabricate(/obj/effect/swarmer/destructible/trap, 5) return @@ -468,10 +513,12 @@ set category = "Swarmer" set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through." if(/obj/effect/swarmer/destructible/blockade in loc) - src << "There is already a blockade here. Aborting." + to_chat(src, "There is already a blockade here. Aborting.") + return if(resources < 5) - src << "We do not have the resources for this!" + to_chat(src, "We do not have the resources for this!") + return if(do_mob(src, src, 10)) Fabricate(/obj/effect/swarmer/destructible/blockade, 5) @@ -496,12 +543,15 @@ set name = "Replicate" set category = "Swarmer" set desc = "Creates a shell for a new swarmer. Swarmers will self activate." - src << "We are attempting to replicate ourselves. We will need to stand still until the process is complete." + to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.") + if(resources < 50) - src << "We do not have the resources for this!" + to_chat(src, "We do not have the resources for this!") + return if(!isturf(loc)) - src << "This is not a suitable location for replicating ourselves. We need more room." + to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.") + return if(do_mob(src, src, 100)) if(Fabricate(/obj/item/unactivated_swarmer, 50)) @@ -513,10 +563,12 @@ set desc = "Attempts to repair damage to our body. You will have to remain motionless until repairs are complete." if(!isturf(loc)) return - src << "Attempting to repair damage to our body, stand by..." + to_chat(src, "Attempting to repair damage to our body, stand by...") + if(do_mob(src, src, 100)) adjustBruteLoss(-100) - src << "We successfully repaired ourselves." + to_chat(src, "We successfully repaired ourselves.") + /mob/living/simple_animal/hostile/swarmer/proc/ToggleLight() if(!light_range) @@ -529,7 +581,8 @@ if(message) for(var/mob/M in mob_list) if(isswarmer(M) || (M in dead_mob_list)) - M << "Swarm communication - [src] states: [message]" + to_chat(M, "Swarm communication - [src] states: [message]") + diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index 750afa1e623..3c62fc71d14 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -42,7 +42,8 @@ ..() if(summoner) if(summoner.stat == DEAD) - src << "Your summoner has died!" + to_chat(src, "Your summoner has died!") + visible_message("The [src] dies along with its user!") ghostize() qdel(src) @@ -50,11 +51,13 @@ if (get_dist(get_turf(summoner),get_turf(src)) <= range) return else - src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]" + 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.") Recall() if(summoned && !summoner && !adminseal) - src << "You somehow lack a summoner! As a result, you dispel!" + to_chat(src, "You somehow lack a summoner! As a result, you dispel!") + ghostize() qdel() @@ -64,13 +67,15 @@ if (get_dist(get_turf(summoner),get_turf(src)) <= range) return else - src << "You moved out of range, and were pulled back! You can only move [range] meters from [summoner.real_name]" + 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.") Recall() /mob/living/simple_animal/hostile/guardian/death() ..() - summoner << "Your [name] died somehow!" + to_chat(summoner, "Your [name] died somehow!") + summoner.death() @@ -91,10 +96,12 @@ return summoner.adjustBruteLoss(damage) if(damage) - summoner << "Your [name] is under attack! You take damage!" + to_chat(summoner, "Your [name] is under attack! You take damage!") + summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") if(summoner.stat == UNCONSCIOUS) - summoner << "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!" + to_chat(summoner, "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!") + summoner.adjustCloneLoss(damage/2) /mob/living/simple_animal/hostile/guardian/ex_act(severity, target) @@ -110,7 +117,8 @@ /mob/living/simple_animal/hostile/guardian/gib() if(summoner) - summoner << "Your [src] was blown up!" + to_chat(summoner, "Your [src] was blown up!") + summoner.Weaken(10)// your fermillier has died! ROLL FOR CON LOSS! ghostize() qdel(src) @@ -142,14 +150,18 @@ for(var/mob/M in mob_list) if(M == summoner) - M << "[src]: [input]" + to_chat(M, "[src]: [input]") + log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]") else if (M in dead_mob_list) - M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src]: [input]" + to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + + to_chat(src, "[src]: [input]") + /mob/living/simple_animal/hostile/guardian/proc/ToggleMode() - src << "You dont have another mode!" + to_chat(src, "You dont have another mode!") + /mob/living/proc/guardian_comm() @@ -163,12 +175,15 @@ if(istype (M, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = M if(G.summoner == src) - G << "[src]: [input]" + to_chat(G, "[src]: [input]") + log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]") else if (M in dead_mob_list) - M << "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]" - src << "[src]: [input]" + to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") + + to_chat(src, "[src]: [input]") + /mob/living/proc/guardian_recall() set name = "Recall Guardian" @@ -190,13 +205,16 @@ var/mob/dead/observer/new_stand = null if(candidates.len) new_stand = pick(candidates) - G << "Your user reset you, and your body was taken over by a ghost. Looks like they weren't happy with your performance." - src << "Your guardian has been successfully reset." + 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(src, "Your guardian has been successfully reset.") + message_admins("[key_name_admin(new_stand)] has taken control of ([key_name_admin(G)])") G.ghostize(0) G.key = new_stand.key else - src << "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now." + to_chat(src, "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now.") + spawn(3000) verbs += /mob/living/proc/guardian_reset @@ -204,10 +222,12 @@ /mob/living/simple_animal/hostile/guardian/proc/ToggleLight() if(!luminosity) set_light(3) - src << "You activate your light." + to_chat(src, "You activate your light.") + else set_light(0) - src << "You deactivate your light." + to_chat(src, "You deactivate your light.") + //////////////////////////TYPES OF GUARDIANS @@ -239,10 +259,12 @@ /mob/living/simple_animal/hostile/guardian/fire/ToggleMode() if(src.loc == summoner) if(toggle) - src << "You switch to dispersion mode, and will teleport victims away from your master." + to_chat(src, "You switch to dispersion mode, and will teleport victims away from your master.") + toggle = FALSE else - src << "You switch to deception mode, and will turn your victims against their allies." + to_chat(src, "You switch to deception mode, and will turn your victims against their allies.") + toggle = TRUE /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() @@ -381,7 +403,8 @@ ..() if(toggle == TRUE) if(src.loc == summoner) - src << "You must be manifested to heal!" + to_chat(src, "You must be manifested to heal!") + return if(iscarbon(target)) src.changeNext_move(CLICK_CD_MELEE) @@ -403,7 +426,8 @@ damage_transfer = 0 melee_damage_lower = 15 melee_damage_upper = 15 - src << "You switch to combat mode." + to_chat(src, "You switch to combat mode.") + toggle = FALSE else a_intent = I_HELP @@ -413,10 +437,12 @@ damage_transfer = 0 melee_damage_lower = 0 melee_damage_upper = 0 - src << "You switch to healing mode." + to_chat(src, "You switch to healing mode.") + toggle = TRUE else - src << "You have to be recalled to toggle modes!" + to_chat(src, "You have to be recalled to toggle modes!") + /mob/living/simple_animal/hostile/guardian/healer/verb/Beacon() @@ -431,31 +457,38 @@ F.name = "bluespace recieving pad" F.desc = "A recieving zone for bluespace teleportations. Building a wall over it should disable it." F.icon_state = "light_on-w" - src << "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. " + to_chat(src, "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. ") + if(beacon) beacon.ChangeTurf(/turf/simulated/floor/plating) beacon = F beacon_cooldown = world.time+3000 else - src << "Your power is on cooldown. You must wait five minutes between placing beacons." + to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.") + /mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A) if(!istype(A)) return if(src.loc == summoner) - src << "You must be manifested to warp a target!" + to_chat(src, "You must be manifested to warp a target!") + return if(!beacon) - src << "You need a beacon placed to warp things!" + to_chat(src, "You need a beacon placed to warp things!") + return if(!Adjacent(A)) - src << "You must be adjacent to your target!" + to_chat(src, "You must be adjacent to your target!") + return if((A.anchored)) - src << "Your target can not be anchored!" + to_chat(src, "Your target can not be anchored!") + return - src << "You begin to warp [A]" + to_chat(src, "You begin to warp [A]") + if(do_mob(src, A, 50)) if(!A.anchored) if(src.beacon) //Check that the beacon still exists and is in a safe place. No instant kills. @@ -469,13 +502,17 @@ do_teleport(A, beacon, 0) new /obj/effect/overlay/temp/guardian/phase(get_turf(A)) else - src << "The beacon isn't in a safe location!" + to_chat(src, "The beacon isn't in a safe location!") + else - src << "The beacon isn't in a safe location!" + to_chat(src, "The beacon isn't in a safe location!") + else - src << "You need a beacon to warp things!" + to_chat(src, "You need a beacon to warp things!") + else - src << "You need to hold still!" + to_chat(src, "You need to hold still!") + ///////////////////Ranged @@ -517,7 +554,8 @@ alpha = 255 range = 13 incorporeal_move = 0 - src << "You switch to combat mode." + to_chat(src, "You switch to combat mode.") + toggle = FALSE else ranged = 0 @@ -526,17 +564,21 @@ alpha = 60 range = 255 incorporeal_move = 1 - src << "You switch to scout mode." + to_chat(src, "You switch to scout mode.") + toggle = TRUE else - src << "You have to be recalled to toggle modes!" + to_chat(src, "You have to be recalled to toggle modes!") + /mob/living/simple_animal/hostile/guardian/ranged/ToggleLight() if(see_invisible == SEE_INVISIBLE_MINIMUM) - src << "You deactivate your night vision." + to_chat(src, "You deactivate your night vision.") + see_invisible = SEE_INVISIBLE_LIVING else - src << "You activate your night vision." + to_chat(src, "You activate your night vision.") + see_invisible = SEE_INVISIBLE_MINIMUM /mob/living/simple_animal/hostile/guardian/ranged/verb/Snare() @@ -549,9 +591,11 @@ S.spawner = src S.name = "[get_area(snare_loc)] trap ([rand(1, 1000)])" src.snares |= S - src << "Surveillance trap deployed!" + to_chat(src, "Surveillance trap deployed!") + else - src << "You have too many traps deployed. Delete some first." + to_chat(src, "You have too many traps deployed. Delete some first.") + /mob/living/simple_animal/hostile/guardian/ranged/verb/DisarmSnare() set name = "Remove Surveillance Trap" @@ -561,7 +605,8 @@ if(picked_snare) src.snares -= picked_snare qdel(picked_snare) - src << "Snare disarmed." + to_chat(src, "Snare disarmed.") + /obj/item/effect/snare name = "snare" @@ -574,11 +619,13 @@ if(istype(AM, /mob/living/)) var/turf/snare_loc = get_turf(src.loc) if(spawner) - spawner << "[AM] has crossed your surveillance trap at [get_area(snare_loc)]." + to_chat(spawner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") + if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(G.summoner) - G.summoner << "[AM] has crossed your surveillance trap at [get_area(snare_loc)]." + to_chat(G.summoner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") + ////Bomb @@ -597,19 +644,23 @@ if(!istype(A)) return if(src.loc == summoner) - src << "You must be manifested to create bombs!" + to_chat(src, "You must be manifested to create bombs!") + return if(istype(A, /obj/)) if(bomb_cooldown <= world.time && !stat) var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A)) - src << "Success! Bomb on \the [A] armed!" + to_chat(src, "Success! Bomb on \the [A] armed!") + if(summoner) - summoner << "Your guardian has primed \the [A] to explode!" + to_chat(summoner, "Your guardian has primed \the [A] to explode!") + bomb_cooldown = world.time + 200 B.spawner = src B.disguise (A) else - src << "Your powers are on cooldown! You must wait 20 seconds between bombs." + to_chat(src, "Your powers are on cooldown! You must wait 20 seconds between bombs.") + /obj/item/weapon/guardian_bomb name = "bomb" @@ -627,19 +678,23 @@ spawn(600) if(src) stored_obj.loc = get_turf(src.loc) - spawner << "Failure! Your trap on \the [stored_obj] didn't catch anyone this time." + to_chat(spawner, "Failure! Your trap on \the [stored_obj] didn't catch anyone this time.") + qdel(src) /obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user) - user << "The [src] was boobytrapped!" + to_chat(user, "The [src] was boobytrapped!") + if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(user == G.summoner) - user << "You knew this because of your link with your guardian, so you smartly defuse the bomb." + to_chat(user, "You knew this because of your link with your guardian, so you smartly defuse the bomb.") + stored_obj.loc = get_turf(src.loc) qdel(src) return - spawner << "Success! Your trap on \the [src] caught [user]!" + to_chat(spawner, "Success! Your trap on \the [src] caught [user]!") + stored_obj.loc = get_turf(src.loc) playsound(get_turf(src),'sound/effects/Explosion2.ogg', 200, 1) user.ex_act(2) @@ -656,7 +711,8 @@ /obj/item/weapon/guardian_bomb/examine(mob/user) stored_obj.examine(user) if(get_dist(user,src)<=2) - user << "Looks odd!" + to_chat(user, "Looks odd!") + ////////Creation @@ -679,16 +735,20 @@ /obj/item/weapon/guardiancreator/attack_self(mob/living/user) for(var/mob/living/simple_animal/hostile/guardian/G in living_mob_list) if (G.summoner == user) - user << "You already have a [mob_name]!" + to_chat(user, "You already have a [mob_name]!") + return if(user.mind && user.mind.changeling) - user << "[ling_failure]" + to_chat(user, "[ling_failure]") + return if(used == TRUE) - user << "[used_message]" + to_chat(user, "[used_message]") + return used = TRUE - user << "[use_message]" + to_chat(user, "[use_message]") + var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, 0, 100) var/mob/dead/observer/theghost = null @@ -696,7 +756,8 @@ theghost = pick(candidates) spawn_guardian(user, theghost.key) else - user << "[failure_message]" + to_chat(user, "[failure_message]") + used = FALSE @@ -728,10 +789,14 @@ G.summoner = user G.summoned = TRUE G.key = key - G << "You are a [mob_name] bound to serve [user.real_name]." - G << "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there." - G << "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself." - G << "[G.playstyle_string]" + to_chat(G, "You are a [mob_name] bound to serve [user.real_name].") + + to_chat(G, "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there.") + + to_chat(G, "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.") + + to_chat(G, "[G.playstyle_string]") + G.faction = user.faction user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall @@ -752,7 +817,8 @@ G.icon_state = "[theme][color]" G.icon_dead = "[theme][color]" - user << "[G.magic_fluff_string]." + to_chat(user, "[G.magic_fluff_string].") + if("tech") color = pick("Rose", "Peony", "Lily", "Daisy", "Zinnia", "Ivy", "Iris", "Petunia", "Violet", "Lilac", "Orchid") //technically not colors, just flowers that can be specific colors picked_name = pick("Gallium", "Indium", "Thallium", "Bismuth", "Aluminium", "Mercury", "Iron", "Silver", "Zinc", "Titanium", "Chromium", "Nickel", "Platinum", "Tellurium", "Palladium", "Rhodium", "Cobalt", "Osmium", "Tungsten", "Iridium") @@ -763,12 +829,14 @@ G.icon_state = "[theme][color]" G.icon_dead = "[theme][color]" - user << "[G.tech_fluff_string]." + to_chat(user, "[G.tech_fluff_string].") + G.speak_emote = list("states") if("bio") G.icon = 'icons/mob/mob.dmi' picked_name = pick("brood", "hive", "nest") - user << "[G.bio_fluff_string]." + to_chat(user, "[G.bio_fluff_string].") + G.name = "[picked_name] swarm" G.color = picked_color G.real_name = "[picked_name] swarm" diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index 9786aa1432a..eee370b1710 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -52,7 +52,8 @@ else ..() if(get_dist(user,src)<=3) - user << "It doesn't look quite right..." + to_chat(user, "It doesn't look quite right...") + else ..() return @@ -81,7 +82,8 @@ if(istype(A) && allowed(A)) assume(A) else - src << "Your chameleon skin is still repairing itself!" + to_chat(src, "Your chameleon skin is still repairing itself!") + ..() /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index c0af9c38040..190d2abb5f4 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -22,8 +22,10 @@ player_mind.assigned_role = "Morph" player_mind.special_role = "Morph" ticker.mode.traitors |= player_mind - S << S.playstyle_string - S << 'sound/magic/Mutate.ogg' + to_chat(S, S.playstyle_string) + + to_chat(S, 'sound/magic/Mutate.ogg') + message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") return 1 diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 2fa99dd58a6..be6bdd718af 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -62,11 +62,13 @@ revealed = 0 incorporeal_move = 3 invisibility = INVISIBILITY_REVENANT - src << "You are once more concealed." + to_chat(src, "You are once more concealed.") + if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = 0 - src << "You can move again!" + to_chat(src, "You can move again!") + update_spooky_icon() /mob/living/simple_animal/revenant/ex_act(severity) @@ -86,7 +88,8 @@ return essence = max(0, essence-amount) if(essence == 0) - src << "You feel your essence fraying!" + to_chat(src, "You feel your essence fraying!") + @@ -97,9 +100,11 @@ var/rendered = "[src] says, \"[message]\"" for(var/mob/M in mob_list) if(istype(M, /mob/living/simple_animal/revenant)) - M << rendered + to_chat(M, rendered) + if(isobserver(M)) - M << "(F) [rendered]" + to_chat(M, "(F) [rendered]") + return /mob/living/simple_animal/revenant/Stat() @@ -119,23 +124,28 @@ spawn(5) if(src.mind) src.mind.wipe_memory() - src << 'sound/effects/ghost.ogg' - src << "
" - src << "You are a revenant." - src << "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant." - src << "You are not dead, not alive, but somewhere in between. You are capable of limited interaction with both worlds." - src << "You are invincible and invisible to everyone but other ghosts. Most abilities will reveal you, rendering you vulnerable." - src << "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities." - src << "You do not remember anything of your past lives, nor will you remember anything about this one after your death." - src << "Be sure to read the wiki page at http://nanotrasen.se/wiki/index.php/Revenant to learn more." + to_chat(src, 'sound/effects/ghost.ogg') + + to_chat(src, "
") + to_chat(src, "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.") + to_chat(src, "To function, you are to drain the life essence from humans. This essence is a resource, as well as your health, and will power all of your abilities.") + to_chat(src, "You do not remember anything of your past lives, nor will you remember anything about this one after your death.") + to_chat(src, "Be sure to read the wiki page at http://nanotrasen.se/wiki/index.php/Revenant to learn more.") + + var/datum/objective/revenant/objective = new objective.owner = src.mind src.mind.objectives += objective - src << "Objective #1: [objective.explanation_text]" + to_chat(src, "Objective #1: [objective.explanation_text]") + var/datum/objective/revenantFluff/objective2 = new objective2.owner = src.mind src.mind.objectives += objective2 - src << "Objective #2: [objective2.explanation_text]" + to_chat(src, "Objective #2: [objective2.explanation_text]") + ticker.mode.traitors |= src.mind //Necessary for announcing if(!src.giveSpells()) message_admins("Revenant was created but has no mind. Trying again in five seconds.") @@ -168,7 +178,8 @@ ghost_darkness_images -= ghostimage updateallghostimages() - src << "NO! No... it's too late, you can feel your essence breaking apart..." + to_chat(src, "NO! No... it's too late, you can feel your essence breaking apart...") + notransform = 1 revealed = 1 invisibility = 0 @@ -204,13 +215,16 @@ return var/turf/T = get_turf(src) if(istype(T, /turf/simulated/wall)) - src << "You cannot use abilities from inside of a wall." + to_chat(src, "You cannot use abilities from inside of a wall.") + return 0 if(src.inhibited) - src << "Your powers have been suppressed by nulling energy!" + to_chat(src, "Your powers have been suppressed by nulling energy!") + return 0 if(!src.change_essence_amount(essence_cost, 1)) - src << "You lack the essence to use that ability." + to_chat(src, "You lack the essence to use that ability.") + return 0 return 1 @@ -224,9 +238,11 @@ essence_accumulated = max(0, essence_accumulated+essence_amt) if(!silent) if(essence_amt > 0) - src << "Gained [essence_amt]E from [source]." + to_chat(src, "Gained [essence_amt]E from [source].") + else - src << "Lost [essence_amt]E from [source]." + to_chat(src, "Lost [essence_amt]E from [source].") + return 1 /mob/living/simple_animal/revenant/proc/reveal(time) @@ -238,10 +254,12 @@ invisibility = 0 incorporeal_move = 0 if(!unreveal_time) - src << "You have been revealed!" + to_chat(src, "You have been revealed!") + unreveal_time = world.time + time else - src << "You have been revealed!" + to_chat(src, "You have been revealed!") + unreveal_time = unreveal_time + time update_spooky_icon() @@ -252,10 +270,12 @@ return notransform = 1 if(!unstun_time) - src << "You cannot move!" + to_chat(src, "You cannot move!") + unstun_time = world.time + time else - src << "You cannot move!" + to_chat(src, "You cannot move!") + unstun_time = unstun_time + time update_spooky_icon() @@ -350,9 +370,11 @@ /obj/item/weapon/ectoplasm/revenant/examine(mob/user) ..(user) if(inert) - user << "It seems inert." + to_chat(user, "It seems inert.") + else if(reforming) - user << "It is shifting and distorted. It would be wise to destroy this." + to_chat(user, "It is shifting and distorted. It would be wise to destroy this.") + /obj/item/weapon/ectoplasm/revenant/proc/reform() if(inert || !src) diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index e061bcc4d77..e3d32319892 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -29,47 +29,63 @@ if(!castcheck(0)) return if(draining) - src << "You are already siphoning the essence of a soul!" + to_chat(src, "You are already siphoning the essence of a soul!") + return if(target in drained_mobs) - src << "[target]'s soul is dead and empty." + to_chat(src, "[target]'s soul is dead and empty.") + return if(!target.stat) - src << "This being's soul is too strong to harvest." + to_chat(src, "This being's soul is too strong to harvest.") + if(prob(10)) - target << "You feel as if you are being watched." + to_chat(target, "You feel as if you are being watched.") + return draining = 1 essence_drained = rand(15, 20) - src << "You search for the soul of [target]." + to_chat(src, "You search for the soul of [target].") + if(do_after(src, 10, 0, target = target)) //did they get deleted in that second? if(target.ckey) - src << "Their soul burns with intelligence." + to_chat(src, "Their soul burns with intelligence.") + essence_drained += rand(20, 30) if(target.stat != DEAD) - src << "Their soul blazes with life!" + to_chat(src, "Their soul blazes with life!") + essence_drained += rand(40, 50) else - src << "Their soul is weak and faltering." + to_chat(src, "Their soul is weak and faltering.") + if(do_after(src, 20, 0, target = target)) //did they get deleted NOW? switch(essence_drained) if(1 to 30) - src << "[target] will not yield much essence. Still, every bit counts." + to_chat(src, "[target] will not yield much essence. Still, every bit counts.") + if(30 to 70) - src << "[target] will yield an average amount of essence." + to_chat(src, "[target] will yield an average amount of essence.") + if(70 to 90) - src << "Such a feast! [target] will yield much essence to you." + to_chat(src, "Such a feast! [target] will yield much essence to you.") + if(90 to INFINITY) - src << "Ah, the perfect soul. [target] will yield massive amounts of essence to you." + to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.") + if(do_after(src, 20, 0, target = target)) //how about now if(!target.stat) - src << "They are now powerful enough to fight off your draining." - target << "You feel something tugging across your body before subsiding." + to_chat(src, "They are now powerful enough to fight off your draining.") + + to_chat(target, "You feel something tugging across your body before subsiding.") + draining = 0 return //hey, wait a minute... - src << "You begin siphoning essence from [target]'s soul." + to_chat(src, "You begin siphoning essence from [target]'s soul.") + if(target.stat != DEAD) - target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..." + to_chat(target, "You feel a horribly unpleasant draining sensation as your grip on life weakens...") + icon_state = "revenant_draining" reveal(27) stun(27) @@ -80,14 +96,17 @@ if(essence_drained > 90) essence_regen_cap += 25 perfectsouls += 1 - src << "The perfection of [target]'s soul has increased your maximum essence level. Your new maximum essence is [essence_regen_cap]." - src << "[target]'s soul has been considerably weakened and will yield no more essence for the time being." + 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--") drained_mobs.Add(target) target.death(0) else - src << "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken." + to_chat(src, "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken.") + draining = 0 essence_drained = 0 if(target) //Wait, target is WHERE NOW? @@ -95,7 +114,8 @@ "Violets lights, dancing in your vision, receding--") return else - src << "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken." + to_chat(src, "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken.") + draining = 0 essence_drained = 0 return @@ -132,8 +152,10 @@ charge_counter = charge_max return log_say("RevenantTransmit: [key_name(user)]->[key_name(M)] : [msg]") - usr << "You transmit to [M]: [msg]" - M << "An alien voice resonates from all around... [msg]" + to_chat(usr, "You transmit to [M]: [msg]") + + to_chat(M, "An alien voice resonates from all around... [msg]") + /obj/effect/proc_holder/spell/aoe_turf/revenant @@ -172,7 +194,8 @@ charge_counter = charge_max return 0 name = "[initial(name)] ([cast_amount]E)" - user << "You have unlocked [initial(name)]!" + to_chat(user, "You have unlocked [initial(name)]!") + panel = "Revenant Abilities" locked = 0 charge_counter = charge_max @@ -248,7 +271,8 @@ T.flags -= NOJAUNT new/obj/effect/overlay/temp/revenant(T) for(var/mob/living/carbon/human/human in T.contents) - human << "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")]." + to_chat(human, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].") + human.adjustStaminaLoss(stamdamage) human.adjustToxLoss(toxdamage) human.confused += confusion @@ -298,7 +322,8 @@ bot.open = 1 bot.emag_act(null) for(var/mob/living/carbon/human/human in T.contents) - human << "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")]." + to_chat(human, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") + new/obj/effect/overlay/temp/revenant(human.loc) human.emp_act(1) for(var/obj/thing in T.contents) diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm index a3a37a7d625..7ac75cf1e71 100644 --- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm +++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm @@ -7,7 +7,8 @@ if(iscarbon(src)) var/mob/living/carbon/C = src if(C.l_hand || C.r_hand) - C << "You may not hold items while blood crawling!" + to_chat(C, "You may not hold items while blood crawling!") + return 0 var/obj/item/weapon/bloodcrawl/B1 = new(C) var/obj/item/weapon/bloodcrawl/B2 = new(C) @@ -54,7 +55,8 @@ holder = holder if(kidnapped) - src << "You begin to feast on [kidnapped]. You can not move while you are doing this." + to_chat(src, "You begin to feast on [kidnapped]. You can not move while you are doing this.") + visible_message("Loud eating sounds come from the blood...") sleep(6) if(animation) @@ -63,7 +65,8 @@ playsound(get_turf(src),'sound/misc/Demon_consume.ogg', 100, 1) sleep(30) if(kidnapped) - src << "You devour [kidnapped]. Your health is fully restored." + to_chat(src, "You devour [kidnapped]. Your health is fully restored.") + adjustBruteLoss(-1000) adjustFireLoss(-1000) adjustOxyLoss(-1000) @@ -73,7 +76,8 @@ var/mob/living/simple_animal/slaughter/demon = src demon.devoured++ - kidnapped << "You feel teeth sink into your flesh, and the--" + to_chat(kidnapped, "You feel teeth sink into your flesh, and the--") + kidnapped.adjustBruteLoss(1000) kidnapped.forceMove(src) demon.consumed_mobs.Add(kidnapped) @@ -81,7 +85,8 @@ kidnapped.ghostize() qdel(kidnapped) else - src << "You happily devour... nothing? Your meal vanished at some point!" + to_chat(src, "You happily devour... nothing? Your meal vanished at some point!") + else sleep(6) if (animation) @@ -98,7 +103,8 @@ /mob/living/proc/phasein(var/obj/effect/decal/cleanable/B) if(notransform) - src << "Finish eating first!" + to_chat(src, "Finish eating first!") + return 0 B.visible_message("[B] starts to bubble...") if(!do_after(src, 20, target = B)) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 3d4a8b9061e..145f71b2066 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -55,9 +55,12 @@ if(istype(loc, /obj/effect/dummy/slaughter)) bloodspell.phased = 1 if(mind) - src << src.playstyle_string - src << "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest." - src << 'sound/misc/demon_dies.ogg' + to_chat(src, src.playstyle_string) + + to_chat(src, "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest.") + + to_chat(src, 'sound/misc/demon_dies.ogg') + mind.current.verbs += /mob/living/simple_animal/slaughter/proc/slaughterWhisper if(!(vialspawned)) var/datum/objective/slaughter/objective = new @@ -68,8 +71,10 @@ //Paradise Port:I added the objective for one spawned like this mind.objectives += objective mind.objectives += fluffObjective - src << "Objective #[1]: [objective.explanation_text]" - src << "Objective #[2]: [fluffObjective.explanation_text]" + to_chat(src, "Objective #[1]: [objective.explanation_text]") + + to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]") + /mob/living/simple_animal/slaughter/Life() @@ -125,8 +130,10 @@ if(!(msg)) return log_say("Slaughter Demon Transmit: [key_name(usr)]->[key_name(M)]: [msg]") - usr << "You whisper to [M]: [msg]" - M << "Suddenly a strange, demonic voice resonates in your head... [msg]" + to_chat(usr, "You whisper to [M]: [msg]") + + to_chat(M, "Suddenly a strange, demonic voice resonates in your head... [msg]") + for(var/mob/dead/observer/G in player_list) G.show_message("Demonic message from [usr] ([ghost_follow_link(usr, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]") @@ -161,10 +168,12 @@ "You feel a strange power seep into your body... you have absorbed the demon's blood-travelling powers!") user.bloodcrawl = BLOODCRAWL else if(user.bloodcrawl == BLOODCRAWL) - user << "You feel diffr- CONSUME THEM! " + to_chat(user, "You feel diffr- CONSUME THEM! ") + user.bloodcrawl = BLOODCRAWL_EAT else - user <<"...and you don't feel any different." + to_chat(user, "...and you don't feel any different.") + user.drop_item() insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E diff --git a/code/game/gamemodes/mutiny/emergency_authentication_device.dm b/code/game/gamemodes/mutiny/emergency_authentication_device.dm index 2a48ac8c3b7..d2e0e2849df 100644 --- a/code/game/gamemodes/mutiny/emergency_authentication_device.dm +++ b/code/game/gamemodes/mutiny/emergency_authentication_device.dm @@ -45,7 +45,8 @@ /obj/machinery/emergency_authentication_device/attack_hand(mob/user) if(activated) - user << "\blue \The [src] is already active!" + to_chat(user, "\blue \The [src] is already active!") + return if(!mode.current_directive.directives_complete()) @@ -55,7 +56,8 @@ check_key_existence() if(captains_key && secondary_key) activated = 1 - user << "\blue You activate \the [src]!" + to_chat(user, "\blue You activate \the [src]!") + state("Command acknowledged. Initiating quantum entanglement relay to Nanotrasen High Command.") launch_shuttle() return @@ -77,7 +79,8 @@ /obj/machinery/emergency_authentication_device/attackby(obj/item/weapon/O, mob/user, params) if(activated) - user << "\blue \The [src] is already active!" + to_chat(user, "\blue \The [src] is already active!") + return if(!mode.current_directive.directives_complete()) @@ -107,5 +110,6 @@ ..() /obj/machinery/emergency_authentication_device/examine(mob/user) - user << {"This is a specialized communications device that is able to instantly send a message to Nanotrasen High Command via quantum entanglement with a sister device at CentComm.
- The EAD's status is [get_status()]."} + to_chat(user, {"This is a specialized communications device that is able to instantly send a message to Nanotrasen High Command via quantum entanglement + with a sister device at CentComm.
+ The EAD's status is [get_status()]."}) diff --git a/code/game/gamemodes/mutiny/key_pinpointer.dm b/code/game/gamemodes/mutiny/key_pinpointer.dm index 4d4596ab229..6b47fc71ae7 100644 --- a/code/game/gamemodes/mutiny/key_pinpointer.dm +++ b/code/game/gamemodes/mutiny/key_pinpointer.dm @@ -14,22 +14,28 @@ active = 1 target = mutiny.captains_key point_at(target) - usr << "\blue You calibrate \the [src] to locate the Captain's Authentication Key." + to_chat(usr, "\blue You calibrate \the [src] to locate the Captain's Authentication Key.") + if (1) mode = 2 target = mutiny.secondary_key - usr << "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key." + to_chat(usr, "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key.") + else mode = 0 active = 0 icon_state = "pinoff" - usr << "\blue You switch \the [src] off." + to_chat(usr, "\blue You switch \the [src] off.") + /obj/item/weapon/pinpointer/advpinpointer/auth_key/examine(mob/user) switch(mode) if (1) - user << "Is is calibrated for the Captain's Authentication Key." + to_chat(user, "Is is calibrated for the Captain's Authentication Key.") + if (2) - user << "It is calibrated for the Emergency Secondary Authentication Key." + to_chat(user, "It is calibrated for the Emergency Secondary Authentication Key.") + else - user << "It is switched off." + to_chat(user, "It is switched off.") + diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index e3edc521f33..4dd0ea1d459 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -91,7 +91,8 @@ datum/game_mode/mutiny var/list/candidates[0] for(var/T in subtypesof(/datum/directive)) var/datum/directive/D = new T(src) -// world << D.name +// to_chat(world, D.name) + if (D.meets_prerequisites()) candidates+=D return candidates @@ -126,7 +127,8 @@ datum/game_mode/mutiny proc/equip_head(datum/mind/head, faction, proc/recruitment_verb) var/mob/living/carbon/human/H = head.current - H << "You are the Head [capitalize(faction)]!" + to_chat(H, "You are the Head [capitalize(faction)]!") + head.special_role = "head_[faction]" var/slots = get_equipment_slots() @@ -151,8 +153,10 @@ datum/game_mode/mutiny proc/add_faction(datum/mind/M, faction, list/faction_list) if(!can_be_recruited(M, faction)) - M.current << "\red Recruitment canceled; your role has already changed." - head_mutineer.current << "\red Could not recruit [M]. Their role has changed." + to_chat(M.current, "\red Recruitment canceled; your role has already changed.") + + to_chat(head_mutineer.current, "\red Could not recruit [M]. Their role has changed.") + return if(M in loyalists) @@ -165,11 +169,15 @@ datum/game_mode/mutiny faction_list+=M if(faction == "mutineer") - M.current << fluff.mutineer_tag("You have joined the mutineers!") - head_mutineer.current << fluff.mutineer_tag("[M] has joined the mutineers!") + to_chat(M.current, fluff.mutineer_tag("You have joined the mutineers!")) + + to_chat(head_mutineer.current, fluff.mutineer_tag("[M] has joined the mutineers!")) + else - M.current << fluff.loyalist_tag("You have joined the loyalists!") - head_loyalist.current << fluff.loyalist_tag("[M] has joined the loyalists!") + to_chat(M.current, fluff.loyalist_tag("You have joined the loyalists!")) + + to_chat(head_loyalist.current, fluff.loyalist_tag("[M] has joined the loyalists!")) + update_icon(M) @@ -211,23 +219,30 @@ datum/game_mode/mutiny return M.special_role == "loyalist" proc/round_outcome() - world << "

Breaking News


" + to_chat(world, "

Breaking News


") + if (was_bloodbath()) - world << fluff.no_victory() + to_chat(world, fluff.no_victory()) + return var/directives_completed = current_directive.directives_complete() var/ead_activated = ead.activated if (directives_completed && ead_activated) - world << fluff.loyalist_major_victory() - else if (directives_completed && !ead_activated) - world << fluff.loyalist_minor_victory() - else if (!directives_completed && ead_activated) - world << fluff.mutineer_minor_victory() - else if (!directives_completed && !ead_activated) - world << fluff.mutineer_major_victory() + to_chat(world, fluff.loyalist_major_victory()) + + else if (directives_completed && !ead_activated) + to_chat(world, fluff.loyalist_minor_victory()) + + else if (!directives_completed && ead_activated) + to_chat(world, fluff.mutineer_minor_victory()) + + else if (!directives_completed && !ead_activated) + to_chat(world, fluff.mutineer_major_victory()) + + + to_chat(world, sound('sound/machines/twobeep.ogg')) - world << sound('sound/machines/twobeep.ogg') proc/update_all_icons() spawn(0) @@ -266,17 +281,20 @@ datum/game_mode/mutiny /datum/game_mode/mutiny/pre_setup() var/list/loyalist_candidates = get_head_loyalist_candidates() if(!loyalist_candidates || loyalist_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for head loyalist." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for head loyalist.") + return 0 var/list/mutineer_candidates = get_head_mutineer_candidates() if(!mutineer_candidates || mutineer_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for head mutineer." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for head mutineer.") + return 0 var/list/directive_candidates = get_directive_candidates() if(!directive_candidates || directive_candidates.len == 0) - world << "\red Mutiny mode aborted: no valid candidates for Directive X." + to_chat(world, "\red Mutiny mode aborted: no valid candidates for Directive X.") + return 0 head_loyalist = pick(loyalist_candidates) @@ -316,11 +334,13 @@ datum/game_mode/mutiny candidates += P if(!candidates.len) - src << "\red You aren't close enough to anybody that can be recruited." + to_chat(src, "\red You aren't close enough to anybody that can be recruited.") + return if(world.time < mode.recruit_loyalist_cooldown) - src << "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again." + to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") + return mode.recruit_loyalist_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -328,7 +348,8 @@ datum/game_mode/mutiny var/mob/living/carbon/human/M = input("Select a person to recruit", "Loyalist recruitment", null) as mob in candidates if (M) - src << "Attempting to recruit [M]..." + to_chat(src, "Attempting to recruit [M]...") + log_admin("[key_name(src)] attempted to recruit [M] as a loyalist.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a loyalist.") @@ -336,8 +357,10 @@ datum/game_mode/mutiny if(choice == "Yes") mode.add_loyalist(M.mind) else if(choice == "No") - M << "\red You declined to join the loyalists." - mode.head_loyalist.current << "\red [M] declined to support the loyalists." + to_chat(M, "\red You declined to join the loyalists.") + + to_chat(mode.head_loyalist.current, "\red [M] declined to support the loyalists.") + /mob/living/carbon/human/proc/recruit_mutineer() set name = "Recruit Mutineer" @@ -353,11 +376,13 @@ datum/game_mode/mutiny candidates += P if(!candidates.len) - src << "\red You aren't close enough to anybody that can be recruited." + to_chat(src, "\red You aren't close enough to anybody that can be recruited.") + return if(world.time < mode.recruit_mutineer_cooldown) - src << "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again." + to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") + return mode.recruit_mutineer_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -365,7 +390,8 @@ datum/game_mode/mutiny var/mob/living/carbon/human/M = input("Select a person to recruit", "Mutineer recruitment", null) as mob in candidates if (M) - src << "Attempting to recruit [M]..." + to_chat(src, "Attempting to recruit [M]...") + log_admin("[key_name(src)] attempted to recruit [M] as a mutineer.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a mutineer.") @@ -373,8 +399,10 @@ datum/game_mode/mutiny if(choice == "Yes") mode.add_mutineer(M.mind) else if(choice == "No") - M << "\red You declined to join the mutineers." - mode.head_mutineer.current << "\red [M] declined to support the mutineers." + to_chat(M, "\red You declined to join the mutineers.") + + to_chat(mode.head_mutineer.current, "\red [M] declined to support the mutineers.") + /proc/get_mutiny_mode() if(!ticker || !istype(ticker.mode, /datum/game_mode/mutiny)) diff --git a/code/game/gamemodes/mutiny/mutiny_fluff.dm b/code/game/gamemodes/mutiny/mutiny_fluff.dm index f25e9978e33..66ee7cf2673 100644 --- a/code/game/gamemodes/mutiny/mutiny_fluff.dm +++ b/code/game/gamemodes/mutiny/mutiny_fluff.dm @@ -72,8 +72,9 @@ They don't care about us they only care about WEALTH and POWER... Share this mes Be safe, friend.\" (Unable to Reply)

"} proc/announce() - world << "The current game mode is - Mutiny!" - world << {" + to_chat(world, "The current game mode is - Mutiny!") + + to_chat(world, {"

The crew will be divided by their sense of ethics when a morally turbulent emergency directive arrives with an incomplete command validation code.

The [loyalist_tag("Head Loyalist")] is the Captain, who carries the [loyalist_tag("Captain's Authentication Key")] at all times.
The [mutineer_tag("Head Mutineer")] is a random Head of Staff who carries the [mutineer_tag("Emergency Secondary Authentication Key")].

@@ -82,8 +83,7 @@ Both keys are required to activate the Emergency Authentication Device (EAD)<

Loyalists - Follow the Head Loyalist in carrying out [loyalist_tag("Nanotrasen's directives")] then activate the EAD.
Mutineers - Prevent the completion of the [mutineer_tag("improperly validated directives")] and the activation of the EAD. -

- "} +

"}) proc/loyalist_tag(text) return "[text]" diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index 85e38cb8ed9..c9adb948a7c 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -18,7 +18,8 @@ datum/game_mode/nations // remove_access() for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) - M << sound('sound/effects/purge_siren.ogg') + to_chat(M, sound('sound/effects/purge_siren.ogg')) + return ..() @@ -42,9 +43,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in medical_positions) @@ -53,9 +56,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in science_positions) @@ -64,9 +69,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in security_positions) @@ -75,9 +82,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in cargonians) @@ -86,9 +95,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in servicion) @@ -97,9 +108,11 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in (support_positions + command_positions)) @@ -108,13 +121,16 @@ datum/game_mode/nations H.mind.nation.membership += H.mind.current if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current - H << "You have been chosen to lead the nation of [H.mind.nation.default_name]!" + to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") + continue - H << "You are now part of the great sovereign nation of [H.mind.nation.default_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") + continue if(H.mind.assigned_role in civilian_positions) - H << "You do not belong to any nation and are free to sell your services to the highest bidder." + to_chat(H, "You do not belong to any nation and are free to sell your services to the highest bidder.") + continue else @@ -153,7 +169,8 @@ datum/game_mode/nations N.current_name = N.default_name if(!N.current_leader && N.membership.len) N.current_leader = pick(N.membership) - N.current_leader << "You have been chosen to lead the nation of [N.current_name]!" + to_chat(N.current_leader, "You have been chosen to lead the nation of [N.current_name]!") + if(N.current_leader) var/mob/living/carbon/human/H = N.current_leader H.verbs += /mob/living/carbon/human/proc/set_nation_name @@ -177,53 +194,61 @@ datum/game_mode/nations H.mind.nation = all_nations["Atmosia"] mode.update_nations_icons_added(H,"atmosia") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in medical_positions) H.mind.nation = all_nations["Medistan"] mode.update_nations_icons_added(H,"hudmedistan") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in science_positions) H.mind.nation = all_nations["Scientopia"] mode.update_nations_icons_added(H,"hudscientopia") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in security_positions) H.mind.nation = all_nations["Brigston"] mode.update_nations_icons_added(H,"hudbrigston") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in mode.cargonians) H.mind.nation = all_nations["Cargonia"] mode.update_nations_icons_added(H,"hudcargonia") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in mode.servicion) H.mind.nation = all_nations["Servicion"] mode.update_nations_icons_added(H,"hudservice") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in (support_positions + command_positions)) H.mind.nation = all_nations["People's Republic of Commandzakstan"] mode.update_nations_icons_added(H,"hudcommand") H.mind.nation.membership += H.mind.current - H << "You are now part of the great sovereign nation of [H.mind.nation.current_name]!" + to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") + return 1 if(H.mind.assigned_role in civilian_positions) - H << "You do not belong to any nation and are free to sell your services to the highest bidder." + to_chat(H, "You do not belong to any nation and are free to sell your services to the highest bidder.") + return 1 if(H.mind.assigned_role == "AI") diff --git a/code/game/gamemodes/nations/nationsprocs.dm b/code/game/gamemodes/nations/nationsprocs.dm index 66cd66cab3b..59ade854fd6 100644 --- a/code/game/gamemodes/nations/nationsprocs.dm +++ b/code/game/gamemodes/nations/nationsprocs.dm @@ -16,7 +16,8 @@ if(input) H.mind.nation.current_name = input H.mind.nation.update_nation_id() - H << "You rename your nation to [input]." + to_chat(H, "You rename your nation to [input].") + H.verbs -= /mob/living/carbon/human/proc/set_nation_name return 1 @@ -44,7 +45,8 @@ if(type == "Member") H.mind.nation.member_rank = input H.mind.nation.update_nation_id() - H << "You changed the [type] rank of your nation to [input]." + to_chat(H, "You changed the [type] rank of your nation to [input].") + return 1 /mob/living/carbon/human/proc/choose_heir() @@ -64,13 +66,16 @@ if(heir) if(H.mind.nation.heir) var/mob/living/carbon/human/oldheir = H.mind.nation.heir - oldheir << "You are no longer the heir to your nation!" + to_chat(oldheir, "You are no longer the heir to your nation!") + oldheir.verbs -= /mob/living/carbon/human/proc/takeover var/mob/living/carbon/human/newheir = heir H.mind.nation.heir = newheir newheir.verbs += /mob/living/carbon/human/proc/takeover - newheir << "You have been selected to be the heir to your nation's leadership!" - H << "You have selected [heir] to be your heir!" + to_chat(newheir, "You have been selected to be the heir to your nation's leadership!") + + to_chat(H, "You have selected [heir] to be your heir!") + H.mind.nation.update_nation_id() @@ -90,7 +95,8 @@ var/confirmation = input(H, "Are you sure you want to take over leadership?", "Become Leader", "") as null|anything in list("Yes", "No") if(confirmation == "Yes") var/mob/living/carbon/human/oldleader = H.mind.nation.current_leader - oldleader << "You have been replaced by [H.name] as the leader of [H.mind.nation.current_name]!" + to_chat(oldleader, "You have been replaced by [H.name] as the leader of [H.mind.nation.current_name]!") + oldleader.verbs -= /mob/living/carbon/human/proc/set_nation_name oldleader.verbs -= /mob/living/carbon/human/proc/set_ranks oldleader.verbs -= /mob/living/carbon/human/proc/choose_heir @@ -100,7 +106,8 @@ H.verbs += /mob/living/carbon/human/proc/set_nation_name H.verbs += /mob/living/carbon/human/proc/set_ranks H.verbs += /mob/living/carbon/human/proc/choose_heir - H << "You have replaced [oldleader.name] as the leader of [H.mind.nation.current_name]!" + to_chat(H, "You have replaced [oldleader.name] as the leader of [H.mind.nation.current_name]!") + H.mind.nation.update_nation_id() diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 9b823509edd..5171ec08c51 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -176,7 +176,8 @@ if(!killobjectives.len) continue var/datum/objective/assassinate/objective = pickweight(killobjectives) - world << objective + to_chat(world, objective) + for(1 to 10) if(objective.points + total_weight <= 100 || !killobjectives.len) break diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index dff34374cb0..0704b9c9a17 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -23,9 +23,12 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/nuclear/announce() - world << "The current game mode is - Nuclear Emergency!" - world << "A [syndicate_name()] Strike Force is approaching [station_name()]!" - world << "A nuclear explosive was being transported by Nanotrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by Nanotrasen as a nuclear authentication disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! There are most likely Syndicate starships are in the vicinity, so take care not to lose the disk!\nSyndicate: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\nPersonnel: Hold the disk and escape with the disk on the shuttle!" + to_chat(world, "The current game mode is - Nuclear Emergency!") + + to_chat(world, "A [syndicate_name()] Strike Force is approaching [station_name()]!") + + to_chat(world, "A nuclear explosive was being transported by Nanotrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by Nanotrasen as a nuclear authentication disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! There are most likely Syndicate starships are in the vicinity, so take care not to lose the disk!\nSyndicate: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\nPersonnel: Hold the disk and escape with the disk on the shuttle!") + /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later if(!..()) @@ -171,9 +174,12 @@ proc/issyndicate(mob/living/M as mob) NukeNameAssign(nukelastname(synd_mind.current),syndicates) //allows time for the rest of the syndies to be chosen */ synd_mind.current.real_name = "[syndicate_name()] Team [leader_title]" - synd_mind.current << "You are the Syndicate leader for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors." - synd_mind.current << "If you feel you are not up to this task, give your ID to another operative." - synd_mind.current << "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it." + to_chat(synd_mind.current, "You are the Syndicate leader for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") + + to_chat(synd_mind.current, "If you feel you are not up to this task, give your ID to another operative.") + + to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") + var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge synd_mind.current.equip_to_slot_or_del(challenge, slot_r_hand) @@ -190,7 +196,8 @@ proc/issyndicate(mob/living/M as mob) if (nuke_code) synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) - synd_mind.current << "The nuclear authorization code is: [nuke_code]" + to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") + var/obj/item/weapon/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" @@ -219,10 +226,12 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) if (you_are) - syndicate.current << "\blue You are a [syndicate_name()] agent!" + to_chat(syndicate.current, "\blue You are a [syndicate_name()] agent!") + var/obj_count = 1 for(var/datum/objective/objective in syndicate.objectives) - syndicate.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(syndicate.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -315,48 +324,66 @@ proc/issyndicate(mob/living/M as mob) if (!disk_rescued && station_was_nuked && !syndies_didnt_escape) feedback_set_details("round_end_result","win - syndicate nuke") - world << "Syndicate Major Victory!" - world << "[syndicate_name()] operatives have destroyed [station_name()]!" + to_chat(world, "Syndicate Major Victory!") + + to_chat(world, "[syndicate_name()] operatives have destroyed [station_name()]!") + else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") - world << "Total Annihilation" - world << "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!" + to_chat(world, "Total Annihilation") + + to_chat(world, "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!") + else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station") - world << "Crew Minor Victory" - world << "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!" + to_chat(world, "Crew Minor Victory") + + to_chat(world, "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!") + else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") - world << "[syndicate_name()] operatives have earned Darwin Award!" - world << "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!" + to_chat(world, "[syndicate_name()] operatives have earned Darwin Award!") + + to_chat(world, "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!") + else if ( disk_rescued && is_operatives_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") - world << "Crew Major Victory!" - world << "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives" + to_chat(world, "Crew Major Victory!") + + to_chat(world, "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives") + else if ( disk_rescued ) feedback_set_details("round_end_result","loss - evacuation - disk secured") - world << "Crew Major Victory" - world << "The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!" + to_chat(world, "Crew Major Victory") + + to_chat(world, "The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!") + else if (!disk_rescued && is_operatives_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk not secured") - world << "Syndicate Minor Victory!" - world << "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!" + to_chat(world, "Syndicate Minor Victory!") + + to_chat(world, "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!") + else if (!disk_rescued && crew_evacuated) feedback_set_details("round_end_result","halfwin - detonation averted") - world << "Syndicate Minor Victory!" - world << "[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!" + to_chat(world, "Syndicate Minor Victory!") + + to_chat(world, "[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!") + else if (!disk_rescued && !crew_evacuated) feedback_set_details("round_end_result","halfwin - interrupted") - world << "Neutral Victory" - world << "Round was mysteriously interrupted!" + to_chat(world, "Neutral Victory") + + to_chat(world, "Round was mysteriously interrupted!") + ..() return @@ -394,7 +421,8 @@ proc/issyndicate(mob/living/M as mob) if(TC_uses==0 && station_was_nuked && !is_operatives_are_dead()) text += "" - world << text + to_chat(world, text) + return 1 /proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. @@ -406,7 +434,8 @@ proc/issyndicate(mob/living/M as mob) else if (newname == "Unknown" || newname == "floor" || newname == "wall" || newname == "rwall" || newname == "_") - M << "That name is reserved." + to_chat(M, "That name is reserved.") + return nukelastname(M) return newname diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index 621f159eced..d8e252d97c8 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -17,26 +17,31 @@ if(declaring_war) return if(player_list.len < MIN_CHALLENGE_PLAYERS) - user << "The enemy crew is too small to be worth declaring war on." + to_chat(user, "The enemy crew is too small to be worth declaring war on.") + return if(user.z != ZLEVEL_CENTCOMM) - user << "You have to be at your base to use this." + to_chat(user, "You have to be at your base to use this.") + return if(world.time > CHALLENGE_TIME_LIMIT) - user << "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand." + to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") + return declaring_war = 1 var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew?", "Declare war?", "Yes", "No") if(are_you_sure == "No") - user << "On second thought, the element of surprise isn't so bad after all." + to_chat(user, "On second thought, the element of surprise isn't so bad after all.") + declaring_war = 0 return var/war_declaration = "[user.real_name] has declared his intent to utterly destroy [station_name()] with a nuclear device, and dares the crew to try and stop them." command_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg') - user << "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission." + to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") + for(var/obj/machinery/computer/shuttle/syndicate/S in machines) S.challenge = TRUE diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 88ca765ad15..b580622504f 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -55,20 +55,24 @@ var/bomb_set if (panel_open == 0) panel_open = 1 overlays += image(icon, "npanel_open") - user << "You unscrew the control panel of [src]." + to_chat(user, "You unscrew the control panel of [src].") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) else panel_open = 0 overlays -= image(icon, "npanel_open") - user << "You screw the control panel of [src] back on." + to_chat(user, "You screw the control panel of [src] back on.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) else if (panel_open == 0) - user << "[src] emits a buzzing noise, the panel staying locked in." + to_chat(user, "[src] emits a buzzing noise, the panel staying locked in.") + if (panel_open == 1) panel_open = 0 overlays -= image(icon, "npanel_open") - user << "You screw the control panel of [src] back on." + to_chat(user, "You screw the control panel of [src] back on.") + playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) flick("nuclearbombc", src) return @@ -91,7 +95,8 @@ var/bomb_set var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + to_chat(user, "\red You need more fuel to complete this task.") + return user.visible_message("[user] starts cutting loose the anchoring bolt covers on [src].", "You start cutting loose the anchoring bolt covers with [O]...") @@ -118,7 +123,8 @@ var/bomb_set var/obj/item/weapon/weldingtool/WT = O if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. - user << "\red You need more fuel to complete this task." + to_chat(user, "\red You need more fuel to complete this task.") + return user.visible_message("[user] starts cutting apart the anchoring system sealant on [src].", "You start cutting apart the anchoring system's sealant with [O]...") @@ -217,10 +223,12 @@ var/bomb_set return if (deployable) - usr << "\red You close several panels to make [src] undeployable." + to_chat(usr, "\red You close several panels to make [src] undeployable.") + deployable = 0 else - usr << "\red You adjust some panels to make [src] deployable." + to_chat(usr, "\red You adjust some panels to make [src] deployable.") + deployable = 1 return @@ -279,7 +287,8 @@ var/bomb_set nanomanager.update_uis(src) return if (safety) - usr << "\red The safety is still on." + to_chat(usr, "\red The safety is still on.") + nanomanager.update_uis(src) return timing = !(timing) @@ -320,7 +329,8 @@ var/bomb_set else visible_message("\red The anchoring bolts slide back into the depths of [src].") else - usr << "There is nothing to anchor to!" + to_chat(usr, "There is nothing to anchor to!") + nanomanager.update_uis(src) @@ -371,11 +381,14 @@ var/bomb_set if(ticker.mode.name == "nuclear emergency") ticker.mode:nukes_left -- else if(off_station == 1) - world << "A nuclear device was set off, but the explosion was out of reach of the station!" + to_chat(world, "A nuclear device was set off, but the explosion was out of reach of the station!") + else if(off_station == 2) - world << "A nuclear device was set off, but the device was not on the station!" + to_chat(world, "A nuclear device was set off, but the device was not on the station!") + else - world << "The station was destoyed by the nuclear blast!" + to_chat(world, "The station was destoyed by the nuclear blast!") + ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. @@ -402,7 +415,8 @@ var/bomb_set /obj/item/weapon/disk/nuclear/process() var/turf/disk_loc = get_turf(src) if(disk_loc.z != ZLEVEL_STATION && disk_loc.z != ZLEVEL_CENTCOMM) - get(src, /mob) << "You can't help but feel that you just lost something back there..." + to_chat(get(src, /mob), "You can't help but feel that you just lost something back there...") + qdel(src) /obj/item/weapon/disk/nuclear/Destroy() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 2ad022adf55..170c0aac8e9 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -21,11 +21,13 @@ if(!active) active = 1 workdisk() - usr << "You activate the pinpointer." + to_chat(usr, "You activate the pinpointer.") + else active = 0 icon_state = "pinoff" - usr << "You deactivate the pinpointer." + to_chat(usr, "You deactivate the pinpointer.") + /obj/item/weapon/pinpointer/proc/scandisk() if(!the_disk) @@ -68,7 +70,8 @@ ..(user) for(var/obj/machinery/nuclearbomb/bomb in machines) if(bomb.timing) - user << "Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]" + to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]") + /obj/item/weapon/pinpointer/advpinpointer name = "advanced pinpointer" @@ -86,11 +89,13 @@ point_at(location) if(mode == 2) point_at(target) - usr << "You activate the pinpointer." + to_chat(usr, "You activate the pinpointer.") + else active = 0 icon_state = "pinoff" - usr << "You deactivate the pinpointer." + to_chat(usr, "You deactivate the pinpointer.") + /obj/item/weapon/pinpointer/advpinpointer/workdisk() if(mode == 0) @@ -127,7 +132,8 @@ location = locate(locationx,locationy,Z.z) - usr << "You set the pinpointer to locate [locationx],[locationy]" + to_chat(usr, "You set the pinpointer to locate [locationx],[locationy]") + return attack_self() @@ -152,9 +158,11 @@ return target = locate(item_paths[targetitem]) if(!target) - usr << "Failed to locate [targetitem]!" + to_chat(usr, "Failed to locate [targetitem]!") + return - usr << "You set the pinpointer to locate [targetitem]." + to_chat(usr, "You set the pinpointer to locate [targetitem].") + if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) @@ -181,14 +189,17 @@ active = 1 if(!mode) workdisk() - user << "Authentication Disk Locator active." + to_chat(user, "Authentication Disk Locator active.") + else worklocation() - user << "Shuttle Locator active." + to_chat(user, "Shuttle Locator active.") + else active = 0 icon_state = "pinoff" - user << "You deactivate the pinpointer." + to_chat(user, "You deactivate the pinpointer.") + /obj/item/weapon/pinpointer/nukeop/workdisk() if(!active) return @@ -259,16 +270,19 @@ /obj/item/weapon/pinpointer/operative/attack_self() if(!usr.mind || !(usr.mind in ticker.mode.syndicates)) - usr << "AUTHENTICATION FAILURE. ACCESS DENIED." + to_chat(usr, "AUTHENTICATION FAILURE. ACCESS DENIED.") + return 0 if(!active) active = 1 workop() - usr << "You activate the pinpointer." + to_chat(usr, "You activate the pinpointer.") + else active = 0 icon_state = "pinoff" - usr << "You deactivate the pinpointer." + to_chat(usr, "You deactivate the pinpointer.") + /obj/item/weapon/pinpointer/operative/proc/scan_for_ops() if(active) @@ -292,6 +306,8 @@ ..() if(active) if(nearest_op) - user << "Nearest operative detected is [nearest_op.real_name]." + to_chat(user, "Nearest operative detected is [nearest_op.real_name].") + else - user << "No operatives detected within scanning range." + to_chat(user, "No operatives detected within scanning range.") + diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 8dd5bb0691d..41edd787514 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -33,8 +33,10 @@ //Announces the game type// /////////////////////////// /datum/game_mode/revolution/announce() - world << "The current game mode is - Revolution!" - world << "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head)." + to_chat(world, "The current game mode is - Revolution!") + + to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).") + /////////////////////////////////////////////////////////////////////////////// @@ -126,7 +128,8 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role]." + to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") + for(var/datum/mind/rev_mind in mode.revolutionaries) for(var/datum/mind/head_mind in heads) @@ -135,7 +138,8 @@ rev_obj.target = head_mind rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role]." + to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") + /datum/game_mode/proc/forge_revolutionary_objectives(var/datum/mind/rev_mind) @@ -153,9 +157,11 @@ /datum/game_mode/proc/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") + for(var/datum/objective/objective in rev_mind.objectives) - rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") + rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -168,7 +174,8 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") - mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") + mob.mutations.Remove(CLUMSY) @@ -183,9 +190,11 @@ ) var/where = mob.equip_in_one_of_slots(T, slots) if (!where) - mob << "The Syndicate were unfortunately unable to get you a flash." + to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.") + else - mob << "The flash in your [where] will help you to persuade the crew to join your cause." + to_chat(mob, "The flash in your [where] will help you to persuade the crew to join your cause.") + mob.update_icons() return 1 @@ -222,7 +231,8 @@ if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) return 0 revolutionaries += rev_mind - rev_mind.current << "\red 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(rev_mind.current, "\red 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!") + rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) @@ -237,18 +247,22 @@ rev_mind.special_role = null if(beingborged) - rev_mind.current << "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now." + to_chat(rev_mind.current, "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now.") + message_admins("[key_name_admin(rev_mind.current)] has been borged while being a member of the revolution.") else - rev_mind.current << "\red You have been brainwashed! You are no longer a 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(rev_mind.current, "\red You have been brainwashed! You are no longer a 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...") + update_rev_icons_removed(rev_mind) for(var/mob/living/M in view(rev_mind.current)) if(beingborged) - M << "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it." + to_chat(M, "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.") + else - M << "[rev_mind.current] looks like they just remembered their real allegiance!" + to_chat(M, "[rev_mind.current] looks like they just remembered their real allegiance!") + ///////////////////////////////////// @@ -294,10 +308,12 @@ /datum/game_mode/revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads killed") - world << "\red The heads of staff were killed or abandoned the station! The revolutionaries win!" + to_chat(world, "\red The heads of staff were killed or abandoned the station! The revolutionaries win!") + else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") - world << "\red The heads of staff managed to stop the revolution!" + to_chat(world, "\red The heads of staff managed to stop the revolution!") + ..() return 1 @@ -325,7 +341,8 @@ for(var/datum/objective/mutiny/objective in headrev.objectives) targets |= objective.target - world << text + to_chat(world, text) + if(revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution)) var/text = "The revolutionaries were:" @@ -345,7 +362,8 @@ text += "body destroyed" text += ")" - world << text + to_chat(world, text) + if( head_revolutionaries.len || revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution) ) @@ -374,7 +392,8 @@ if(target) text += "" - world << text + to_chat(world, text) + /proc/is_convertable_to_rev(datum/mind/mind) return istype(mind) && \ diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index ef2ec130047..cea8e9d9d2d 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -75,9 +75,11 @@ /datum/game_mode/revolution/rp_revolution/greet_revolutionary(var/datum/mind/rev_mind, var/you_are=1) var/obj_count = 1 if (you_are) - rev_mind.current << "\blue You are a member of the revolutionaries' leadership!" + to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") + for(var/datum/objective/objective in rev_mind.objectives) - rev_mind.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") + rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -89,7 +91,8 @@ // Tell them about people they might want to contact. var/mob/living/carbon/human/M = get_nt_opposed() if(M && !(M.mind in head_revolutionaries) && !(M in already_considered)) - rev_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them." + to_chat(rev_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") + rev_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /////////////////////////////////////////////////// @@ -103,7 +106,8 @@ if((rev_mind in revolutionaries) || (rev_mind in head_revolutionaries)) return 0 revolutionaries += rev_mind - rev_mind.current << "\red 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, capture or convert the heads to win the revolution!" + to_chat(rev_mind.current, "\red 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, capture or convert the heads to win the revolution!") + rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) return 1 @@ -127,8 +131,10 @@ //Announces the game type// /////////////////////////// /datum/game_mode/revolution/rp_revolution/announce() - world << "The current game mode is - Revolution!" - world << "Some crewmembers are attempting to start a revolution!" + to_chat(world, "The current game mode is - Revolution!") + + to_chat(world, "Some crewmembers are attempting to start a revolution!") + ////////////////////////////////////////////////////////////////////// @@ -137,10 +143,12 @@ /datum/game_mode/revolution/rp_revolution/declare_completion() if(finished == 1) feedback_set_details("round_end_result","win - heads overthrown") - world << "\red The heads of staff were overthrown! The revolutionaries win!" + to_chat(world, "\red The heads of staff were overthrown! The revolutionaries win!") + else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") - world << "\red The heads of staff managed to stop the revolution!" + to_chat(world, "\red The heads of staff managed to stop the revolution!") + ..() return 1 @@ -159,29 +167,38 @@ if(!stat && P.client && P.mind && !P.mind.special_role) Possible += P if(!Possible.len) - src << "\red There doesn't appear to be anyone available for you to convert here." + to_chat(src, "\red There doesn't appear to be anyone available for you to convert here.") + return var/mob/living/carbon/human/M = input("Select a person to convert", "Viva la revolution!", null) as mob in Possible if(((src.mind in ticker.mode:head_revolutionaries) || (src.mind in ticker.mode:revolutionaries))) if((M.mind in ticker.mode:head_revolutionaries) || (M.mind in ticker.mode:revolutionaries)) - src << "\red [M] is already be a revolutionary!" + to_chat(src, "\red [M] is already be a revolutionary!") + else if(!ticker.mode:is_convertible(M)) - src << "\red [M] is implanted with a loyalty implant - Remove it first!" + to_chat(src, "\red [M] is implanted with a loyalty implant - Remove it first!") + else if(world.time < M.mind.rev_cooldown) - src << "\red Wait five seconds before reconversion attempt." + to_chat(src, "\red Wait five seconds before reconversion attempt.") + return - src << "\red Attempting to convert [M]..." + to_chat(src, "\red Attempting to convert [M]...") + log_admin("[src]([src.ckey]) attempted to convert [M].") message_admins("\red [src]([src.ckey]) attempted to convert [M].") var/choice = alert(M,"Asked by [src]: Do you want to join the revolution?","Align Thyself with the Revolution!","No!","Yes!") if(choice == "Yes!") ticker.mode:add_revolutionary(M.mind) - M << "\blue You join the revolution!" - src << "\blue [M] joins the revolution!" + to_chat(M, "\blue You join the revolution!") + + to_chat(src, "\blue [M] joins the revolution!") + else if(choice == "No!") - M << "\red You reject this traitorous cause!" - src << "\red [M] does not support the revolution!" + to_chat(M, "\red You reject this traitorous cause!") + + to_chat(src, "\red [M] does not support the revolution!") + M.mind.rev_cooldown = world.time+50 /datum/game_mode/revolution/rp_revolution/process() @@ -208,7 +225,8 @@ update_rev_icons_added(H.mind) H.verbs += /mob/living/carbon/human/proc/RevConvert - H << "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion." + to_chat(H, "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion.") + added_heads = 1 break @@ -241,7 +259,8 @@ comm.messagetitle.Add("Cent. Com. Announcement") comm.messagetext.Add(message) - world << sound('sound/AI/commandreport.ogg') + to_chat(world, sound('sound/AI/commandreport.ogg')) + /datum/game_mode/revolution/rp_revolution/latespawn(mob/M) if(M.mind.assigned_role in command_positions) @@ -254,4 +273,5 @@ rev_obj.target = M.mind rev_obj.explanation_text = "Assassinate, convert or capture [M.real_name], the [M.mind.assigned_role]." rev_mind.objectives += rev_obj - rev_mind.current << "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated." + to_chat(rev_mind.current, "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated.") + diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 510fccd9e9c..b21e7101a82 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -52,11 +52,13 @@ datum/hSB if("hsbtobj") if(!admin) return if(hsboxspawn) - world << "Sandbox: [usr.key] has disabled object spawning!" + to_chat(world, "Sandbox: [usr.key] has disabled object spawning!") + hsboxspawn = 0 return if(!hsboxspawn) - world << "Sandbox: [usr.key] has enabled object spawning!" + to_chat(world, "Sandbox: [usr.key] has enabled object spawning!") + hsboxspawn = 1 return if("hsbsuit") @@ -105,7 +107,8 @@ datum/hSB hsb.req_access += A hsb.loc = usr.loc - usr << "Sandbox: Created an airlock." + to_chat(usr, "Sandbox: Created an airlock.") + if("hsbcanister") var/list/hsbcanisters = subtypesof(/obj/machinery/portable_atmospherics/canister/) var/hsbcanister = input(usr, "Choose a canister to spawn.", "Sandbox:") in hsbcanisters + "Cancel" diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 5f13763e5f2..8f02b2df6a7 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -7,8 +7,10 @@ uplink_uses = 10 /datum/game_mode/sandbox/announce() - world << "The current game mode is - Sandbox!" - world << "Build your own station with the sandbox-panel command!" + to_chat(world, "The current game mode is - Sandbox!") + + to_chat(world, "Build your own station with the sandbox-panel command!") + /datum/game_mode/sandbox/pre_setup() for(var/mob/M in player_list) diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 87c24e90371..19f7f4905cc 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -148,8 +148,10 @@ score_crewscore -= plaguepoints // Show the score - might add "ranks" later - world << "The crew's final score is:" - world << "[score_crewscore]" + to_chat(world, "The crew's final score is:") + + to_chat(world, "[score_crewscore]") + for(var/mob/E in player_list) if(E.client) if(E.client.prefs && !(E.client.prefs.toggles & DISABLE_SCOREBOARD)) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 4a11d2415f7..46fbc47a5df 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -76,8 +76,10 @@ Made by Xhuis protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Security Pod Pilot", "Magistrate", "Brig Physician", "Internal Affairs Agent") /datum/game_mode/shadowling/announce() - world << "The current game mode is - Shadowling!" - world << "There are alien shadowlings on the station. Crew: Kill the shadowlings before they can eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding." + 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 eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding.") + /datum/game_mode/shadowling/pre_setup() if(config.protect_roles_from_antagonist) @@ -105,8 +107,10 @@ Made by Xhuis for(var/datum/mind/shadow in shadows) log_game("[shadow.key] (ckey) has been selected as a Shadowling.") sleep(10) - shadow.current << "
" - shadow.current << "You are a shadowling!" + to_chat(shadow.current, "
") + + to_chat(shadow.current, "You are a shadowling!") + greet_shadow(shadow) finalize_shadowling(shadow) process_shadow_objectives(shadow) @@ -114,10 +118,12 @@ Made by Xhuis ..() /datum/game_mode/proc/greet_shadow(var/datum/mind/shadow) - shadow.current << "Currently, you are disguised as an employee aboard [world.name]." - shadow.current << "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8)." - shadow.current << "Any other shadowlings are your allies. You must assist them as they shall assist you." - shadow.current << "If you are new to shadowling, or want to read about abilities, check the wiki page at http://nanotrasen.se/wiki/index.php/Shadowling
" + to_chat(shadow.current, "Currently, you are disguised as an employee aboard [world.name].") + to_chat(shadow.current, "In your limited state, you have two abilities: Hatch and Shadowling Hivemind (:8).") + to_chat(shadow.current, "Any other shadowlings are your allies. You must assist them as they shall assist you.") + to_chat(shadow.current, "If you are new to shadowling, or want to read about abilities, check the wiki page at http://nanotrasen.se/wiki/index.php/Shadowling
") + + /datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) @@ -127,7 +133,8 @@ Made by Xhuis objective_explanation = "Ascend to your true form by use of the Ascendance ability. This may only be used with [required_thralls] collective thralls, while hatched, and is unlocked with the Collective Mind ability." shadow_objectives += "enthrall" shadow_mind.memory += "Objective #1: [objective_explanation]" - shadow_mind.current << "Objective #1: [objective_explanation]
" + to_chat(shadow_mind.current, "Objective #1: [objective_explanation]
") + /datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) @@ -137,7 +144,8 @@ Made by Xhuis shadow_mind.current.add_language("Shadowling Hivemind") update_shadow_icons_added(shadow_mind) if(shadow_mind.assigned_role == "Clown") - S << "Your alien nature has allowed you to overcome your clownishness." + to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") + S.mutations.Remove(CLUMSY) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) @@ -152,12 +160,18 @@ Made by Xhuis new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_glare) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall) - new_thrall_mind.current << "You see the truth. Reality has been torn away and you realize what a fool you've been." - new_thrall_mind.current << "The shadowlings are your masters. Serve them above all else and ensure they complete their goals." - new_thrall_mind.current << "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls." - new_thrall_mind.current << "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask." - new_thrall_mind.current << "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab." - new_thrall_mind.current << "You may communicate with your allies by speaking in the Shadowling Hivemind (:8)." + to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") + + to_chat(new_thrall_mind.current, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") + + to_chat(new_thrall_mind.current, "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.") + + to_chat(new_thrall_mind.current, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.") + + to_chat(new_thrall_mind.current, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.") + + to_chat(new_thrall_mind.current, "You may communicate with your allies by speaking in the Shadowling Hivemind (:8).") + if(jobban_isbanned(new_thrall_mind.current, ROLE_SHADOWLING)) replace_jobbaned_player(new_thrall_mind.current, ROLE_SHADOWLING) @@ -240,13 +254,17 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() if(check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X - world << "The shadowlings have ascended and taken over the station!" + to_chat(world, "The shadowlings have ascended and taken over the station!") + else if(shadowling_dead && !check_shadow_victory()) //If the shadowlings have ascended, they can not lose the round - world << "The shadowlings have been killed by the crew!" + to_chat(world, "The shadowlings have been killed by the crew!") + else if(!check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) - world << "The crew escaped the station before the shadowlings could ascend!" + to_chat(world, "The crew escaped the station before the shadowlings could ascend!") + else - world << "The shadowlings have failed!" + to_chat(world, "The shadowlings have failed!") + ..() return 1 @@ -283,7 +301,8 @@ Made by Xhuis text += "body destroyed" text += ")" text += "
" - world << text + to_chat(world, text) + /* @@ -318,8 +337,11 @@ Made by Xhuis if(light_amount > LIGHT_DAM_THRESHOLD && !H.incorporeal_move) //Can survive in very small light levels. Also doesn't take damage while incorporeal, for shadow walk purposes H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) if(H.stat != DEAD) - H << "The light burns you!" //Message spam to say "GET THE FUCK OUT" - H << 'sound/weapons/sear.ogg' + to_chat(H, "The light burns you!")//Message spam to say "GET THE FUCK OUT" + + + to_chat(H, 'sound/weapons/sear.ogg') + else if(light_amount < LIGHT_HEAL_THRESHOLD) H.heal_overall_damage(5, 5) H.adjustToxLoss(-5) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 64710ac14de..6fa19dc30a2 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -4,9 +4,15 @@ if(!H || !istype(H)) return if(H.get_species() == "Shadowling" && is_shadow(H)) return 1 if(H.get_species() == "Lesser Shadowling" && is_thrall(H)) return 1 - if(!is_shadow_or_thrall(usr)) usr << "You can't wrap your head around how to do this." - else if(is_thrall(usr)) usr << "You aren't powerful enough to do this." - else if(is_shadow(usr)) usr << "Your telepathic ability is suppressed. Hatch or use Rapid Re-Hatch first." + 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.") + return 0 @@ -21,27 +27,32 @@ /obj/effect/proc_holder/spell/targeted/glare/cast(list/targets) for(var/mob/living/carbon/human/target in targets) if(!ishuman(target)) - usr << "You may only glare at humans!" + to_chat(usr, "You may only glare at humans!") + charge_counter = charge_max return if(!shadowling_check(usr)) charge_counter = charge_max return if(target.stat) - usr << "[target] must be conscious!" + to_chat(usr, "[target] must be conscious!") + charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You don't see why you would want to paralyze an ally." + to_chat(usr, "You don't see why you would want to paralyze an ally.") + charge_counter = charge_max return var/mob/living/carbon/human/M = target usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by their heavenly beauty..." + to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by their heavenly beauty...") + else //Only alludes to the shadowling if the target is close by - target << "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights..." + to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights...") + target.Stun(10) M.silent += 10 @@ -57,24 +68,29 @@ /obj/effect/proc_holder/spell/targeted/lesser_glare/cast(list/targets) for(var/mob/living/carbon/human/target in targets) if(!ishuman(target) || !target) - usr << "You nay only glare at humans!" + to_chat(usr, "You nay only glare at humans!") + charge_counter = charge_max return if(target.stat) - usr << "[target] must be conscious!" + to_chat(usr, "[target] must be conscious!") + charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You cannot glare at allies!" + to_chat(usr, "You cannot glare at allies!") + charge_counter = charge_max return var/mob/living/carbon/human/M = target usr.visible_message("[usr]'s eyes flash a blinding red!") target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) - target << "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights..." + to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights...") + else - target << "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty..." + to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...") + target.Stun(3) //Roughly 30% as long as the normal one M.silent += 3 @@ -139,7 +155,8 @@ if(!shadowling_check(usr)) charge_counter = charge_max return - usr << "You silently disable all nearby lights." + to_chat(usr, "You silently disable all nearby lights.") + for(var/obj/effect/glowshroom/G in orange(2, usr)) //Why the fuck was this in the loop below? G.visible_message("\The [G] withers away!") qdel(G) @@ -233,10 +250,12 @@ return var/mob/living/carbon/human/H = user if(!H.vision_type) - H << "You shift the nerves in your eyes, allowing you to see in the dark." + to_chat(H, "You shift the nerves in your eyes, allowing you to see in the dark.") + H.vision_type = new vision_path else - H << "You return your vision to normal." + to_chat(H, "You return your vision to normal.") + H.vision_type = null /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall @@ -257,7 +276,8 @@ if(!shadowling_check(usr)) charge_counter = charge_max return - usr << "You freeze the nearby air." + to_chat(usr, "You freeze the nearby air.") + playsound(usr.loc, 'sound/effects/ghost2.ogg', 50, 1) for(var/turf/T in targets) @@ -266,9 +286,11 @@ if(M == usr) //No message for the user, of course continue else - M << "You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!" + to_chat(M, "You feel a blast of paralyzingly cold air wrap around you and flow past, but you are unaffected!") + continue - M << "A wave of shockingly cold air engulfs you!" + to_chat(M, "A wave of shockingly cold air engulfs you!") + M.Stun(2) M.apply_damage(10, BURN) if(M.bodytemperature) @@ -298,69 +320,90 @@ return for(var/mob/living/carbon/human/target in targets) if(!in_range(usr, target)) - usr << "You need to be closer to enthrall [target]." + to_chat(usr, "You need to be closer to enthrall [target].") + charge_counter = charge_max return if(!target.key || !target.mind) - usr << "The target has no mind." + to_chat(usr, "The target has no mind.") + charge_counter = charge_max return if(target.stat) - usr << "The target must be conscious." + to_chat(usr, "The target must be conscious.") + charge_counter = charge_max return if(is_shadow_or_thrall(target)) - usr << "You can not enthrall allies." + to_chat(usr, "You can not enthrall allies.") + charge_counter = charge_max return if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") + charge_counter = charge_max return if(enthralling) - usr << "You are already enthralling!" + to_chat(usr, "You are already enthralling!") + charge_counter = charge_max return if(!target.client) - usr << "[target]'s mind is vacant of activity." + to_chat(usr, "[target]'s mind is vacant of activity.") + enthralling = 1 - usr << "This target is valid. You begin the enthralling." - target << "[usr] stares at you. You feel your head begin to pulse." + to_chat(usr, "This target is valid. You begin the enthralling.") + + to_chat(target, "[usr] stares at you. You feel your head begin to pulse.") + for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) - usr << "You place your hands to [target]'s head..." + to_chat(usr, "You place your hands to [target]'s head...") + usr.visible_message("[usr] places their hands onto the sides of [target]'s head!") if(2) - usr << "You begin preparing [target]'s mind as a blank slate..." + to_chat(usr, "You begin preparing [target]'s mind as a blank slate...") + usr.visible_message("[usr]'s palms flare a bright red against [target]'s temples!") - target << "A terrible red light floods your mind. You collapse as conscious thought is wiped away." + to_chat(target, "A terrible red light floods your mind. You collapse as conscious thought is wiped away.") + target.Weaken(12) sleep(20) if(isloyal(target)) - usr << "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time." + to_chat(usr, "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time.") + usr.visible_message("[usr] pauses, then dips their head in concentration!") - target << "You feel your loyalties begin to weaken!" + to_chat(target, "You feel your loyalties begin to weaken!") + sleep(100) //10 seconds - not spawn() so the enthralling takes longer - usr << "The nanobots composing the loyalty implant have been rendered inert. Now to continue." + to_chat(usr, "The nanobots composing the loyalty implant have been rendered inert. Now to continue.") + usr.visible_message("[usr] relaxes again.") for(var/obj/item/weapon/implant/loyalty/L in target) if(L && L.implanted) qdel(L) - target << "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies." + to_chat(target, "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies.") + if(3) - usr << "You begin planting the tumor that will control the new thrall..." + to_chat(usr, "You begin planting the tumor that will control the new thrall...") + usr.visible_message("A strange energy passes from [usr]'s hands into [target]'s head!") - target << "You feel your memories twisting, morphing. A sense of horror dominates your mind." + to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") + if(!do_mob(usr, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a loyalty implant - usr << "The enthralling has been interrupted - your target's mind returns to its previous state." - target << "You wrest yourself away from [usr]'s hands and compose yourself" + to_chat(usr, "The enthralling has been interrupted - your target's mind returns to its previous state.") + + to_chat(target, "You wrest yourself away from [usr]'s hands and compose yourself") + enthralling = 0 return enthralling = 0 - usr << "You have enthralled [target]!" + to_chat(usr, "You have enthralled [target]!") + target.visible_message("[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 @@ -379,7 +422,8 @@ /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor/cast(list/targets) if(!is_shadow(usr)) - usr << "You must be a shadowling to do this!" + to_chat(usr, "You must be a shadowling to do this!") + charge_counter = charge_max return for(var/mob/living/user in targets) @@ -421,45 +465,53 @@ var/victory_threshold = 15 var/mob/M - user << "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls." + to_chat(user, "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls.") + for(M in living_mob_list) if(is_thrall(M)) thralls++ - M << "You feel hooks sink into your mind and pull." + to_chat(M, "You feel hooks sink into your mind and pull.") + if(!do_after(user, 30, target = user)) - user << "Your concentration has been broken. The mental hooks you have sent out now retract into your mind." + to_chat(user, "Your concentration has been broken. The mental hooks you have sent out now retract into your mind.") + return if(thralls >= 3 && !screech_acquired) screech_acquired = 1 - 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, "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) if(thralls >= 5 && !blind_smoke_acquired) blind_smoke_acquired = 1 - user << "The power of your thralls has granted you the Blinding Smoke ability. It will create a choking cloud that will blind any non-thralls who enter. \ - " + to_chat(user, "The power of your thralls has granted you the Blinding Smoke ability. \ + It will create a choking cloud that will blind any non-thralls who enter.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/blindness_smoke) if(thralls >= 7 && !drainLifeAcquired) drainLifeAcquired = 1 - user << "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself." + to_chat(user, "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself.") + user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/drainLife) if(thralls >= 9 && !reviveThrallAcquired) reviveThrallAcquired = 1 - user << "The power of your thralls has granted you the Black Recuperation ability. This will, after a short time, bring a dead thrall completely back to life \ - with no bodily defects." + to_chat(user, "The power of your thralls has granted you the Black Recuperation ability. \ + This will, after a short time, bring a dead thrall completely back to life with no bodily defects.") user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/reviveThrall) if(thralls < victory_threshold) - user << "You do not have the power to ascend. You require [victory_threshold] thralls, but only [thralls] living thralls are present." + to_chat(user, "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) - usr << "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls." - usr << "You may find Ascendance in the Shadowling Evolution tab." + to_chat(usr, "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.") + + to_chat(usr, "You may find Ascendance in the Shadowling Evolution tab.") + for(M in living_mob_list) if(is_shadow(M)) var/obj/effect/proc_holder/spell/targeted/collective_mind/CM @@ -469,9 +521,12 @@ M.mind.remove_spell(/obj/effect/proc_holder/spell/targeted/shadowling_hatch) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_ascend) if(M == usr) - M << "You project this power to the rest of the shadowlings." + to_chat(M, "You project this power to the rest of the shadowlings.") + else - 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, "[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 + + @@ -491,7 +546,8 @@ return for(var/mob/living/user in targets) user.visible_message("[user] suddenly bends over and coughs out a cloud of black smoke, which begins to spread rapidly!") - user << "You regurgitate a vast cloud of blinding smoke." + to_chat(user, "You regurgitate a vast cloud of blinding smoke.") + playsound(user, 'sound/effects/bamf.ogg', 50, 1) var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new /obj/item/weapon/reagent_containers/glass/beaker/large(user.loc) B.reagents.clear_reagents() //Just in case! @@ -515,13 +571,15 @@ datum/reagent/shadowling_blindness_smoke //Blinds non-shadowlings, heals shadowl datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) - M << "You breathe in the black smoke, and your eyes burn horribly!" + to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!") + M.eye_blind = 5 if(prob(25)) M.visible_message("[M] claws at their eyes!") M.Stun(3) else - M << "You breathe in the black smoke, and you feel revitalized!" + to_chat(M, "You breathe in the black smoke, and you feel revitalized!") + M.heal_organ_damage(2,2) M.adjustOxyLoss(-2) M.adjustToxLoss(-2) @@ -555,13 +613,16 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) continue if(iscarbon(target)) var/mob/living/carbon/M = target - M << "A spike of pain drives into your head and scrambles your thoughts!" + to_chat(M, "A spike of pain drives into your head and scrambles your thoughts!") + M.confused += 10 M.ear_damage += 3 else if(issilicon(target)) var/mob/living/silicon/S = target - S << "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#" - S << 'sound/misc/interference.ogg' + to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") + + to_chat(S, 'sound/misc/interference.ogg') + 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) @@ -597,7 +658,8 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) nearbyTargets.Add(M) if(!targetsDrained) charge_counter = charge_max - usr << "There were no nearby humans for you to drain." + to_chat(usr, "There were no nearby humans for you to drain.") + return for(var/mob/living/carbon/M in nearbyTargets) U.heal_organ_damage(10, 10) @@ -608,8 +670,10 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) U.AdjustStunned(-1) M.adjustOxyLoss(20) M.adjustStaminaLoss(20) - M << "You feel a wave of exhaustion and a curious draining sensation directed towards [usr]!" - usr << "You draw life from those around you to heal your wounds." + to_chat(M, "You feel a wave of exhaustion and a curious draining sensation directed towards [usr]!") + + to_chat(usr, "You draw life from those around you to heal your wounds.") + @@ -632,15 +696,18 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) switch(choice) if("Empower") if(!is_thrall(thrallToRevive)) - usr << "[thrallToRevive] is not a thrall." + to_chat(usr, "[thrallToRevive] is not a thrall.") + charge_counter = charge_max return if(thrallToRevive.stat != CONSCIOUS) - usr << "[thrallToRevive] must be conscious to become empowered." + to_chat(usr, "[thrallToRevive] must be conscious to become empowered.") + charge_counter = charge_max return if(thrallToRevive.get_species() == "Lesser Shadowling") - usr << "[thrallToRevive] is already empowered." + to_chat(usr, "[thrallToRevive] is already empowered.") + charge_counter = charge_max return var/empowered_thralls = 0 @@ -651,17 +718,21 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(H.get_species() == "Lesser Shadowling") empowered_thralls++ if(empowered_thralls >= EMPOWERED_THRALL_LIMIT) - usr << "You cannot spare this much energy. There are too many empowered thralls." + to_chat(usr, "You cannot spare this much energy. There are too many empowered thralls.") + charge_counter = charge_max return usr.visible_message("[usr] places their hands over [thrallToRevive]'s face, red light shining from beneath.", \ "You place your hands on [thrallToRevive]'s face and begin gathering energy...") - thrallToRevive << "[usr] places their hands over your face. You feel energy gathering. Stand still..." + to_chat(thrallToRevive, "[usr] places their hands over your face. You feel energy gathering. Stand still...") + if(!do_mob(usr, thrallToRevive, 80)) - usr << "Your concentration snaps. The flow of energy ebbs." + to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") + charge_counter = charge_max return - usr << "You release a massive surge of power into [thrallToRevive]!" + to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") + usr.visible_message("Red lightning surges into [thrallToRevive]'s face!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -680,21 +751,25 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) thrallToRevive.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_walk) if("Revive") if(!is_thrall(thrallToRevive)) - usr << "[thrallToRevive] is not a thrall." + to_chat(usr, "[thrallToRevive] is not a thrall.") + charge_counter = charge_max return if(thrallToRevive.stat != DEAD) - usr << "[thrallToRevive] is not dead." + to_chat(usr, "[thrallToRevive] is not dead.") + charge_counter = charge_max return usr.visible_message("[usr] kneels over [thrallToRevive], placing their hands on \his chest.", \ "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(usr, thrallToRevive, 30)) - usr << "Your concentration snaps. The flow of energy ebbs." + to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") + charge_counter = charge_max return - usr << "You release a massive surge of power into [thrallToRevive]!" + to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") + usr.visible_message("Red lightning surges from [usr]'s hands into [thrallToRevive]'s chest!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -728,11 +803,13 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) charge_counter = charge_max return if(!is_thrall(target)) - usr << "[target] must be a thrall." + to_chat(usr, "[target] must be a thrall.") + charge_counter = charge_max return if(shuttle_master.emergency.mode != SHUTTLE_CALL) - usr << "The shuttle must be inbound only to the station." + to_chat(usr, "The shuttle must be inbound only to the station.") + charge_counter = charge_max return var/mob/living/carbon/human/M = target @@ -741,10 +818,13 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) M.visible_message("[M]'s face falls slack, their jaw slightly distending.", \ "You are suddenly transported... far, far away...") if(!do_after(usr, 50, target = M)) - M << "You are snapped back to reality, your haze dissipating!" - usr << "You have been interrupted. The draw has failed." + to_chat(M, "You are snapped back to reality, your haze dissipating!") + + to_chat(usr, "You have been interrupted. The draw has failed.") + return - usr << "You project [M]'s life force toward the approaching shuttle, extending its arrival duration!" + to_chat(usr, "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.", \ "...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...") M.death() @@ -771,14 +851,16 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) /obj/effect/proc_holder/spell/targeted/annihilate/cast(list/targets) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") + charge_counter = charge_max return playsound(usr.loc, 'sound/magic/Staff_Chaos.ogg', 100, 1) for(var/mob/living/boom in targets) if(is_shadow(boom)) //Used to not work on thralls. Now it does so you can PUNISH THEM LIKE THE WRATHFUL GOD YOU ARE. - usr << "Making an ally explode seems unwise." + to_chat(usr, "Making an ally explode seems unwise.") + charge_counter = charge_max return usr.visible_message("[usr]'s markings flare as they gesture at [boom]!", \ @@ -804,29 +886,36 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) charge_counter = charge_max - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") + return for(var/mob/living/carbon/human/target in targets) if(is_shadow_or_thrall(target)) - usr << "You cannot enthrall an ally." + to_chat(usr, "You cannot enthrall an ally.") + charge_counter = charge_max return if(!target.ckey || !target.mind) - usr << "The target has no mind." + to_chat(usr, "The target has no mind.") + charge_counter = charge_max return if(target.stat) - usr << "The target must be conscious." + to_chat(usr, "The target must be conscious.") + charge_counter = charge_max return if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") + charge_counter = charge_max return - usr << "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall." - target << "An agonizing spike of pain drives into your mind, and--" + to_chat(usr, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.") + + to_chat(target, "An agonizing spike of pain drives into your mind, and--") + ticker.mode.add_thrall(target.mind) target.mind.special_role = "shadowling thrall" target.add_language("Shadowling Hivemind") @@ -872,7 +961,8 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) /obj/effect/proc_holder/spell/aoe_turf/ascendant_storm/cast(list/targets) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) - usr << "You are not in the same plane of existence. Unphase first." + to_chat(usr, "You are not in the same plane of existence. Unphase first.") + charge_counter = charge_max return @@ -883,7 +973,8 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) for(var/mob/living/carbon/human/target in T.contents) if(is_shadow_or_thrall(target)) continue - target << "You are struck by a bolt of lightning!" + to_chat(target, "You are struck by a bolt of lightning!") + playsound(target, 'sound/magic/LightningShock.ogg', 50, 1) target.Weaken(8) target.take_organ_damage(0,50) @@ -904,4 +995,5 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/text = stripped_input(user, "What do you want to say to everything on and near [station_name()]?.", "Transmit to World", "") if(!text) return - world << "\"[text]\"" + to_chat(world, "\"[text]\"") + diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 52c50e0c193..0d514ff1005 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -14,13 +14,15 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N if(usr.stat || !ishuman(usr) || !usr || !is_shadow(usr || isinspace(usr))) return if(!isturf(usr.loc)) - usr << "You can't hatch here!" + to_chat(usr, "You can't hatch here!") + return for(var/mob/living/carbon/human/H in targets) 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") - H << "You decide against hatching for now." + to_chat(H, "You decide against hatching for now.") + charge_counter = charge_max return if("Yes") @@ -55,13 +57,16 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(80) playsound(H.loc, 'sound/weapons/slash.ogg', 25, 1) - H << "You rip and slice." + to_chat(H, "You rip and slice.") + sleep(10) playsound(H.loc, 'sound/weapons/slashmiss.ogg', 25, 1) - H << "The chrysalis falls like water before you." + to_chat(H, "The chrysalis falls like water before you.") + sleep(10) playsound(H.loc, 'sound/weapons/slice.ogg', 25, 1) - H << "You are free!" + to_chat(H, "You are free!") + H.status_flags = temp_flags sleep(10) playsound(H.loc, 'sound/effects/ghost.ogg', 100, 1) @@ -70,7 +75,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N H.real_name = newNameId H.name = usr.real_name H.SetStunned(0) - H << "YOU LIVE!!!" + to_chat(H, "YOU LIVE!!!") + for(var/obj/structure/alien/resin/wall/shadowling/W in orange(H, 1)) playsound(W, 'sound/effects/splat.ogg', 50, 1) @@ -95,7 +101,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N H.mind.remove_spell(src) sleep(10) - 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, "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/shadow_vision) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/enthrall) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare) @@ -124,7 +131,8 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N var/hatch_or_no = alert(H,"It is time to ascend. Are you sure about this?",,"Yes","No") switch(hatch_or_no) if("No") - H << "You decide against ascending for now." + to_chat(H, "You decide against ascending for now.") + charge_counter = charge_max return if("Yes") @@ -146,17 +154,23 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N "You begin to rend apart the final barries to godhood.") sleep(40) - H << "Yes!" + to_chat(H, "Yes!") + sleep(10) - H << "YES!!" + to_chat(H, "YES!!") + sleep(10) - H << "YE--" + to_chat(H, "YE--") + sleep(1) for(var/mob/living/M in orange(7, H)) M.Weaken(10) - M << "An immense pressure slams you onto the ground!" - world << "\"VYSHA NERADA YEKHEZET U'RUU!!\"" - world << 'sound/hallucinations/veryfar_noise.ogg' + to_chat(M, "An immense pressure slams you onto the ground!") + + to_chat(world, "\"VYSHA NERADA YEKHEZET U'RUU!!\"") + + to_chat(world, 'sound/hallucinations/veryfar_noise.ogg') + for(var/obj/machinery/power/apc/A in apcs) A.overload_lighting() var/mob/A = new /mob/living/simple_animal/ascendant_shadowling(H.loc) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index bfb5a38e319..497664cc76f 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -25,8 +25,10 @@ /datum/game_mode/traitor/announce() - world << "The current game mode is - Traitor!" - world << "There is a syndicate traitor on the station. Do not let the traitor succeed!" + to_chat(world, "The current game mode is - Traitor!") + + to_chat(world, "There is a syndicate traitor on the station. Do not let the traitor succeed!") + /datum/game_mode/traitor/pre_setup() @@ -172,10 +174,12 @@ /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) - traitor.current << "You are the traitor." + to_chat(traitor.current, "You are the traitor.") + var/obj_count = 1 for(var/datum/objective/objective in traitor.objectives) - traitor.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(traitor.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -201,21 +205,27 @@ return 0 /datum/game_mode/proc/give_codewords(mob/living/traitor_mob) - traitor_mob << "The Syndicate provided you with the following information on how to identify their agents:" - traitor_mob << "Code Phrase: [syndicate_code_phrase]" - traitor_mob << "Code Response: [syndicate_code_response]" + to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") + + to_chat(traitor_mob, "Code Phrase: [syndicate_code_phrase]") + + to_chat(traitor_mob, "Code Response: [syndicate_code_response]") + traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") traitor_mob.mind.store_memory("Code Response: [syndicate_code_response]") - traitor_mob << "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe." + to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") + /datum/game_mode/proc/add_law_zero(mob/living/silicon/ai/killer) var/law = "Accomplish your objectives at all costs." var/law_borg = "Accomplish your AI's objectives at all costs." - killer << "Your laws have been changed!" + to_chat(killer, "Your laws have been changed!") + killer.set_zeroth_law(law, law_borg) - killer << "New law: 0. [law]" + to_chat(killer, "New law: 0. [law]") + give_codewords(killer) @@ -277,7 +287,8 @@ feedback_add_details("traitor_success","FAIL") - world << text + to_chat(world, text) + return 1 @@ -287,7 +298,8 @@ . = 1 if (traitor_mob.mind) if (traitor_mob.mind.assigned_role == "Clown") - traitor_mob << "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself." + to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") + traitor_mob.mutations.Remove(CLUMSY) // find a radio! toolbox(es), backpack, belt, headset @@ -296,7 +308,8 @@ R = locate(/obj/item/device/radio) in traitor_mob.contents if (!R) - traitor_mob << "Unfortunately, the Syndicate wasn't able to get you a radio." + to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you a radio.") + . = 0 else if (istype(R, /obj/item/device/radio)) @@ -316,7 +329,8 @@ target_radio.hidden_uplink = T T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") + traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [T.loc]).") else if (istype(R, /obj/item/device/pda)) // generate a passcode if the uplink is hidden in a PDA @@ -328,7 +342,8 @@ var/obj/item/device/pda/P = R P.lock_code = pda_pass - traitor_mob << "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features." + to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") + traitor_mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [T.loc]).") if(!safety)//If they are not a rev. Can be added on to. give_codewords(traitor_mob) @@ -336,7 +351,8 @@ // Tell them about people they might want to contact. var/mob/living/carbon/human/M = get_nt_opposed() if(M && M != traitor_mob) - traitor_mob << "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them." + to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") + traitor_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) @@ -366,8 +382,10 @@ slaved.leave_serv_hud(traitor_mind) update_traitor_icons_removed(traitor_mind) - //world << "Removed [traitor_mind.current.name] from traitor shit" - traitor_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)" +// to_chat(world, "Removed [traitor_mind.current.name] from traitor shit") + + to_chat(traitor_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)") + /datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) //set faction @@ -408,5 +426,6 @@ var/equipped_slot = mob.equip_in_one_of_slots(folder, slots) if (equipped_slot) where = "In your [equipped_slot]" - mob << "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
" + to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") + mob.update_icons() diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index edb240eb1cd..a0bdfe7fbdf 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -38,8 +38,10 @@ var/vampire_amount = 4 /datum/game_mode/vampire/announce() - world << "The current game mode is - Vampires!" - world << "There are Vampires from Space Transylvania on the station, keep your blood close and neck safe!" + to_chat(world, "The current game mode is - Vampires!") + + to_chat(world, "There are Vampires from Space Transylvania on the station, keep your blood close and neck safe!") + /datum/game_mode/vampire/pre_setup() @@ -116,7 +118,8 @@ else text += "
The [special_role_text] has failed!" feedback_add_details("traitor_success","FAIL") - world << text + to_chat(world, text) + return 1 /datum/game_mode/proc/auto_declare_completion_enthralled() @@ -134,7 +137,8 @@ else text += "body destroyed" text += ")" - world << text + to_chat(world, text) + return 1 /datum/game_mode/proc/forge_vampire_objectives(var/datum/mind/vampire) @@ -180,17 +184,21 @@ dat = "\red You are a Vampire! \black
" dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} - vampire.current << dat - vampire.current << "You must complete the following tasks:" + to_chat(vampire.current, dat) + + to_chat(vampire.current, "You must complete the following tasks:") + if (vampire.current.mind) if (vampire.current.mind.assigned_role == "Clown") - vampire.current << "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself." + to_chat(vampire.current, "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself.") + vampire.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in vampire.objectives) - vampire.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(vampire.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -280,12 +288,14 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha H.LAssailant = owner while(do_mob(owner, H, 50)) if(!(owner.mind in ticker.mode.vampires)) - owner << "Your fangs have disappeared!" + to_chat(owner, "Your fangs have disappeared!") + return old_bloodtotal = bloodtotal old_bloodusable = bloodusable if(!H.vessel.get_reagent_amount("blood")) - src << "They've got no blood left to give." + to_chat(src, "They've got no blood left to give.") + break if(H.stat < DEAD) blood = min(20, H.vessel.get_reagent_amount("blood")) // if they have less than 20 blood, give them the remnant else they get 20 blood @@ -295,7 +305,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha blood = min(5, H.vessel.get_reagent_amount("blood")) // The dead only give 5 bloods bloodtotal += blood if(old_bloodtotal != bloodtotal) - owner << "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""]." + to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") + check_vampire_upgrade() H.vessel.remove_reagent("blood", 25) if(ishuman(owner)) @@ -303,7 +314,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha V.nutrition = min(450, V.nutrition + (blood / 2)) draining = null - owner << "You stop draining [H.name] of blood." + to_chat(owner, "You stop draining [H.name] of blood.") + /datum/vampire/proc/check_vampire_upgrade(announce = 1) var/list/old_powers = powers.Copy() @@ -321,10 +333,12 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(!(p in old_powers)) if(istype(p, /obj/effect/proc_holder/spell/vampire)) var/obj/effect/proc_holder/spell/vampire/power = p - owner << "[power.gain_desc]" + to_chat(owner, "[power.gain_desc]") + else if(istype(p, /datum/vampire_passive)) var/datum/vampire_passive/power = p - owner << "[power.gain_desc]" + to_chat(owner, "[power.gain_desc]") + //prepare for copypaste /datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind) @@ -351,8 +365,10 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha vampire_mind.som = null slaved.leave_serv_hud(vampire_mind) update_vampire_icons_removed(vampire_mind) - //world << "Removed [vampire_mind.current.name] from vampire shit" - vampire_mind.current << "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now." +// to_chat(world, "Removed [vampire_mind.current.name] from vampire shit") + + to_chat(vampire_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now.") + /datum/vampire/proc/check_sun() var/ax = owner.x @@ -412,14 +428,18 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(prob(35)) switch(owner.health) if(80 to 100) - owner << "Your skin flakes away..." + to_chat(owner, "Your skin flakes away...") + if(60 to 80) - owner << "Your skin sizzles!" + to_chat(owner, "Your skin sizzles!") + if((-INFINITY) to 60) if(!owner.on_fire) - owner << "Your skin catches fire!" + to_chat(owner, "Your skin catches fire!") + else - owner << "You continue to burn!" + to_chat(owner, "You continue to burn!") + owner.fire_stacks += 5 owner.IgniteMob() owner.emote("scream") diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 343e4ea3fa6..48fd3034cbe 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -19,7 +19,8 @@ if(!user.mind) return 0 if(!ishuman(user)) - user << "You are in too weak of a form to do this!" + to_chat(user, "You are in too weak of a form to do this!") + return 0 var/datum/vampire/vampire = user.mind.vampire @@ -30,18 +31,22 @@ var/fullpower = vampire.get_ability(/datum/vampire_passive/full) if(user.stat >= DEAD) - user << "Not when you're dead!" + to_chat(user, "Not when you're dead!") + return 0 if(vampire.nullified && !fullpower) - user << "Something is blocking your powers!" + to_chat(user, "Something is blocking your powers!") + return 0 if(vampire.bloodusable < required_blood) - user << "You require at least [required_blood] units of usable blood to do that!" + to_chat(user, "You require at least [required_blood] units of usable blood to do that!") + return 0 //chapel check if(istype(loc.loc, /area/chapel) && !fullpower) - user << "Your powers are useless on this holy ground." + to_chat(user, "Your powers are useless on this holy ground.") + return 0 return ..() @@ -105,7 +110,8 @@ targets.Cut() if(targets.len) - usr << "You have [vampire.bloodusable] left to use." + to_chat(usr, "You have [vampire.bloodusable] left to use.") + /obj/effect/proc_holder/spell/vampire/targetted/choose_targets(mob/user = usr) var/list/possible_targets[0] @@ -157,7 +163,8 @@ usr.SetStunned(0) usr.SetParalysis(0) U.adjustStaminaLoss(-75) - usr << "You flush your system with clean blood and remove any incapacitating effects." + to_chat(usr, "You flush your system with clean blood and remove any incapacitating effects.") + spawn(1) if(usr.mind.vampire.get_ability(/datum/vampire_passive/regen)) for(var/i = 1 to 5) @@ -178,17 +185,22 @@ usr.visible_message("[usr]'s eyes flash briefly as he stares into [target]'s eyes") if(do_mob(usr, target, 50)) if(!affects(target)) - usr << "Your piercing gaze fails to knock out [target]." - target << "\blue [usr]'s feeble gaze is ineffective." + to_chat(usr, "Your piercing gaze fails to knock out [target].") + + to_chat(target, "\blue [usr]'s feeble gaze is ineffective.") + else - usr << "Your piercing gaze knocks out [target]." - target << "You find yourself unable to move and barely able to speak." + to_chat(usr, "Your piercing gaze knocks out [target].") + + to_chat(target, "You find yourself unable to move and barely able to speak.") + target.Weaken(10) target.Stun(10) target.stuttering = 10 else revert_cast(usr) - usr << "You broke your gaze." + to_chat(usr, "You broke your gaze.") + /obj/effect/proc_holder/spell/vampire/targetted/disease name = "Diseased Touch (100)" @@ -199,10 +211,12 @@ /obj/effect/proc_holder/spell/vampire/targetted/disease/cast(list/targets) for(var/mob/living/carbon/target in targets) - usr << "You stealthily infect [target] with your diseased touch." + to_chat(usr, "You stealthily infect [target] with your diseased touch.") + target.help_shake_act(usr) if(!affects(target)) - usr << "They seem to be unaffected." + to_chat(usr, "They seem to be unaffected.") + continue var/datum/disease/D = new /datum/disease/appendicitis //someone should probably make a better virus for this target.ForceContractDisease(D) @@ -217,7 +231,8 @@ /obj/effect/proc_holder/spell/vampire/mob_aoe/glare/cast(list/targets) usr.visible_message("[usr]'s eyes emit a blinding flash!") if(istype(usr:glasses, /obj/item/clothing/glasses/sunglasses/blindfold)) - usr << "You're blindfolded!" + to_chat(usr, "You're blindfolded!") + return for(var/mob/living/target in targets) if(!affects(target)) @@ -225,7 +240,8 @@ target.Stun(5) target.Weaken(5) target.stuttering = 20 - target << "You are blinded by [usr]'s glare." + to_chat(target, "You are blinded by [usr]'s glare.") + /obj/effect/proc_holder/spell/vampire/self/shapeshift name = "Shapeshift (50)" @@ -257,7 +273,8 @@ continue if(!affects(C)) continue - C << "You hear a ear piercing shriek and your senses dull!" + to_chat(C, "You hear a ear piercing shriek and your senses dull!") + C.Weaken(4) C.ear_deaf = 20 C.stuttering = 20 @@ -277,16 +294,19 @@ /obj/effect/proc_holder/spell/vampire/targetted/enthrall/cast(list/targets) for(var/mob/living/target in targets) usr.visible_message("[usr] bites [target]'s neck!", "You bite [target]'s neck and begin the flow of power.") - target << "You feel the tendrils of evil invade your mind." + to_chat(target, "You feel the tendrils of evil invade your mind.") + if(!ishuman(target)) - usr << "You can only enthrall humans." + to_chat(usr, "You can only enthrall humans.") + break if(do_mob(usr, target, 50)) if(can_enthrall(usr, target)) handle_enthrall(usr, target) else revert_cast(usr) - usr << "You or your target either moved or you dont have enough usable blood." + to_chat(usr, "You or your target either moved or you dont have enough usable blood.") + /obj/effect/proc_holder/spell/vampire/targetted/enthrall/proc/can_enthrall(mob/living/user, mob/living/carbon/C) var/enthrall_safe = 0 @@ -302,7 +322,8 @@ log_to_dd("something bad happened on enthralling a mob, attacker is [user] [user.key] \ref[user]") return 0 if(!C.mind) - user << "[C.name]'s mind is not there for you to enthrall." + to_chat(user, "[C.name]'s mind is not there for you to enthrall.") + return 0 if(enthrall_safe || ( C.mind in ticker.mode.vampires )||( C.mind.vampire )||( C.mind in ticker.mode.vampire_enthralled )) C.visible_message("[C] seems to resist the takeover!", "You feel a familiar sensation in your skull that quickly dissipates.") @@ -310,7 +331,8 @@ if(!affects(C)) C.visible_message("[C] seems to resist the takeover!", "Your faith of [ticker.Bible_deity_name] has kept your mind clear of all evil.") if(!ishuman(C)) - user << "You can only enthrall humans!" + to_chat(user, "You can only enthrall humans!") + return 0 return 1 @@ -334,8 +356,10 @@ ticker.mode.vampire_enthralled.Add(H.mind) ticker.mode.vampire_enthralled[H.mind] = user.mind H.mind.special_role = "VampThrall" - H << "You have been Enthralled by [user]. Follow their every command." - src << "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp." + to_chat(H, "You have been Enthralled by [user]. Follow their every command.") + + to_chat(src, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.") + log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].") /obj/effect/proc_holder/spell/vampire/self/cloak @@ -359,7 +383,8 @@ var/datum/vampire/V = usr.mind.vampire V.iscloaking = !V.iscloaking update_name() - usr << "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness." + to_chat(usr, "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness.") + /obj/effect/proc_holder/spell/vampire/bats name = "Summon Bats (75)" @@ -425,7 +450,8 @@ sleep(jaunt_duration) var/mobloc = get_turf(usr.loc) if(get_area(mobloc) == /area/security/armoury/gamma) - usr << "A strange energy repels you!" + to_chat(usr, "A strange energy repels you!") + mobloc = originalloc animation.loc = mobloc steam.location = mobloc @@ -485,7 +511,8 @@ if(!turfs.len) revert_cast(user) - user << "\red You cannot find darkness to step to." + to_chat(user, "\red You cannot find darkness to step to.") + return perform(turfs) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index bce6194726a..1affe3be3e7 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -47,7 +47,8 @@ H.set_machine(src) if(href_list["school"]) if (used) - H << "You already used this contract!" + to_chat(H, "You already used this contract!") + return used = 1 var/list/candidates = pollCandidates("Do you want to play as the wizard apprentice of [H.real_name]?", ROLE_WIZARD, 1) @@ -56,25 +57,30 @@ new /obj/effect/effect/harmless_smoke(H.loc) var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc) M.key = C.key - M << "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals." + to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.") + switch(href_list["school"]) if("destruction") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.") + if("bluespace") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.") + if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(M)) M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") + if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(M)) - M << "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap." + to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") + M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) @@ -105,7 +111,8 @@ M.faction = list("wizard") else used = 0 - H << "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later." + to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.") + return @@ -133,7 +140,8 @@ charged = 0 user.visible_message("[src] hums with power as [user] deals a blow to [activate_descriptor] itself!") else - user << "The unearthly energies that powered the blade are now dormant." + to_chat(user, "The unearthly energies that powered the blade are now dormant.") + /obj/effect/rend @@ -212,7 +220,8 @@ hitsound = 'sound/items/welder2.ogg' /obj/item/weapon/scrying/attack_self(mob/user as mob) - user << " You can see...everything!" + to_chat(user, " You can see...everything!") + visible_message("[user] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -254,13 +263,15 @@ var/global/list/multiverse = list() /obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) - user << "The [src] detects benevolent energies in your target and redirects your attack!" + to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") + return ..() /obj/item/weapon/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") - user << "You know better than to touch your teacher's stuff." + to_chat(user, "You know better than to touch your teacher's stuff.") + return if(cooldown < world.time) var/faction_check = 0 @@ -272,24 +283,29 @@ var/global/list/multiverse = list() faction = list("[user.real_name]") assigned = "[user.real_name]" user.faction = list("[user.real_name]") - user << "You bind the sword to yourself. You can now use it to summon help." + to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") + if(!usr.mind.special_role) if(prob(probability_evil)) - user << "With your new found power you could easily conquer the station!" + to_chat(user, "With your new found power you could easily conquer the station!") + var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone hijack_objective.owner = usr.mind usr.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" - usr << "Objective #[1]: [hijack_objective.explanation_text]" + to_chat(usr, "Objective #[1]: [hijack_objective.explanation_text]") + ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" evil = TRUE else - user << "With your new found power you could easily defend the station!" + to_chat(user, "With your new found power you could easily defend the station!") + var/datum/objective/survive/new_objective = new /datum/objective/survive new_objective.owner = usr.mind new_objective.explanation_text = "Survive, and help defend the innocent from the mobs of multiverse clones." - usr << "Objective #[1]: [new_objective.explanation_text]" + to_chat(usr, "Objective #[1]: [new_objective.explanation_text]") + usr.mind.objectives += new_objective ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" @@ -304,12 +320,15 @@ var/global/list/multiverse = list() if(candidates.len) var/mob/C = pick(candidates) spawn_copy(C.client, get_turf(user.loc), user) - user << "The sword flashes, and you find yourself face to face with...you!" + to_chat(user, "The sword flashes, and you find yourself face to face with...you!") + else - user << "You fail to summon any copies of yourself. Perhaps you should try again in a bit." + to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") + else - user << "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies." + to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") + /obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) @@ -320,7 +339,8 @@ var/global/list/multiverse = list() C.prefs.copy_to(M) M.key = C.key M.mind.name = user.real_name - M << "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs." + to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") + M.faction = list("[user.real_name]") if(duplicate_self) M.set_species(user.get_species()) //duplicate the sword user's species. @@ -345,7 +365,8 @@ var/global/list/multiverse = list() hijack_objective.owner = M.mind M.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" - M << "Objective #[1]: [hijack_objective.explanation_text]" + to_chat(M, "Objective #[1]: [hijack_objective.explanation_text]") + M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] hijack.") else @@ -354,7 +375,8 @@ var/global/list/multiverse = list() new_objective.target = usr.mind new_objective.explanation_text = "Protect [usr.real_name], your copy, and help them defend the innocent from the mobs of multiverse clones." M.mind.objectives += new_objective - M << "Objective #[1]: [new_objective.explanation_text]" + to_chat(M, "Objective #[1]: [new_objective.explanation_text]") + M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] protect the station.") @@ -629,17 +651,20 @@ var/global/list/multiverse = list() return if(M.stat != DEAD) - user << "This artifact can only affect the dead!" + to_chat(user, "This artifact can only affect the dead!") + return if(!M.mind || !M.client) - user << "There is no soul connected to this body..." + to_chat(user, "There is no soul connected to this body...") + return check_spooky()//clean out/refresh the list if(spooky_scaries.len >= 3 && !unlimited) - user << "This artifact can only affect three undead at a time!" + to_chat(user, "This artifact can only affect three undead at a time!") + return if(heresy) spawnheresy(M)//oh god why @@ -649,8 +674,10 @@ var/global/list/multiverse = list() M.revive() equip_skeleton(M) spooky_scaries |= M - M << "You have been revived by [user.real_name]!" - M << "They are your master now, assist them even if it costs you your new life!" + to_chat(M, "You have been revived by [user.real_name]!") + + to_chat(M, "They are your master now, assist them even if it costs you your new life!") + desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" /obj/item/device/necromantic_stone/proc/check_spooky() @@ -773,16 +800,20 @@ var/global/list/multiverse = list() /obj/item/voodoo/attackby(obj/item/I as obj, mob/user as mob, params) if(target && cooldown < world.time) if(is_hot(I)) - target << "You suddenly feel very hot" + to_chat(target, "You suddenly feel very hot") + target.bodytemperature += 50 GiveHint(target) else if(can_puncture(I)) - target << "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!" + to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!") + target.Weaken(2) GiveHint(target) else if(istype(I,/obj/item/weapon/bikehorn)) - target << "HONK" - target << 'sound/items/AirHorn.ogg' + to_chat(target, "HONK") + + to_chat(target, 'sound/items/AirHorn.ogg') + target.ear_damage += rand(0,3) GiveHint(target) cooldown = world.time +cooldown_time @@ -792,7 +823,8 @@ var/global/list/multiverse = list() user.drop_item() I.loc = src link = I - user << "You attach [I] to the doll." + to_chat(user, "You attach [I] to the doll.") + update_targets() ..() /obj/item/voodoo/check_eye(mob/user as mob) @@ -806,7 +838,8 @@ var/global/list/multiverse = list() if(link) target = null link.loc = get_turf(src) - user << "You remove the [link] from the doll." + to_chat(user, "You remove the [link] from the doll.") + link = null update_targets() return @@ -825,7 +858,8 @@ var/global/list/multiverse = list() user.reset_view() user.unset_machine() if("r_leg","l_leg") - user << "You move the doll's legs around." + to_chat(user, "You move the doll's legs around.") + var/turf/T = get_step(target,pick(cardinal)) target.Move(T) if("r_arm","l_arm") @@ -840,9 +874,11 @@ var/global/list/multiverse = list() target.ClickOn(T) GiveHint(target) if("head") - user << "You smack the doll's head with your hand." + to_chat(user, "You smack the doll's head with your hand.") + target.Dizzy(10) - target << "You suddenly feel as if your head was hit with a hammer!" + to_chat(target, "You suddenly feel as if your head was hit with a hammer!") + GiveHint(target,user) cooldown = world.time + cooldown_time @@ -857,10 +893,12 @@ var/global/list/multiverse = list() /obj/item/voodoo/proc/GiveHint(mob/victim,force=0) if(prob(50) || force) var/way = dir2text(get_dir(victim,get_turf(src))) - victim << "You feel a dark presence from [way]" + to_chat(victim, "You feel a dark presence from [way]") + if(prob(20) || force) var/area/A = get_area(src) - victim << "You feel a dark presence from [A.name]" + to_chat(victim, "You feel a dark presence from [A.name]") + /obj/item/voodoo/fire_act() if(target) diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index 2bab01e5ec5..b098b6bc84d 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -22,7 +22,8 @@ if(!iscarbon(user)) //Look ma, no hands return if(user.lying || user.handcuffed) - user << "You can't reach out!" + to_chat(user, "You can't reach out!") + return ..() @@ -62,7 +63,8 @@ if(!proximity || target == user || !ismob(target) || !iscarbon(user) || user.lying || user.handcuffed) //getting hard after touching yourself would also be bad return if(user.lying || user.handcuffed) - user << "You can't reach out!" + to_chat(user, "You can't reach out!") + return var/mob/M = target M.Stun(2) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index a3d927970de..c1f8675ecc2 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -14,20 +14,26 @@ var/time_till_chaos = 18000 // Half-hour in /datum/game_mode/wizard/raginmages/announce() - world << "The current game mode is - Ragin' Mages!" - world << "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!" + to_chat(world, "The current game mode is - Ragin' Mages!") + + to_chat(world, "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!") + /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "\red You are the Space Wizard!") + + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") + var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) - wizard.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ - wizard.current << "Objective Alpha: Make sure the station pays for its actions against our diplomats" + to_chat(wizard.current, "Objective Alpha: Make sure the station pays for its actions against our diplomats") + return /datum/game_mode/wizard/raginmages/check_finished() @@ -39,34 +45,40 @@ continue if(!istype(wizard.current,/mob/living/carbon)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") + message_admins("[wizard.current] was transformed in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(istype(wizard.current,/mob/living/carbon/brain)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") + message_admins("[wizard.current] was brainified in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(wizard.current.stat==DEAD) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") + message_admins("[wizard.current] died in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(wizard.current.stat==UNCONSCIOUS) if(wizard.current.health < 0) if(istype(get_area(wizard.current), /area/wizard_station)) - wizard.current << "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums" + to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") + message_admins("[wizard.current] went into crit in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) else - wizard.current << "\red The Space Wizard Federation is upset with your performance and have terminated your employment." + to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") + wizard.current.gib() // *REAL* ACTION!! *REAL* DRAMA!! *REAL* BLOODSHED!! continue if(wizard.current.client && wizard.current.client.is_afk() > 10 * 60 * 10) // 10 minutes - wizard.current << "\red The Space Wizard Federation is upset with your performance and have terminated your employment." + to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") + wizard.current.gib() // Let's keep the round moving continue if(!wizard.current.client) @@ -100,7 +112,8 @@ marked_for_death |= M.current for(var/mob/living/L in marked_for_death) if(L.stat == CONSCIOUS) // Probably a troublemaker - I'd like to see YOU fight when unconscious - L << "STOP FIGHTING." + to_chat(L, "STOP FIGHTING.") + L.ghostize() if(istype(L, /mob/living/carbon/brain)) // diediedie @@ -184,5 +197,6 @@ /datum/game_mode/wizard/raginmages/declare_completion() if(finished) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!" + to_chat(world, "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!") + ..(1) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index b6052320615..14cdf7e94cc 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -5,7 +5,8 @@ var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffhealing", "armor", "scrying", "staffdoor", "special","voodoo","special") var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos","necromantic") - usr << "You summoned [summon_type ? "magic" : "guns"]!" + to_chat(usr, "You summoned [summon_type ? "magic" : "guns"]!") + message_admins("[key_name_admin(usr)] summoned [summon_type ? "magic" : "guns"]!") for(var/mob/living/carbon/human/H in player_list) @@ -136,7 +137,8 @@ H.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO - H << "The walls suddenly disappear." + to_chat(H, "The walls suddenly disappear.") + if("voodoo") new /obj/item/voodoo(get_turf(H)) if("special") @@ -154,4 +156,5 @@ new /obj/item/weapon/gun/magic/staff/chaos(get_turf(H)) if("necromantic") new /obj/item/device/necromantic_stone(get_turf(H)) - H << "You suddenly feel lucky." + to_chat(H, "You suddenly feel lucky.") + diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index d7dcc2287a6..9ab912a5ce5 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -19,11 +19,13 @@ return ..() if(M.has_brain_worms()) //Borer stuff - RR - user << "This being is corrupted by an alien intelligence and cannot be soul trapped." + to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") + return ..() - + if(jobban_isbanned(M, "cultist") || jobban_isbanned(M, "Syndicate")) - user << "A mysterious force prevents you from trapping this being's soul." + to_chat(user, "A mysterious force prevents you from trapping this being's soul.") + return ..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [key_name(user)]") @@ -81,7 +83,8 @@ for(var/mob/living/simple_animal/shade/A in src) A.status_flags &= ~GODMODE A.canmove = 1 - A << "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs." + to_chat(A, "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs.") + A.loc = U.loc A.cancel_camera() src.icon_state = "soulstone" @@ -108,16 +111,20 @@ var/mob/living/carbon/human/T = target var/obj/item/device/soulstone/C = src if(C.imprinted != "empty") - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") + else if (T.stat == 0) - U << "\red Capture failed!: \black Kill or maim the victim first!" + to_chat(U, "\red Capture failed!: \black Kill or maim the victim first!") + else if(T.client == null) - U << "\red Capture failed!: \black The soul has already fled it's mortal frame." + to_chat(U, "\red Capture failed!: \black The soul has already fled it's mortal frame.") + else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") + else for(var/obj/item/W in T) T.unEquip(W) @@ -141,22 +148,28 @@ S.cancel_camera() C.icon_state = "soulstone2" C.name = "Soul Stone: [S.real_name]" - S << "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs." - U << "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone." - U << "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls." + to_chat(S, "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs.") + + to_chat(U, "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") + + to_chat(U, "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls.") + C.imprinted = "[S.name]" qdel(T) if("SHADE") var/mob/living/simple_animal/shade/T = target var/obj/item/device/soulstone/C = src if (T.stat == DEAD) - U << "\red Capture failed!: \black The shade has already been banished!" + to_chat(U, "\red Capture failed!: \black The shade has already been banished!") + else if(C.contents.len) - U << "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room." + to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") + else if(T.name != C.imprinted) - U << "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!" + to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") + else T.loc = C //put shade in stone T.status_flags |= GODMODE @@ -164,8 +177,10 @@ T.health = T.maxHealth T.faction |= "\ref[U]" C.icon_state = "soulstone2" - T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form" - U << "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone." + to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") + + to_chat(U, "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone.") + if("CONSTRUCT") var/obj/structure/constructshell/T = target var/obj/item/device/soulstone/C = src @@ -184,8 +199,10 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.") + + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") + Z.cancel_camera() qdel(C) @@ -200,8 +217,10 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.") + + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") + Z.cancel_camera() qdel(C) @@ -216,12 +235,15 @@ ticker.mode.cult+=Z.mind ticker.mode.update_cult_icons_added(Z.mind) qdel(T) - Z << "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone)." - Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(Z, "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).") + + to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") + Z.cancel_camera() qdel(C) else - U << "\red Creation failed!: \black The soul stone is empty! Go kill someone!" + to_chat(U, "\red Creation failed!: \black The soul stone is empty! Go kill someone!") + return /proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) @@ -237,8 +259,12 @@ ticker.mode.cult+=newstruct.mind ticker.mode.update_cult_icons_added(newstruct.mind) if(stoner && iswizard(stoner)) - newstruct << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") + else if(stoner && iscultist(stoner)) - newstruct << "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs." - else newstruct << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + to_chat(newstruct, "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs.") + + else + to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") + newstruct.cancel_camera() \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 7422d610fb9..e206e670527 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -26,7 +26,8 @@ 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) - user << "This spell cannot be improved further." + to_chat(user, "This spell cannot be improved further.") + return 0 else aspell.name = initial(aspell.name) @@ -36,24 +37,30 @@ aspell.charge_counter = aspell.charge_max switch(aspell.spell_level) if(1) - user << "You have improved [aspell.name] into Efficient [aspell.name]." + to_chat(user, "You have improved [aspell.name] into Efficient [aspell.name].") + aspell.name = "Efficient [aspell.name]" if(2) - user << "You have further improved [aspell.name] into Quickened [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Quickened [aspell.name].") + aspell.name = "Quickened [aspell.name]" if(3) - user << "You have further improved [aspell.name] into Free [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Free [aspell.name].") + aspell.name = "Free [aspell.name]" if(4) - user << "You have further improved [aspell.name] into Instant [aspell.name]." + to_chat(user, "You have further improved [aspell.name] into Instant [aspell.name].") + aspell.name = "Instant [aspell.name]" if(aspell.spell_level >= aspell.level_max) - user << "This spell cannot be strengthened any further." + to_chat(user, "This spell cannot be strengthened any further.") + return 1 //No same spell found - just learn it feedback_add_details("wizard_spell_learned",log_name) user.mind.AddSpell(S) - user << "You have learned [S.name]." + to_chat(user, "You have learned [S.name].") + return 1 /datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) @@ -69,7 +76,8 @@ /datum/spellbook_entry/proc/Refund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = locate() if(!(user in A.contents)) - user << "You can only refund spells at the wizard lair" + to_chat(user, "You can only refund spells at the wizard lair") + return -1 if(!S) S = new spell_type() @@ -303,7 +311,8 @@ user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS) user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO - user << "\blue The walls suddenly disappear." + to_chat(user, "\blue The walls suddenly disappear.") + return 1 @@ -425,7 +434,8 @@ user.rightandwrong(0) book.uses += 1 active = 1 - user << "You have cast summon guns and gained an extra charge for your spellbook." + to_chat(user, "You have cast summon guns and gained an extra charge for your spellbook.") + return 1 /datum/spellbook_entry/summon/magic @@ -448,7 +458,8 @@ user.rightandwrong(1) book.uses += 1 active = 1 - user << "You have cast summon magic and gained an extra charge for your spellbook." + to_chat(user, "You have cast summon magic and gained an extra charge for your spellbook.") + return 1 /obj/item/weapon/spellbook @@ -486,16 +497,19 @@ if(istype(O, /obj/item/weapon/contract)) var/obj/item/weapon/contract/contract = O if(contract.used) - user << "The contract has been used, you can't get your points back now!" + to_chat(user, "The contract has been used, you can't get your points back now!") + else - user << "You feed the contract back into the spellbook, refunding your points." + to_chat(user, "You feed the contract back into the spellbook, refunding your points.") + uses++ qdel(O) if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon)) - user << "On second thought, maybe summoning a demon is a bad idea. You refund your points." + to_chat(user, "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) @@ -555,11 +569,13 @@ /obj/item/weapon/spellbook/attack_self(mob/user as mob) if(!owner) - user << "You bind the spellbook to yourself." + to_chat(user, "You bind the spellbook to yourself.") + owner = user return if(user != owner) - user << "The [name] does not recognize you as it's owner and refuses to open!" + to_chat(user, "The [name] does not recognize you as it's owner and refuses to open!") + return user.set_machine(src) var/dat = "" @@ -656,15 +672,18 @@ if(knownspell.type == S.type) if(user.mind) if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard") - user <<"You're already far more versed in this spell than this flimsy how-to book can provide." + to_chat(user, "You're already far more versed in this spell than this flimsy how-to book can provide.") + else - user <<"You've already read this one." + to_chat(user, "You've already read this one.") + return if(used) recoil(user) else user.mind.AddSpell(S) - user <<"you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!" + to_chat(user, "you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!") + user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) @@ -698,7 +717,8 @@ /obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob) ..() - user <<"Your stomach rumbles..." + to_chat(user, "Your stomach rumbles...") + if(user.nutrition) user.nutrition -= 200 if(user.nutrition <= 0) @@ -712,7 +732,8 @@ /obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) ..() - user <<"You go blind!" + to_chat(user, "You go blind!") + user.eye_blind = 10 /obj/item/weapon/spellbook/oneuse/mindswap @@ -734,10 +755,12 @@ stored_swap = null if(!stored_swap) stored_swap = user - user <<"For a moment you feel like you don't even know who you are anymore." + to_chat(user, "For a moment you feel like you don't even know who you are anymore.") + return if(stored_swap == user) - user <<"You stare at the book some more, but there doesn't seem to be anything else to learn..." + to_chat(user, "You stare at the book some more, but there doesn't seem to be anything else to learn...") + return if(user.mind.special_verbs.len) @@ -766,8 +789,10 @@ for(var/V in user.mind.special_verbs) user.verbs += V - stored_swap <<"You're suddenly somewhere else... and someone else?!" - user <<"Suddenly you're staring at [src] again... where are you, who are you?!" + to_chat(stored_swap, "You're suddenly somewhere else... and someone else?!") + + to_chat(user, "Suddenly you're staring at [src] again... where are you, who are you?!") + stored_swap = null /obj/item/weapon/spellbook/oneuse/forcewall @@ -778,7 +803,8 @@ /obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) ..() - user <<"You suddenly feel very solid!" + to_chat(user, "You suddenly feel very solid!") + var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) S.timer = 30 user.drop_item() @@ -792,7 +818,8 @@ /obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) ..() - user <<"You're knocked down!" + to_chat(user, "You're knocked down!") + user.Weaken(20) /obj/item/weapon/spellbook/oneuse/horsemask @@ -803,7 +830,8 @@ /obj/item/weapon/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) if(istype(user, /mob/living/carbon/human)) - user <<"HOR-SIE HAS RISEN" + to_chat(user, "HOR-SIE HAS RISEN") + var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead magichead.flags |= NODROP //curses! magichead.flags_inv = null //so you can still see their face @@ -813,7 +841,8 @@ user.equip_to_slot_if_possible(magichead, slot_wear_mask, 1, 1) qdel(src) else - user <<"I say thee neigh" + to_chat(user, "I say thee neigh") + /obj/item/weapon/spellbook/oneuse/charge spell = /obj/effect/proc_holder/spell/targeted/charge @@ -823,7 +852,8 @@ /obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) ..() - user <<"[src] suddenly feels very warm!" + to_chat(user, "[src] suddenly feels very warm!") + empulse(src, 1, 1) /obj/item/weapon/spellbook/oneuse/summonitem @@ -834,7 +864,8 @@ /obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user as mob) ..() - user <<"[src] suddenly vanishes!" + to_chat(user, "[src] suddenly vanishes!") + qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index 37a6c801573..e3a5aadc676 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -17,8 +17,10 @@ var/but_wait_theres_more = 0 /datum/game_mode/wizard/announce() - world << "The current game mode is - Wizard!" - world << "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!" + to_chat(world, "The current game mode is - Wizard!") + + to_chat(world, "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!") + /datum/game_mode/wizard/can_start()//This could be better, will likely have to recode it later @@ -35,7 +37,8 @@ wizard.special_role = "Wizard" wizard.original = wizard.current if(wizardstart.len == 0) - wizard.current << "\red A starting location for you could not be found, please report this bug!" + to_chat(wizard.current, "\red A starting location for you could not be found, please report this bug!") + return 0 return 1 @@ -147,12 +150,15 @@ /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) - wizard.current << "\red You are the Space Wizard!" - wizard.current << "The Space Wizards Federation has given you the following tasks:" + to_chat(wizard.current, "\red You are the Space Wizard!") + + to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") + var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) - wizard.current << "Objective #[obj_count]: [objective.explanation_text]" + to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") + obj_count++ return @@ -195,8 +201,10 @@ wizard_mob.species.equip(wizard_mob) - wizard_mob << "You will find a list of available spells in your spell book. Choose your magic arsenal carefully." - wizard_mob << "In your pockets you will find a teleport scroll. Use it as needed." + to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") + + to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.") + wizard_mob.mind.store_memory("Remember: do not forget to prepare your spells.") wizard_mob.update_icons() return 1 @@ -231,7 +239,8 @@ /datum/game_mode/wizard/declare_completion(var/ragin = 0) if(finished && !ragin) feedback_set_details("round_end_result","loss - wizard killed") - world << "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!" + to_chat(world, "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") + ..() return 1 @@ -282,7 +291,8 @@ i++ text += "
" - world << text + to_chat(world, text) + return 1 //OTHER PROCS @@ -307,13 +317,16 @@ Made a proc so this is not repeated 14 (or more) times.*/ /mob/proc/casting() //Removed the stat check because not all spells require clothing now. if(!istype(usr:wear_suit, /obj/item/clothing/suit/wizrobe)) - usr << "I don't feel strong enough without my robe." + to_chat(usr, "I don't feel strong enough without my robe.") + return 0 if(!istype(usr:shoes, /obj/item/clothing/shoes/sandal)) - usr << "I don't feel strong enough without my sandals." + to_chat(usr, "I don't feel strong enough without my sandals.") + return 0 if(!istype(usr:head, /obj/item/clothing/head/wizard)) - usr << "I don't feel strong enough without my hat." + to_chat(usr, "I don't feel strong enough without my hat.") + return 0 else return 1 diff --git a/code/game/gamemodes/xenos/xenos.dm b/code/game/gamemodes/xenos/xenos.dm index 4ae05c7dd21..fef97333f9c 100644 --- a/code/game/gamemodes/xenos/xenos.dm +++ b/code/game/gamemodes/xenos/xenos.dm @@ -18,8 +18,10 @@ var/gammaratio = 4 //At what alien to human ratio will the Gamma security level be called and the nuke be made available? /datum/game_mode/xenos/announce() - world << "The current game mode is - Xenos!" - world << "There is an Xenomorph attack on the station.
Aliens - Kill or infect the crew. Protect the Queen.
Crew - Protect the station. Exterminate all aliens." + to_chat(world, "The current game mode is - Xenos!") + + to_chat(world, "There is an Xenomorph attack on the station.
Aliens - Kill or infect the crew. Protect the Queen.
Crew - Protect the station. Exterminate all aliens.") + /datum/game_mode/xenos/can_start() if(!..()) @@ -157,20 +159,28 @@ /datum/game_mode/xenos/declare_completion() if(station_was_nuked) feedback_set_details("round_end_result","win - xenos nuked") - world << "Crew Victory" - world << "The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!" + to_chat(world, "Crew Victory") + + to_chat(world, "The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!") + else if(result == 1) feedback_set_details("round_end_result","win - xenos killed") - world << "Crew Victory" - world << "The aliens did not succeed and were exterminated by the crew!" + to_chat(world, "Crew Victory") + + to_chat(world, "The aliens did not succeed and were exterminated by the crew!") + else if(result == 2) feedback_set_details("round_end_result","win - crew killed") - world << "Alien Victory" - world << "The aliens were successful and slaughtered the crew!" + to_chat(world, "Alien Victory") + + to_chat(world, "The aliens were successful and slaughtered the crew!") + else feedback_set_details("round_end_result","win - crew escaped") - world << "Draw" - world << "The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station." + to_chat(world, "Draw") + + to_chat(world, "The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station.") + var/text = "
There were [xenos.len] aliens." text += "
The aliens were:" @@ -186,7 +196,8 @@ else text += "body destroyed" text += ")" - world << text + to_chat(world, text) + ..() return 1 \ No newline at end of file diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index d9de164d5de..3d0458a2227 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -145,7 +145,8 @@ accepted = 1 if("No") if(outoftime) - H << "Welp, out of time, buddy. You're stuck. Next time choose faster." + to_chat(H, "Welp, out of time, buddy. You're stuck. Next time choose faster.") + accepted = 1 if(ticker) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index f5dc80dcae7..b9865a1fcb7 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -17,7 +17,8 @@ var/global/datum/controller/occupations/job_master occupations = list() var/list/all_jobs = subtypesof(/datum/job) if(!all_jobs.len) - world << "\red \b Error setting up jobs, no job datums found" + to_chat(world, "\red \b Error setting up jobs, no job datums found") + return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -383,7 +384,8 @@ var/global/datum/controller/occupations/job_master job.equip(H) job.apply_fingerprints(H) else - H << "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator." + to_chat(H, "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.") + H.job = rank @@ -431,7 +433,8 @@ var/global/datum/controller/occupations/job_master H.mind.store_memory(remembered_info) spawn(0) - H << "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]" + to_chat(H, "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]") + var/alt_title = null if(H.mind) @@ -464,10 +467,13 @@ var/global/datum/controller/occupations/job_master H.equip_to_slot_or_del(BPK, slot_back,1) H.species.equip(H) - H << "You are the [alt_title ? alt_title : rank]." - H << "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this." + to_chat(H, "You are the [alt_title ? alt_title : rank].") + + to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") + if(job.req_admin_notify) - H << "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp." + to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp.") + spawnId(H, rank, alt_title) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 2574e4bdcd0..4d921e617c8 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -24,7 +24,8 @@ var/list/whitelist = list() if(check_rights(R_ADMIN, 0)) return 1 if(!dbcon.IsConnected()) - usr << "\red Unable to connect to whitelist database. Please try again later.
" + to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") + return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT job FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") @@ -69,7 +70,8 @@ var/list/whitelist = list() if(!alien_whitelist) return 0 if(!dbcon.IsConnected()) - usr << "\red Unable to connect to whitelist database. Please try again later.
" + to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") + return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT species FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 49c1fb8d325..20d47691204 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -60,7 +60,8 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) - user << "Open the maintenance panel first." + to_chat(user, "Open the maintenance panel first.") + return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -92,7 +93,8 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return src.ui_interact(user) @@ -220,7 +222,8 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) - user << "Open the maintenance panel first." + to_chat(user, "Open the maintenance panel first.") + return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -252,7 +255,8 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return src.ui_interact(user) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 7b7aa831a46..0853e20e8ee 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -45,7 +45,8 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if (HULK in usr.mutations) - usr << text("\blue You destroy the table.") + to_chat(usr, text("\blue You destroy the table.")) + visible_message("\red [usr] destroys the operating table!") src.density = 0 qdel(src) @@ -129,18 +130,21 @@ if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "You deconstruct the table." + to_chat(user, "You deconstruct the table.") + new /obj/item/stack/sheet/plasteel(loc, 5) qdel(src) /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) if(src.victim && get_turf(victim) == get_turf(src) && victim.lying) - usr << "The table is already occupied!" + to_chat(usr, "The table is already occupied!") + return 0 if(patient.buckled) - usr << "Unbuckle first!" + to_chat(usr, "Unbuckle first!") + return 0 return 1 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index e34303b725b..0a3ca9cc383 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -43,7 +43,8 @@ /obj/machinery/pdapainter/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/device/pda)) if(storedpda) - user << "There is already a PDA inside." + to_chat(user, "There is already a PDA inside.") + return else var/obj/item/device/pda/P = usr.get_active_hand() @@ -72,7 +73,8 @@ storedpda.desc = P.desc else - user << "The [src] is empty." + to_chat(user, "The [src] is empty.") + /obj/machinery/pdapainter/verb/ejectpda() @@ -85,7 +87,8 @@ storedpda = null update_icon() else - usr << "The [src] is empty." + to_chat(usr, "The [src] is empty.") + /obj/machinery/pdapainter/power_change() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index b743b26fc8f..fea7daeb956 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -83,7 +83,8 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(dir == 4) orient = "LEFT" @@ -109,7 +110,8 @@ return if (panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if (!src.connected) @@ -226,7 +228,8 @@ return 1 if(panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") + return 0 if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) @@ -234,11 +237,13 @@ if (src.connected) if (src.connected.occupant) if (src.connected.occupant.stat == DEAD) - usr << "This person has no life for to preserve anymore. Take them to a department capable of reanimating them." + to_chat(usr, "This person has no life for to preserve anymore. Take them to a department capable of reanimating them.") + else if(src.connected.occupant.health > src.connected.min_health || (href_list["chemical"] in connected.emergency_chems)) src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"])) else - usr << "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!" + to_chat(usr, "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!") + if (href_list["removebeaker"]) src.connected.remove_beaker() if (href_list["togglefilter"]) @@ -351,7 +356,8 @@ if(world.timeofday > (R.last_addiction_dose + ADDICTION_SPEEDUP_TIME)) // 2.5 minutes addiction_removal_chance = 10 if(prob(addiction_removal_chance)) - occupant << "You no longer feel reliant on [R.name]!" + to_chat(occupant, "You no longer feel reliant on [R.name]!") + occupant.reagents.addiction_list.Remove(R) updateDialog() @@ -371,7 +377,8 @@ if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(!beaker) if (!user.drop_item()) - user << "\The [G] is stuck to you!" + to_chat(user, "\The [G] is stuck to you!") + return beaker = G @@ -380,22 +387,26 @@ return else - user << "The sleeper has a beaker already." + to_chat(user, "The sleeper has a beaker already.") + return if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "sleeper-o", "sleeper-open", G) return if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) - user << "The scanner is occupied." + to_chat(user, "The scanner is occupied.") + return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(dir == 4) orient = "LEFT" @@ -412,23 +423,27 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(!ismob(G:affecting)) return if(src.occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") + return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head." + to_chat(usr, "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head.") + return visible_message("[user] starts putting [G:affecting:name] into the sleeper.") if(do_after(user, 20, target = G:affecting)) if(src.occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") + return if(!G || !G:affecting) return var/mob/M = G:affecting @@ -438,7 +453,8 @@ M.forceMove(src) src.occupant = M src.icon_state = "sleeper" - M << "You feel cool air surround you. You go numb as your senses turn inward." + to_chat(M, "You feel cool air surround you. You go numb as your senses turn inward.") + src.add_fingerprint(user) qdel(G) @@ -520,7 +536,8 @@ /obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount) if (!(chemical in injection_chems)) - user << "The sleeper does not offer that chemical!" + to_chat(user, "The sleeper does not offer that chemical!") + return if(src.occupant) @@ -529,13 +546,16 @@ src.occupant.reagents.add_reagent(chemical, amount) return else - user << "You can not inject any more of this chemical." + to_chat(user, "You can not inject any more of this chemical.") + return else - user << "The patient rejects the chemicals!" + to_chat(user, "The patient rejects the chemicals!") + return else - user << "There's no occupant in the sleeper!" + to_chat(user, "There's no occupant in the sleeper!") + return /obj/machinery/sleeper/verb/eject() @@ -580,20 +600,24 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(occupant) - user << "The sleeper is already occupied!" + to_chat(user, "The sleeper is already occupied!") + return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") + return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the sleeper because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the sleeper because they have a slime latched onto their head.") + return if(L == user) visible_message("[user] starts climbing into the sleeper.") @@ -602,7 +626,8 @@ if(do_after(user, 20, target = L)) if(src.occupant) - user << ">The sleeper is already occupied!" + to_chat(user, ">The sleeper is already occupied!") + return if(!L) return @@ -612,7 +637,8 @@ L.forceMove(src) src.occupant = L src.icon_state = "sleeper" - L << "You feel cool air surround you. You go numb as your senses turn inward." + to_chat(L, "You feel cool air surround you. You go numb as your senses turn inward.") + src.add_fingerprint(user) if(user.pulling == L) user.stop_pulling() @@ -629,21 +655,25 @@ if(usr.stat != 0 || !(ishuman(usr))) return if(src.occupant) - usr << "The sleeper is already occupied!" + to_chat(usr, "The sleeper is already occupied!") + return if (panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") + return if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") + return visible_message("[usr] starts climbing into the sleeper.") if(do_after(usr, 20, target = usr)) if(src.occupant) - usr << "The sleeper is already occupied!" + to_chat(usr, "The sleeper is already occupied!") + return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 21f66a0a148..3cce5ec7cac 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -42,17 +42,20 @@ /obj/machinery/bodyscanner/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob) if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G) return if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) - user << "The scanner is occupied." + to_chat(user, "The scanner is occupied.") + return if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(dir == 4) dir = 8 @@ -68,20 +71,24 @@ if(istype(G, /obj/item/weapon/grab)) var/obj/item/weapon/grab/TYPECAST_YOUR_SHIT = G if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(!ismob(TYPECAST_YOUR_SHIT.affecting)) return if(occupant) - user << "The scanner is already occupied!" + to_chat(user, "The scanner is already occupied!") + return for(var/mob/living/carbon/slime/M in range(1, TYPECAST_YOUR_SHIT.affecting)) if(M.Victim == TYPECAST_YOUR_SHIT.affecting) - user << "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first." + to_chat(user, "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first.") + return var/mob/M = TYPECAST_YOUR_SHIT.affecting if(M.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") + return /*if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -105,20 +112,24 @@ if(!ishuman(user) && !isrobot(user)) return 0 //not a borg or human if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return 0 //panel open if(occupant) - user << "\The [src] is already occupied." + to_chat(user, "\The [src] is already occupied.") + return 0 //occupied if(O.buckled) return 0 if(O.abiotic()) - user << "Subject cannot have abiotic items on." + to_chat(user, "Subject cannot have abiotic items on.") + return 0 for(var/mob/living/carbon/slime/M in range(1, O)) if(M.Victim == O) - user << "[O] has a fucking slime attached to them, deal with that first." + to_chat(user, "[O] has a fucking slime attached to them, deal with that first.") + return 0 if(O == user) @@ -268,7 +279,8 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(dir == 4) dir = 8 @@ -292,7 +304,8 @@ return if (panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return if(!src.connected) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 54fd1edeaf3..912a854c12c 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -36,7 +36,8 @@ else // trying to unlock the interface if (src.allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the device." + to_chat(user, "You [ locked ? "lock" : "unlock"] the device.") + if (locked) if (user.machine==src) user.unset_machine() @@ -45,7 +46,8 @@ if (user.machine==src) src.attack_hand(usr) else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return return @@ -57,7 +59,8 @@ return if ( (get_dist(src, user) > 1 )) if (!istype(user, /mob/living/silicon)) - user << text("Too far away.") + to_chat(user, text("Too far away.")) + user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -67,7 +70,8 @@ if (istype(loc, /turf)) loc = loc:loc if (!istype(loc, /area)) - user << text("Turret badly positioned - loc.loc is [].", loc) + to_chat(user, text("Turret badly positioned - loc.loc is [].", loc)) + return var/area/area = loc var/t = "AI Liquid Dispenser ([area.name])
" @@ -87,7 +91,8 @@ return 1 if (src.locked) if (!istype(usr, /mob/living/silicon)) - usr << "Control panel is locked!" + to_chat(usr, "Control panel is locked!") + return if (href_list["toggleOn"]) src.disabled = !src.disabled diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index cff929346b8..60e98f0bdd2 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -430,7 +430,8 @@ signal.data["sigtype"] = "command" radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) -// world << text("Signal [] Broadcasted to []", command, target) +// to_chat(world, text("Signal [] Broadcasted to []", command, target)) + return 1 @@ -854,7 +855,8 @@ return STATUS_CLOSE if(aidisabled && (isAI(user) || isrobot(user))) - user << "AI control for \the [src] interface has been disabled." + to_chat(user, "AI control for \the [src] interface has been disabled.") + return STATUS_CLOSE . = shorted ? STATUS_DISABLED : STATUS_INTERACTIVE @@ -988,7 +990,8 @@ return input_temperature = input_temperature + T0C if(input_temperature > max_temperature || input_temperature < min_temperature) - usr << "Temperature must be between [min_temperature_c]C and [max_temperature_c]C" + to_chat(usr, "Temperature must be between [min_temperature_c]C and [max_temperature_c]C") + else target_temperature = input_temperature return 1 @@ -1007,9 +1010,11 @@ switch(buildstage) if(2) if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up. - //user << "You pop the Air Alarm's maintence panel open." +// to_chat(user, "You pop the Air Alarm's maintence panel open.") + wiresexposed = !wiresexposed - user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" + to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") + update_icon() return @@ -1027,15 +1032,18 @@ if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card if(stat & (NOPOWER|BROKEN)) - user << "It does nothing" + to_chat(user, "It does nothing") + return else if(allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked - user << "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface." + to_chat(user, "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface.") + updateUsrDialog() else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return @@ -1044,10 +1052,12 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) - user << "You need more cable for this!" + to_chat(user, "You need more cable for this!") + return - user << "You wire \the [src]!" + to_chat(user, "You wire \the [src]!") + coil.amount -= 5 if(!coil.amount) qdel(coil) @@ -1058,10 +1068,12 @@ return else if(istype(W, /obj/item/weapon/crowbar)) - user << "You start prying out the circuit." + to_chat(user, "You start prying out the circuit.") + playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,20, target = src)) - user << "You pry out the circuit!" + to_chat(user, "You pry out the circuit!") + var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics() circuit.loc = user.loc buildstage = 0 @@ -1069,14 +1081,16 @@ return if(0) if(istype(W, /obj/item/weapon/airalarm_electronics)) - user << "You insert the circuit!" + to_chat(user, "You insert the circuit!") + qdel(W) buildstage = 1 update_icon() return else if(istype(W, /obj/item/weapon/wrench)) - user << "You remove the fire alarm assembly from the wall!" + to_chat(user, "You remove the fire alarm assembly from the wall!") + new /obj/item/mounted/frame/alarm_frame(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) qdel(src) @@ -1094,9 +1108,11 @@ /obj/machinery/alarm/examine(mob/user) ..(user) if (buildstage < 2) - user << "It is not wired." + to_chat(user, "It is not wired.") + if (buildstage < 1) - user << "The circuit is missing." + to_chat(user, "The circuit is missing.") + /* AIR ALARM CIRCUIT diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 97a99e7899d..23a9dc6ee3a 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -73,10 +73,12 @@ obj/machinery/air_sensor return 1 if(istype(W, /obj/item/weapon/wrench)) if(bolts) - usr << "The [src] is bolted to the floor! You can't detach it like this." + to_chat(usr, "The [src] is bolted to the floor! You can't detach it like this.") + return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + to_chat(user, "\blue You begin to unfasten \the [src]...") + if(do_after(user, 40, target = src)) user.visible_message("[user] unfastens \the [src].", "\blue You have unfastened \the [src].", "You hear ratchet.") new /obj/item/pipe_gsensor(src.loc) @@ -299,7 +301,8 @@ legend { if(!isnull(G.id_tag) && G.frequency == frequency) sensor_list|=G.id_tag if(!sensor_list.len) - user << "No sensors on this frequency." + to_chat(user, "No sensors on this frequency.") + return MT_ERROR // Have the user pick one of them and name its label @@ -320,7 +323,8 @@ legend { if(!isnull(G.id_tag) && G.frequency == frequency) sensor_list|=G.id_tag if(!sensor_list.len) - user << "No sensors on this frequency." + to_chat(user, "No sensors on this frequency.") + return MT_ERROR var/label = sensors[href_list["edit_sensor"]] var/sensor = input(user, "Select a sensor:", "Sensor Data", href_list["edit_sensor"]) as null|anything in sensor_list diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 0f7688bdadb..4ed251f092c 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -338,7 +338,8 @@ update_flag /obj/machinery/portable_atmospherics/canister/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(iswelder(W) && src.destroyed) if(weld(W, user)) - user << "\blue You salvage whats left of \the [src]" + to_chat(user, "\blue You salvage whats left of \the [src]") + var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(src.loc) M.amount = 3 qdel(src) @@ -360,7 +361,8 @@ update_flag transfer_moles = pressure_delta*thejetpack.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)//Actually transfer the gas var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) - user << "You pulse-pressurize your jetpack from the tank." + to_chat(user, "You pulse-pressurize your jetpack from the tank.") + return ..() @@ -478,7 +480,8 @@ update_flag else name = "canister" else - usr << "\red As you attempted to rename it the pressure rose!" + to_chat(usr, "\red As you attempted to rename it the pressure rose!") + if (href_list["choice"] == "Primary color") if (is_a_color(href_list["icon"],"prim")) @@ -629,7 +632,8 @@ update_flag return 0 // Do after stuff here - user << "You start to slice away at \the [src]..." + to_chat(user, "You start to slice away at \the [src]...") + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 50, target = src)) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index ebf9126017f..578d34fd7e0 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -106,7 +106,8 @@ else t += "The connect error light is blinking." - user << t + to_chat(user, t) + /obj/machinery/meter/Click() if(istype(usr, /mob/living/silicon/ai)) // ghosts can call ..() for examine @@ -123,7 +124,8 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src]..." + to_chat(user, "\blue You begin to unfasten \the [src]...") + if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 92f3cb8211e..6382e7da5df 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -91,21 +91,25 @@ else if (istype(W, /obj/item/weapon/wrench)) if(connected_port) disconnect() - user << "\blue You disconnect [name] from the port." + to_chat(user, "\blue You disconnect [name] from the port.") + update_icon() return else var/obj/machinery/atmospherics/unary/portables_connector/possible_port = locate(/obj/machinery/atmospherics/unary/portables_connector/) in loc if(possible_port) if(connect(possible_port)) - user << "\blue You connect [name] to the port." + to_chat(user, "\blue You connect [name] to the port.") + update_icon() return else - user << "\blue [name] failed to connect to the port." + to_chat(user, "\blue [name] failed to connect to the port.") + return else - user << "\blue Nothing happens." + to_chat(user, "\blue Nothing happens.") + return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index a62f87ee098..8a72b9077f6 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -181,7 +181,8 @@ name = "[name] (ID [id])" /obj/machinery/portable_atmospherics/scrubber/huge/attack_hand(var/mob/user as mob) - usr << "You can't directly interact with this machine. Use the area atmos computer." + to_chat(usr, "You can't directly interact with this machine. Use the area atmos computer.") + /obj/machinery/portable_atmospherics/scrubber/huge/update_icon() src.overlays = 0 @@ -194,15 +195,18 @@ /obj/machinery/portable_atmospherics/scrubber/huge/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) if(stationary) - user << "The bolts are too tight for you to unscrew!" + to_chat(user, "The bolts are too tight for you to unscrew!") + return if(on) - user << "Turn it off first!" + to_chat(user, "Turn it off first!") + return anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index ea9fab11e96..3a1069ab3ad 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -108,7 +108,8 @@ /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) if (busy) - user << "The autolathe is busy. Please wait for completion of previous operation." + to_chat(user, "The autolathe is busy. Please wait for completion of previous operation.") + return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) @@ -143,13 +144,16 @@ var/material_amount = materials.get_item_material_amount(O) if(!material_amount) - user << "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe." + to_chat(user, "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.") + return 1 if(!materials.has_space(material_amount)) - user << "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more." + to_chat(user, "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.") + return 1 if(!user.unEquip(O)) - user << "\The [O] is stuck to you and cannot be placed into the autolathe." + to_chat(user, "\The [O] is stuck to you and cannot be placed into the autolathe.") + return 1 busy = 1 @@ -160,10 +164,12 @@ flick("autolathe_o",src)//plays metal insertion animation if (O.materials[MAT_GLASS]) flick("autolathe_r",src)//plays glass insertion animation - user << "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe." + to_chat(user, "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.") + use_power(inserted*100) else - user << "You insert a material total of [inserted] to the autolathe." + to_chat(user, "You insert a material total of [inserted] to the autolathe.") + use_power(max(500,inserted/10)) qdel(O) busy = 0 @@ -213,7 +219,8 @@ if((queue.len+1) 0) - user << "\red There is already a queen in there." + to_chat(user, "\red There is already a queen in there.") + else health = 10 nutrilevel += 10 user.drop_item() del(O) - user << "\blue You carefully insert the queen into [src], she gets busy making a hive." + to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.") + bees_in_hive = 0 else if(istype(O, /obj/item/beezeez)) beezeez += 100 nutrilevel += 10 user.drop_item() if(health > 0) - user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up." + to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.") + else - user << "\blue You insert [O] into [src]. Now it just needs some bees." + to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.") + del(O) else if(istype(O, /obj/item/weapon/minihoe)) if(health > 0) - user << "\red You begin to dislodge the apiary from the tray, the bees don't like that." + to_chat(user, "\red You begin to dislodge the apiary from the tray, the bees don't like that.") + angry_swarm(user) else - user << "\blue You begin to dislodge the dead apiary from the tray." + to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.") + if(do_after(user, 50, target = src)) new hydrotray_type(src.loc) new /obj/item/apiary(src.loc) - user << "\red You dislodge the apiary from the tray." + to_chat(user, "\red You dislodge the apiary from the tray.") + del(src) else if(istype(O, /obj/item/weapon/bee_net)) var/obj/item/weapon/bee_net/N = O if(N.caught_bees > 0) - user << "\blue You empty the bees into the apiary." + to_chat(user, "\blue You empty the bees into the apiary.") + bees_in_hive += N.caught_bees N.caught_bees = 0 else - user << "\blue There are no more bees in the net." + to_chat(user, "\blue There are no more bees in the net.") + else if(istype(O, /obj/item/weapon/reagent_containers/glass)) var/obj/item/weapon/reagent_containers/glass/G = O if(harvestable_honey > 0) if(health > 0) - user << "\red You begin to harvest the honey. The bees don't seem to like it." + to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.") + angry_swarm(user) else - user << "\blue You begin to harvest the honey." + to_chat(user, "\blue You begin to harvest the honey.") + if(do_after(user,50, target = src)) G.reagents.add_reagent("honey",harvestable_honey) harvestable_honey = 0 - user << "\blue You successfully harvest the honey." + to_chat(user, "\blue You successfully harvest the honey.") + else - user << "\blue There is no honey left to harvest." + to_chat(user, "\blue There is no honey left to harvest.") + else angry_swarm(user) ..() @@ -241,5 +256,6 @@ if(toxic > 0) H.reagents.add_reagent("toxin", toxic) - usr << "\blue You harvest the honeycomb from the hive. There is a wild buzzing!" + to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!") + angry_swarm(usr) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index f63f4e333c1..ea0421a8df1 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -67,15 +67,18 @@ /obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open) if(beaker) - user << "A container is already loaded into the machine." + to_chat(user, "A container is already loaded into the machine.") + return else if(!user.drop_item()) - user << "\The [O] is stuck to you!" + to_chat(user, "\The [O] is stuck to you!") + return O.forceMove(src) beaker = O - user << "You add the container to the machine." + to_chat(user, "You add the container to the machine.") + updateUsrDialog() update_icon() return @@ -93,15 +96,18 @@ else if(istype(O, /obj/item/weapon/crowbar)) else if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + else if(processing) - user << "The biogenerator is currently processing." + to_chat(user, "The biogenerator is currently processing.") + else if(istype(O, /obj/item/weapon/storage/bag/plants)) var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) - user << "The biogenerator is already full! Activate it." + to_chat(user, "The biogenerator is already full! Activate it.") + else for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) if(i >= max_items) @@ -109,24 +115,30 @@ G.forceMove(src) i++ if(i < max_items) - user << "You empty the plant bag into the biogenerator." + to_chat(user, "You empty the plant bag into the biogenerator.") + else if(O.contents.len == 0) - user << "You empty the plant bag into the biogenerator, filling it to its capacity." + to_chat(user, "You empty the plant bag into the biogenerator, filling it to its capacity.") + else - user << "You fill the biogenerator to its capacity." + to_chat(user, "You fill the biogenerator to its capacity.") + else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) && !istype(O, /obj/item/weapon/crowbar)) - user << "You can not put this in [src.name]" + to_chat(user, "You can not put this in [src.name]") + else var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) - user << "The biogenerator is full! Activate it." + to_chat(user, "The biogenerator is full! Activate it.") + else user.unEquip(O) O.forceMove(src) - user << "You put [O.name] in [src.name]" + to_chat(user, "You put [O.name] in [src.name]") + default_deconstruction_crowbar(O) @@ -212,7 +224,8 @@ if (src.stat != 0) //NOPOWER etc return if(src.processing) - usr << "The biogenerator is in the process of working." + to_chat(usr, "The biogenerator is in the process of working.") + return var/S = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index f74e5ca877d..15b89e44df7 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -92,7 +92,8 @@ if (O.client && O.client.eye == src) O.unset_machine() O.reset_view(null) - O << "The screen bursts into static." + to_chat(O, "The screen bursts into static.") + ..() @@ -128,7 +129,8 @@ // DECONSTRUCTION if(istype(W, /obj/item/weapon/screwdriver)) - //user << "You start to [panel_open ? "close" : "open"] the camera's panel." +// to_chat(user, "You start to [panel_open ? "close" : "open"] the camera's panel.") + //if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown panel_open = !panel_open user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", @@ -140,7 +142,8 @@ else if(istype(W, /obj/item/weapon/weldingtool) && wires.CanDeconstruct()) if(weld(W, user)) - user << "You unweld the camera leaving it as just a frame screwed to the wall." + to_chat(user, "You unweld the camera leaving it as just a frame screwed to the wall.") + if(!assembly) assembly = new() assembly.loc = src.loc @@ -154,24 +157,30 @@ if(!isXRay()) upgradeXRay() qdel(W) - user << "[msg]" + to_chat(user, "[msg]") + else - user << "[msg2]" + to_chat(user, "[msg2]") + else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open) if(!isEmpProof()) upgradeEmpProof() - user << "[msg]" + to_chat(user, "[msg]") + qdel(W) else - user << "[msg2]" + to_chat(user, "[msg2]") + else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open) if(!isMotion()) upgradeMotion() - user << "[msg]" + to_chat(user, "[msg]") + qdel(W) else - user << "[msg2]" + to_chat(user, "[msg2]") + // OTHER else if ((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user)) @@ -191,7 +200,8 @@ if(N) itemname = P.name info = N.notehtml - U << "You hold \the [itemname] up to the camera ..." + to_chat(U, "You hold \the [itemname] up to the camera ...") + U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in player_list) if(istype(O, /mob/living/silicon/ai)) @@ -199,24 +209,30 @@ if(AI.control_disabled || (AI.stat == DEAD)) return if(U.name == "Unknown") - AI << "[U] holds \a [itemname] up to one of your cameras ..." + to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") + else - AI << "[U] holds \a [itemname] up to one of your cameras ..." + to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") + AI.last_paper_seen = "[itemname][info]" else if (O.client && O.client.eye == src) - O << "[U] holds \a [itemname] up to one of the cameras ..." + to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...") + O << browse(text("[][]", itemname, info), text("window=[]", itemname)) else if (istype(W, /obj/item/device/camera_bug)) if (!src.can_use()) - user << "Camera non-functional." + to_chat(user, "Camera non-functional.") + return if(istype(src.bug)) - user << "Camera bug removed." + to_chat(user, "Camera bug removed.") + src.bug.bugged_cameras -= src.c_tag src.bug = null else - user << "Camera bugged." + to_chat(user, "Camera bugged.") + src.bug = W src.bug.bugged_cameras[src.c_tag] = src @@ -271,7 +287,8 @@ if (O.client && O.client.eye == src) O.unset_machine() O.reset_view(null) - O << "The screen bursts into static." + to_chat(O, "The screen bursts into static.") + /obj/machinery/camera/proc/triggerCameraAlarm(var/duration = 0) alarm_on = 1 @@ -341,7 +358,8 @@ if(!WT.remove_fuel(0, user)) return 0 - user << "You start to weld [src]..." + to_chat(user, "You start to weld [src]...") + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 100, target = src)) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 46c448f2035..956c17b921d 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -28,7 +28,8 @@ // State 0 if(iswrench(W) && isturf(src.loc)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You wrench the assembly into place." + to_chat(user, "You wrench the assembly into place.") + anchored = 1 state = 1 update_icon() @@ -39,14 +40,16 @@ // State 1 if(iswelder(W)) if(weld(W, user)) - user << "You weld the assembly securely into place." + to_chat(user, "You weld the assembly securely into place.") + anchored = 1 state = 2 return else if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "You unattach the assembly from it's place." + to_chat(user, "You unattach the assembly from it's place.") + anchored = 0 update_icon() state = 0 @@ -57,16 +60,19 @@ if(iscoil(W)) var/obj/item/stack/cable_coil/C = W if(C.use(2)) - user << "You add wires to the assembly." + to_chat(user, "You add wires to the assembly.") + state = 3 else - user << "You need 2 coils of wire to wire the assembly." + to_chat(user, "You need 2 coils of wire to wire the assembly.") + return else if(iswelder(W)) if(weld(W, user)) - user << "You unweld the assembly from it's place." + to_chat(user, "You unweld the assembly from it's place.") + state = 1 anchored = 1 return @@ -79,12 +85,14 @@ var/input = strip_html(input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")) if(!input) - usr << "No input found please hang up and try your call again." + to_chat(usr, "No input found please hang up and try your call again.") + return var/list/tempnetwork = splittext(input, ",") if(tempnetwork.len < 1) - usr << "No network found please hang up and try your call again." + to_chat(usr, "No network found please hang up and try your call again.") + return var/area/camera_area = get_area(src) @@ -119,13 +127,15 @@ new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You cut the wires from the circuits." + to_chat(user, "You cut the wires from the circuits.") + state = 2 return // Upgrades! if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. - user << "You attach \the [W] into the assembly inner circuits." + to_chat(user, "You attach \the [W] into the assembly inner circuits.") + upgrades += W user.drop_item(W) W.loc = src @@ -135,7 +145,8 @@ else if(iscrowbar(W) && upgrades.len) var/obj/U = locate(/obj) in upgrades if(U) - user << "You unattach an upgrade from the assembly." + to_chat(user, "You unattach an upgrade from the assembly.") + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) U.loc = get_turf(src) upgrades -= U @@ -160,7 +171,8 @@ if(!WT.remove_fuel(0, user)) return 0 - user << "You start to weld the [src].." + to_chat(user, "You start to weld the [src]..") + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 20, target = src)) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index f33db20eb67..2f0c8390f21 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -40,7 +40,8 @@ set name = "Show Camera List" if(src.stat == 2) - src << "You can't list the cameras because you are dead!" + to_chat(src, "You can't list the cameras because you are dead!") + return if (!camera || camera == "Cancel") @@ -58,24 +59,29 @@ loc = sanitize(copytext(loc, 1, MAX_MESSAGE_LEN)) if(!loc) - src << "\red Must supply a location name" + to_chat(src, "\red Must supply a location name") + return if(stored_locations.len >= max_locations) - src << "\red Cannot store additional locations. Remove one first" + to_chat(src, "\red Cannot store additional locations. Remove one first") + return if(loc in stored_locations) - src << "\red There is already a stored location by this name" + to_chat(src, "\red There is already a stored location by this name") + return var/L = get_turf(eyeobj) if (InvalidTurf(get_turf(L))) - src << "\red Unable to store this location" + to_chat(src, "\red Unable to store this location") + return stored_locations[loc] = L - src << "Location '[loc]' stored" + to_chat(src, "Location '[loc]' stored") + /mob/living/silicon/ai/proc/sorted_stored_locations() return sortList(stored_locations) @@ -86,7 +92,8 @@ set desc = "Returns to the selected camera location" if (!(loc in stored_locations)) - src << "\red Location [loc] not found" + to_chat(src, "\red Location [loc] not found") + return var/L = stored_locations[loc] @@ -98,11 +105,13 @@ set desc = "Deletes the selected camera location" if (!(loc in stored_locations)) - src << "\red Location [loc] not found" + to_chat(src, "\red Location [loc] not found") + return stored_locations.Remove(loc) - src << "Location [loc] removed" + to_chat(src, "Location [loc] removed") + // Used to allow the AI is write in mob names/camera name from the CMD line. /datum/trackable @@ -153,7 +162,8 @@ set desc = "Select who you would like to track." if(src.stat == DEAD) - src << "You can't track with camera because you are dead!" + to_chat(src, "You can't track with camera because you are dead!") + return if(!target_name) return @@ -166,7 +176,8 @@ if(!cameraFollow) return - src << "Follow camera mode [forced ? "terminated" : "ended"]." + to_chat(src, "Follow camera mode [forced ? "terminated" : "ended"].") + cameraFollow = null /mob/living/silicon/ai/proc/ai_actual_track(mob/living/target) @@ -177,17 +188,20 @@ U.cameraFollow = target U.tracking = 1 - U << "Attempting to track [target.get_visible_name()]..." + to_chat(U, "Attempting to track [target.get_visible_name()]...") + sleep(min(30, get_dist(target, U.eyeobj) / 4)) spawn(15) //give the AI a grace period to stop moving. U.tracking = 0 if(!target || !target.can_track(usr)) - U << "Target is not near any active cameras." + to_chat(U, "Target is not near any active cameras.") + U.cameraFollow = null return - U << "Now tracking [target.get_visible_name()] on camera." + to_chat(U, "Now tracking [target.get_visible_name()] on camera.") + var/cameraticks = 0 spawn(0) @@ -198,11 +212,13 @@ if(!target.can_track(usr)) U.tracking = 1 if(!cameraticks) - U << "Target is not near any active cameras. Attempting to reacquire..." + to_chat(U, "Target is not near any active cameras. Attempting to reacquire...") + cameraticks++ if(cameraticks > 9) U.cameraFollow = null - U << "Unable to reacquire, cancelling track..." + to_chat(U, "Unable to reacquire, cancelling track...") + U.tracking = 0 return else diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 9cce9c200b1..8165a59046f 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -17,7 +17,8 @@ if(charging && !(stat & (BROKEN|NOPOWER)) ) var/newlevel = round(charging.percent() * 4.0 / 99) - //world << "nl: [newlevel]" +// to_chat(world, "nl: [newlevel]") + if(chargelevel != newlevel) @@ -29,9 +30,11 @@ overlays.Cut() examine(mob/user) if(..(user, 5)) - user << "There's [charging ? "a" : "no"] cell in the charger." + to_chat(user, "There's [charging ? "a" : "no"] cell in the charger.") + if(charging) - user << "Current charge: [charging.charge]" + to_chat(user, "Current charge: [charging.charge]") + attackby(obj/item/weapon/W, mob/user, params) if(stat & BROKEN) @@ -39,14 +42,16 @@ if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored) if(charging) - user << "\red There is already a cell in the charger." + to_chat(user, "\red 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! - user << "\red The [name] blinks red as you try to insert the cell!" + to_chat(user, "\red The [name] blinks red as you try to insert the cell!") + return user.drop_item() @@ -57,11 +62,13 @@ updateicon() else if(istype(W, /obj/item/weapon/wrench)) if(charging) - user << "\red Remove the cell first!" + to_chat(user, "\red Remove the cell first!") + return anchored = !anchored - user << "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground" + to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground") + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 75, 1) attack_hand(mob/user) @@ -87,7 +94,8 @@ process() - //world << "ccpt [charging] [stat]" +// to_chat(world, "ccpt [charging] [stat]") + if(!charging || (stat & (BROKEN|NOPOWER)) || !anchored) return diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm index 77cdb0ab286..c48f3f11edb 100644 --- a/code/game/machinery/chiller.dm +++ b/code/game/machinery/chiller.dm @@ -26,11 +26,14 @@ /obj/machinery/space_heater/air_conditioner/examine(mob/user) ..(user) - user << "The air conditioner is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." + to_chat(user, "The air conditioner is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"].") + if(open) - user << "The power cell is [cell ? "installed" : "missing"]." + to_chat(user, "The power cell is [cell ? "installed" : "missing"].") + else - user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" + to_chat(user, "The charge meter reads [cell ? round(cell.percent(),1) : 0]%") + /obj/machinery/space_heater/air_conditioner/emp_act(severity) @@ -45,7 +48,8 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is already a power cell inside." + to_chat(user, "There is already a power cell inside.") + return else // insert cell @@ -58,7 +62,8 @@ user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else - user << "The hatch must be open to insert a power cell." + to_chat(user, "The hatch must be open to insert a power cell.") + return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 5971c758721..137a5c4b217 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -148,11 +148,13 @@ /obj/item/weapon/disk/data/attack_self(mob/user as mob) read_only = !read_only - user << "You flip the write-protect tab to [read_only ? "protected" : "unprotected"]." + to_chat(user, "You flip the write-protect tab to [read_only ? "protected" : "unprotected"].") + /obj/item/weapon/disk/data/examine(mob/user) ..(user) - user << "The write-protect tab is set to [read_only ? "protected" : "unprotected"]." + to_chat(user, "The write-protect tab is set to [read_only ? "protected" : "unprotected"].") + //Health Tracker Implant @@ -182,7 +184,8 @@ return if ((!isnull(occupant)) && (occupant.stat != 2)) var/completion = (100 * ((occupant.health + 100) / (heal_level + 100))) - user << "Current clone cycle is [round(completion)]% complete." + to_chat(user, "Current clone cycle is [round(completion)]% complete.") + return //Clonepod @@ -239,7 +242,8 @@ H.updatehealth() clonemind.transfer_to(H) - H << "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?" + to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") + // -- Mode/mind specific stuff goes here callHook("clone", list(H)) @@ -344,7 +348,8 @@ /obj/machinery/clonepod/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/screwdriver)) if(occupant || mess || locked) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W) return @@ -359,27 +364,32 @@ if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!check_access(W)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return if ((!locked) || (isnull(occupant))) return if ((occupant.health < -20) && (occupant.stat != 2)) - user << "\red Access Refused." + to_chat(user, "\red Access Refused.") + return else locked = 0 - user << "System unlocked." + to_chat(user, "System unlocked.") + //Removing cloning pod biomass else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) - user << "\blue \The [src] processes \the [W]." + to_chat(user, "\blue \The [src] processes \the [W].") + biomass += 50 user.drop_item() qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if(locked && (anchored || occupant)) - user << "\red Can not do that while [src] is in use." + to_chat(user, "\red Can not do that while [src] is in use.") + else if(anchored) anchored = 0 @@ -395,7 +405,8 @@ else if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W M.buffer = src - user << "You load connection data from [src] to [M]." + to_chat(user, "You load connection data from [src] to [M].") + return else ..() @@ -403,7 +414,8 @@ /obj/machinery/clonepod/emag_act(user as mob) if (isnull(occupant)) return - user << "You force an emergency ejection." + to_chat(user, "You force an emergency ejection.") + locked = 0 go_out() return @@ -443,11 +455,13 @@ return if (!(occupant)) - user << "The cloning pod is empty!" + to_chat(user, "The cloning pod is empty!") + return if (locked) - user << "The cloning pod is locked!" + to_chat(user, "The cloning pod is locked!") + return if (occupant.client) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 2ad0eba3a81..6ade8685e74 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -164,8 +164,10 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You vastly increase projector power and override the safety and security protocols." - user << "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator." + to_chat(user, "\blue You vastly increase projector power and override the safety and security protocols.") + + to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.") + log_game("[key_name(usr)] emagged the Holodeck Control Computer") src.updateUsrDialog() @@ -367,7 +369,8 @@ return ..() if (istype(W, /obj/item/weapon/wrench)) - user << "It's a holotable! There are no bolts!" + to_chat(user, "It's a holotable! There are no bolts!") + return /obj/structure/table/holotable/wood @@ -407,7 +410,8 @@ /obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) - user << "It's a holorack! There are no bolts!" + to_chat(user, "It's a holorack! There are no bolts!") + return /obj/item/weapon/holo @@ -467,13 +471,15 @@ icon_state = "sword[item_color]" w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 50, 1) - user << "[src] is now active." + to_chat(user, "[src] is now active.") + else force = 3 icon_state = "sword0" w_class = 2 playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") + if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -503,7 +509,8 @@ if (istype(W, /obj/item/weapon/grab) && get_dist(src,user)<2) var/obj/item/weapon/grab/G = W if(G.state<2) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") + return G.affecting.loc = src.loc G.affecting.Weaken(5) @@ -545,15 +552,18 @@ power_channel = ENVIRON /obj/machinery/readybutton/attack_ai(mob/user as mob) - user << "The station AI is not to interact with these devices" + to_chat(user, "The station AI is not to interact with these devices") + return /obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) - user << "The device is a solid button, there's nothing you can do with it!" + to_chat(user, "The device is a solid button, there's nothing you can do with it!") + /obj/machinery/readybutton/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + to_chat(user, "This device is not powered.") + return currentarea = get_area(src.loc) @@ -561,7 +571,8 @@ qdel(src) if(eventstarted) - usr << "The event has already begun!" + to_chat(usr, "The event has already begun!") + return ready = !ready @@ -591,4 +602,5 @@ qdel(W) for(var/mob/M in currentarea) - M << "FIGHT!" \ No newline at end of file + to_chat(M, "FIGHT!") + diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index 85e483bbfb9..bc010ad8ff5 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -24,42 +24,49 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") + anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) - user << "The welder must be on for this task." + to_chat(user, "The welder must be on for this task.") + return playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(0, user)) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") + new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") + anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") + icon_state = "1" circuit = P user.drop_item() P.loc = src if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") + state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") + state = 1 icon_state = "0" circuit.loc = loc @@ -67,7 +74,8 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") + state = 1 icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -76,16 +84,19 @@ if(do_after(user, 20, target = src)) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") + state = 3 icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) - user << "Get that brain out of there first" + to_chat(user, "Get that brain out of there first") + else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") + state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) @@ -98,42 +109,50 @@ if (P) P:amount -= 2 if(!P:amount) qdel(P) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") + state = 4 icon_state = "4" if(istype(P, /obj/item/weapon/aiModule/purge)) laws.clear_inherent_laws() - usr << "Law module applied." + to_chat(usr, "Law module applied.") + return if(istype(P, /obj/item/weapon/aiModule/freeform)) var/obj/item/weapon/aiModule/freeform/M = P laws.add_inherent_law(M.newFreeFormLaw) - usr << "Added a freeform law." + to_chat(usr, "Added a freeform law.") + return if(istype(P, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = P if(!M.laws) - usr << "This AI module can not be applied directly to AI cores." + to_chat(usr, "This AI module can not be applied directly to AI cores.") + return laws = M.laws if(istype(P, /obj/item/device/mmi) || istype(P, /obj/item/device/mmi/posibrain)) if(!P:brainmob) - user << "\red Sticking an empty [P] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking an empty [P] into the frame would sort of defeat the purpose.") + return if(P:brainmob.stat == 2) - user << "\red Sticking a dead [P] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking a dead [P] into the frame would sort of defeat the purpose.") + return if(jobban_isbanned(P:brainmob, "AI") || jobban_isbanned(P:brainmob,"nonhumandept")) - user << "\red This [P] does not seem to fit." + to_chat(user, "\red This [P] does not seem to fit.") + return if(istype(P, /obj/item/device/mmi/syndie)) - user << "This MMI does not seem to fit!" + to_chat(user, "This MMI does not seem to fit!") + return if(P:brainmob.mind) @@ -143,12 +162,14 @@ user.drop_item() P.loc = src brain = P - usr << "Added [P]." + to_chat(usr, "Added [P].") + icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the brain." + to_chat(user, "\blue You remove the brain.") + brain.loc = loc brain = null icon_state = "3" @@ -156,7 +177,8 @@ if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") + state = 3 if (brain) icon_state = "3b" @@ -167,7 +189,8 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You connect the monitor." + to_chat(user, "You connect the monitor.") + if(!brain) var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) @@ -225,7 +248,8 @@ cores["[D] ([D.loc.loc])"] = D if(!cores.len) - src << "No deactivated AI cores were found." + to_chat(src, "No deactivated AI cores were found.") + var/id = input("Which core?", "Toggle AI Core Latejoin", null) as null|anything in cores if(!id) return @@ -235,10 +259,12 @@ if(D in empty_playable_ai_cores) empty_playable_ai_cores -= D - src << "\The [id] is now not available for latejoining AIs." + to_chat(src, "\The [id] is now not available for latejoining AIs.") + else empty_playable_ai_cores += D - src << "\The [id] is now available for latejoining AIs." + to_chat(src, "\The [id] is now available for latejoining AIs.") + /* @@ -252,7 +278,8 @@ That prevents a few funky behaviors. atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(istype(card)) if(card.flush) - user << "ERROR: AI flush is in progress, cannot execute transfer protocol." + to_chat(user, "ERROR: AI flush is in progress, cannot execute transfer protocol.") + return 0 return 1 @@ -265,8 +292,11 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A AI.control_disabled = 0 AI.aiRadio.disabledAi = 0 AI.loc = loc//To replace the terminal. - AI << "You have been uploaded to a stationary terminal. Remote device connection restored." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + 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.") + qdel(src) else //If for some reason you use an empty card on an empty AI terminal. - user << "There is no AI loaded on this terminal!" + to_chat(user, "There is no AI loaded on this terminal!") + diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 74ea7609137..34c2ceedaed 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -13,9 +13,11 @@ /obj/machinery/computer/aifixer/attackby(I as obj, user as mob, params) if(occupant && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) - user << "The screws on [name]'s screen won't budge." + to_chat(user, "The screws on [name]'s screen won't budge.") + else - user << "The screws on [name]'s screen won't budge and it emits a warning beep." + to_chat(user, "The screws on [name]'s screen won't budge and it emits a warning beep.") + return else ..() @@ -29,7 +31,8 @@ ui_interact(user) else if(mode.kickoff) - user << "You have been locked out from this console!" + to_chat(user, "You have been locked out from this console!") + /obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] @@ -114,24 +117,31 @@ //Downloading AI from card to terminal. if(interaction == AI_TRANS_FROM_CARD) if(stat & (NOPOWER|BROKEN)) - user << "[src] is offline and cannot take an AI at this time!" + to_chat(user, "[src] is offline and cannot take an AI at this time!") + return AI.loc = src occupant = AI AI.control_disabled = 1 AI.aiRadio.disabledAi = 1 - AI << "You have been uploaded to a stationary terminal. Sadly, there is no remote access from here." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + 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.") + update_icon() else //Uploading AI from terminal to card if(occupant && !active) - occupant << "You have been downloaded to a mobile storage device. Still no remote access." - user << "Transfer successful: [occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + to_chat(occupant, "You have been downloaded to a mobile storage device. Still no remote access.") + + to_chat(user, "Transfer successful: [occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") + occupant.loc = card occupant = null update_icon() else if (active) - user << "ERROR: Reconstruction in progress." + to_chat(user, "ERROR: Reconstruction in progress.") + else if (!occupant) - user << "ERROR: Unable to locate artificial intelligence." + to_chat(user, "ERROR: Unable to locate artificial intelligence.") + diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 7277bc6a366..a9de75bfd03 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -368,18 +368,21 @@ dat += "
You ran out of food and starved." if(emagged) user.nutrition = 0 //yeah you pretty hongry - 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, "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(emagged) var/mob/living/M = user M.adjust_fire_stacks(5) M.IgniteMob() //flew into a star, so you're on fire - user << "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames." + to_chat(user, "You feel an immense wave of heat emanate from the arcade machine. Your skin bursts into flames.") + dat += "

OK...

" if(emagged) - user << "You're never going to make it to Orion..." + to_chat(user, "You're never going to make it to Orion...") + user.death() emagged = 0 //removes the emagged status after you lose playing = 0 //also a new game @@ -447,21 +450,27 @@ switch(event) if(ORION_TRAIL_RAIDERS) if(prob(50)) - 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, "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 - usr << "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there..." + to_chat(usr, "Something strikes you from behind! It hurts like hell and feel like a blunt weapon, but nothing is there...") + M.take_organ_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) - M << "You suddenly feel slightly nauseous." //got off lucky + to_chat(M, "You suddenly feel slightly nauseous.")//got off lucky + + if(severity == 2) - usr << "You suddenly feel extremely nauseous and hunch over until it passes." + to_chat(usr, "You suddenly feel extremely nauseous and hunch over until it passes.") + M.Stun(3) if(severity >= 3) //you didn't pray hard enough - M << "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit." + to_chat(M, "An overpowering wave of nausea consumes over you. You hunch over, your stomach's contents preparing for a spectacular exit.") + M.Stun(5) sleep(30) atom_say("[M] violently throws up!") @@ -477,7 +486,8 @@ M.take_organ_damage(25) playsound(src.loc, 'sound/weapons/Genhit.ogg', 100, 1) else - M << "A violent gale blows past you, and you barely manage to stay standing!" + to_chat(M, "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(src.loc, 'sound/effects/bang.ogg', 100, 1) @@ -956,7 +966,8 @@ /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) - user << "You override the cheat code menu and skip to Cheat #[rand(1, 50)]: Realism Mode." + to_chat(user, "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() @@ -995,9 +1006,11 @@ if(!(in_range(user, src))) return if(!active) - user << "There's a little switch on the bottom. It's flipped down." + to_chat(user, "There's a little switch on the bottom. It's flipped down.") + else - user << "There's a little switch on the bottom. It's flipped up." + to_chat(user, "There's a little switch on the bottom. It's flipped up.") + /obj/item/weapon/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) @@ -1006,7 +1019,8 @@ message_admins("[key_name_admin(usr)] primed an explosive Orion ship for detonation.") log_game("[key_name(usr)] primed an explosive Orion ship for detonation.") - user << "You flip the switch on the underside of [src]." + to_chat(user, "You flip the switch on the underside of [src].") + active = 1 visible_message("[src] softly beeps and whirs to life!") playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8045ed2b9fa..8262c5819e3 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -304,7 +304,8 @@ if("Cancel") return else - user << "DERP! BUG! Report this (And what you were doing to cause it) to Agouri" + to_chat(user, "DERP! BUG! Report this (And what you were doing to cause it) to Agouri") + return /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) @@ -336,9 +337,11 @@ build_path = /obj/machinery/computer/rdconsole/public id = 5 - user << "Access protocols set to [console_choice]." + to_chat(user, "Access protocols set to [console_choice].") + else - user << "Access Denied" + to_chat(user, "Access Denied") + return /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) @@ -347,46 +350,54 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") + src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") + new /obj/item/stack/sheet/metal( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") + src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") + src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + to_chat(user, "\red This frame does not accept circuit boards of this type!") + if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") + src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") + src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -394,7 +405,8 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") + src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -404,13 +416,15 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") + src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") + src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -422,19 +436,22 @@ if(do_after(user, 20, target = src)) if(P) P:use(2) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") + src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") + src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + to_chat(user, "\blue You connect the monitor.") + var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -458,46 +475,54 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") + src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") + new /obj/item/stack/sheet/mineral/bananium( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") + src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "honkcomputer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") + src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + to_chat(user, "\red This frame does not accept circuit boards of this type!") + if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") + src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") + src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -505,7 +530,8 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") + src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -515,13 +541,15 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") + src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") + src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -533,19 +561,22 @@ if(do_after(user, 20, target = src)) if(P) P:use(2) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") + src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") + src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + to_chat(user, "\blue You connect the monitor.") + var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 187e7d28f85..aa061a53a4f 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -61,7 +61,8 @@ /obj/machinery/computer/security/emag_act(user as mob) if(!emagged) emagged = 1 - user << "\blue You have authorized full network access!" + to_chat(user, "\blue You have authorized full network access!") + ui_interact(user) else ui_interact(user) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 0e6e77ec9ec..62828afa084 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -54,7 +54,8 @@ else eyeobj.setLoc(eyeobj.loc) else - user << "The console is already in use!" + to_chat(user, "The console is already in use!") + /mob/camera/aiEye/remote name = "Inactive Camera Eye" diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 33442e8403e..91b5092db88 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -101,19 +101,22 @@ var/time_last_changed_position = 0 if(!usr || usr.stat || usr.lying) return if(scan) - usr << "You remove \the [scan] from \the [src]." + to_chat(usr, "You remove \the [scan] from \the [src].") + scan.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(scan) scan = null else if(modify) - usr << "You remove \the [modify] from \the [src]." + to_chat(usr, "You remove \the [modify] from \the [src].") + modify.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(modify) modify = null else - usr << "There is nothing to remove from the console." + to_chat(usr, "There is nothing to remove from the console.") + return /obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user, params) @@ -322,7 +325,8 @@ var/time_last_changed_position = 0 jobdatum = J break if(!jobdatum) - usr << "\red No log exists for this job: [t1]" + to_chat(usr, "\red No log exists for this job: [t1]") + return access = jobdatum.get_access() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 411673628cc..1252d1617f3 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -87,7 +87,8 @@ user.drop_item() W.loc = src src.diskette = W - user << "You insert [W]." + to_chat(user, "You insert [W].") + nanomanager.update_uis(src) return else if(istype(W, /obj/item/device/multitool)) @@ -98,7 +99,8 @@ pods += P P.connected = src P.name = "[initial(P.name)] #[pods.len]" - user << "You connect [P] to [src]." + to_chat(user, "You connect [P] to [src].") + else ..() return @@ -326,7 +328,9 @@ var/mob/selected = find_dead_player("[C.ckey]") if(!selected) return - selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable + to_chat(selected, 'sound/machines/chime.ogg')//probably not the best sound but I think it's reasonable + + var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod.growclone(C)) temp = "Initiating cloning cycle..." diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ea2dadda3b4..4973d4cb32b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -47,7 +47,8 @@ return 1 else if(message) - user << "Access denied." + to_chat(user, "Access denied.") + return 0 /obj/machinery/computer/communications/Topic(href, href_list) @@ -55,12 +56,14 @@ return 1 if ((!(src.z in config.station_levels) && !(src.z in config.admin_levels))) - usr << "Unable to establish a connection: You're too far away from the station!" + to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + return 1 if(href_list["login"]) if(!ishuman(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") + return var/mob/living/carbon/human/M = usr var/obj/item/card = M.get_active_hand() @@ -96,7 +99,8 @@ if("newalertlevel") if(isAI(usr) || isrobot(usr)) - usr << "Firewalls prevent you from changing the alert level." + to_chat(usr, "Firewalls prevent you from changing the alert level.") + nanomanager.update_uis(src) return 1 tmp_alertlevel = text2num(href_list["level"]) @@ -124,16 +128,19 @@ feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 else - usr << "You are not authorized to do this." + to_chat(usr, "You are not authorized to do this.") + tmp_alertlevel = 0 setMenuState(usr,COMM_SCREEN_MAIN) else - usr << "You need to swipe your ID." + to_chat(usr, "You need to swipe your ID.") + if("announce") if(is_authenticated(usr) == 2) if(message_cooldown) - usr << "Please allow at least one minute to pass between announcements." + to_chat(usr, "Please allow at least one minute to pass between announcements.") + nanomanager.update_uis(src) return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") @@ -158,7 +165,8 @@ if("cancelshuttle") if(isAI(usr) || isrobot(usr)) - usr << "Firewalls prevent you from recalling the shuttle." + to_chat(usr, "Firewalls prevent you from recalling the shuttle.") + nanomanager.update_uis(src) return 1 var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") @@ -215,7 +223,8 @@ if("nukerequest") if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null @@ -223,7 +232,8 @@ nanomanager.update_uis(src) return Nuke_request(input, usr) - usr << "Request sent." + to_chat(usr, "Request sent.") + log_say("[key_name(usr)] has requested the nuclear codes from Centcomm") priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') centcomm_message_cooldown = 1 @@ -234,7 +244,8 @@ if("MessageCentcomm") if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -242,7 +253,8 @@ nanomanager.update_uis(src) return Centcomm_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") + log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -253,7 +265,8 @@ if("MessageSyndicate") if((is_authenticated(usr) == 2) && (src.emagged)) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -261,7 +274,8 @@ nanomanager.update_uis(src) return Syndicate_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") + log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -269,7 +283,8 @@ setMenuState(usr,COMM_SCREEN_MAIN) if("RestoreBackup") - usr << "Backup routing data restored!" + to_chat(usr, "Backup routing data restored!") + src.emagged = 0 setMenuState(usr,COMM_SCREEN_MAIN) @@ -279,7 +294,8 @@ /obj/machinery/computer/communications/emag_act(user as mob) if(!emagged) src.emagged = 1 - user << "You scramble the communication routing circuits!" + to_chat(user, "You scramble the communication routing circuits!") + nanomanager.update_uis(src) /obj/machinery/computer/communications/attack_ai(var/mob/user as mob) @@ -293,7 +309,8 @@ return if (!(src.z in list(ZLEVEL_STATION, ZLEVEL_CENTCOMM))) - user << "Unable to establish a connection: You're too far away from the station!" + to_chat(user, "Unable to establish a connection: You're too far away from the station!") + return ui_interact(user) @@ -397,19 +414,23 @@ /proc/call_shuttle_proc(var/mob/user, var/reason) if(sent_strike_team == 1) - user << "Central Command will not allow the shuttle to be called. Consider all contracts terminated." + to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") + return if(shuttle_master.emergencyNoEscape) - user << "The emergency shuttle may not be sent at this time. Please try again later." + to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") + return if(shuttle_master.emergency.mode > SHUTTLE_ESCAPE) - user << "The emergency shuttle may not be called while returning to Central Command." + to_chat(user, "The emergency shuttle may not be called while returning to Central Command.") + return if(ticker.mode.name == "blob") - user << "Under directive 7-10, [station_name()] is quarantined until further notice." + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return shuttle_master.requestEvac(user, reason) @@ -422,19 +443,23 @@ // if force is 0, some things may stop the shuttle call if(!force) if(shuttle_master.emergencyNoEscape) - user << "Central Command does not currently have a shuttle available in your sector. Please try again later." + to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") + return if(sent_strike_team == 1) - user << "Central Command will not allow the shuttle to be called. Consider all contracts terminated." + to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") + return if(world.time < 54000) // 30 minute grace period to let the game get going - user << "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again." + to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again.") + return if(ticker.mode.name == "epidemic") - user << "Under directive 7-10, [station_name()] is quarantined until further notice." + to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") + return if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 09b2873019a..9d503300cb0 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -120,12 +120,14 @@ for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + new /obj/item/weapon/shard(loc) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + A.state = 4 A.icon_state = "4" qdel(src) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 06e5d102fb2..ab0c29a35aa 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -21,7 +21,8 @@ if(..()) return 1 if (!(src.z in config.station_levels)) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") + return usr.set_machine(src) @@ -46,13 +47,15 @@ if("MessageHonkplanet") if(src.authenticated==1) if(message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + return var/input = stripped_input(usr, "Please choose a message to transmit to your HONKbrothers on the homeworld. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return HONK_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") + log_say("[key_name(usr)] has made a HONKplanet announcement: [input]") message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -63,20 +66,23 @@ /obj/machinery/computer/HONKputer/emag_act(user as mob) if(!emagged) src.emagged = 1 - user << "You scramble the login circuits, allowing anyone to use the console!" + to_chat(user, "You scramble the login circuits, allowing anyone to use the console!") + /obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob) if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") + return user.set_machine(src) var/dat = "HONKputer Interface" if (istype(user, /mob/living/silicon)) - user << "This console is not networked to the rest of the grid." + to_chat(user, "This console is not networked to the rest of the grid.") + return switch(src.state) @@ -104,12 +110,14 @@ for (var/obj/C in src) C.loc = src.loc if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + new /obj/item/weapon/shard( src.loc ) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + A.state = 4 A.icon_state = "4" qdel(src) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index f3ddbe5bb0d..5c0a8774183 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -22,15 +22,18 @@ opened = !opened if(opened) - usr << "\blue The access panel is now open." + to_chat(usr, "\blue The access panel is now open.") + else - usr << "\blue The access panel is now closed." + to_chat(usr, "\blue The access panel is now closed.") + return attackby(obj/item/weapon/O as obj, mob/user as mob, params) if (user.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") + return if(istype(O, /obj/item/weapon/aiModule)) var/datum/game_mode/nations/mode = get_nations_mode() @@ -39,25 +42,30 @@ M.install(src) else if(mode.kickoff) - user << "You have been locked out from modifying the AI's laws!" + to_chat(user, "You have been locked out from modifying the AI's laws!") + else ..() attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(src.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return src.current = select_active_ai(user) if (!src.current) - usr << "No active AIs detected." + to_chat(usr, "No active AIs detected.") + else - usr << "[src.current.name] selected for law changes." + to_chat(usr, "[src.current.name] selected for law changes.") + return attack_ghost(user as mob) @@ -79,25 +87,30 @@ module.install(src) else if(mode.kickoff) - user << "You have been locked out from modifying the borg's laws!" + to_chat(user, "You have been locked out from modifying the borg's laws!") + else return ..() attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(src.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return src.current = freeborg() if (!src.current) - usr << "No free cyborgs detected." + to_chat(usr, "No free cyborgs detected.") + else - usr << "[src.current.name] selected for law changes." + to_chat(usr, "[src.current.name] selected for law changes.") + return attack_ghost(user as mob) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 75c9974bfbb..89e0a8badb2 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -45,7 +45,8 @@ return if(isscrewdriver(O) && emag) //Stops people from just unscrewing the monitor and putting it back to get the console working again. - user << "It is too hot to mess with!" + to_chat(user, "It is too hot to mess with!") + return ..() @@ -72,7 +73,8 @@ update_icon() message = rebootmsg else - user << "A no server error appears on the screen." + to_chat(user, "A no server error appears on the screen.") + /obj/machinery/computer/message_monitor/update_icon() if(emag || hacking) @@ -296,10 +298,12 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) if(isnull(linkedServer)) - user << "Could not complete brute-force: Linked Server Disconnected!" + to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") + else var/currentKey = src.linkedServer.decryptkey - user << "Brute-force completed! The key is '[currentKey]'." + to_chat(user, "Brute-force completed! The key is '[currentKey]'.") + src.hacking = 0 src.icon_screen = normal_icon src.screen = 0 // Return the screen back to normal @@ -518,7 +522,8 @@ if(auth) src.screen = 4 - //usr << href_list["select"] +// to_chat(usr, href_list["select"]) + if (href_list["back"]) src.screen = 0 diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 72e9848e634..5c07b2ed14e 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -276,7 +276,8 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "Access Denied" + to_chat(user, "Access Denied") + return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index d9c8578c853..d20a23d2de1 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -91,7 +91,9 @@ usr.drop_item() I.loc = src inserted_id = I - else usr << "\red No valid ID." + else + to_chat(usr, "\red No valid ID.") + if("1") inserted_id.loc = get_step(src,get_turf(usr)) inserted_id = null @@ -117,7 +119,8 @@ if(src.allowed(usr)) screen = !screen else - usr << "Unauthorized access." + to_chat(usr, "Unauthorized access.") + else if(href_list["warn"]) var/warning = sanitize(copytext(input(usr,"Message:","Enter your message here!",""),1,MAX_MESSAGE_LEN)) @@ -125,7 +128,8 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "You hear a voice in your head saying: '[warning]'" + to_chat(R, "You hear a voice in your head saying: '[warning]'") + src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index e5b8956ad93..f6ea30cc353 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -25,7 +25,8 @@ ui_interact(user) else if(mode.kickoff) - user << "You have been locked out from this console!" + to_chat(user, "You have been locked out from this console!") + /obj/machinery/computer/robotics/proc/is_authenticated(var/mob/user as mob) @@ -59,7 +60,8 @@ var/mob/user = usr if(!is_authenticated(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return // Destroys the cyborg @@ -68,11 +70,13 @@ if(!target || !istype(target)) return if(isAI(user) && (target.connected_ai != user)) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") + return // Cyborgs may blow up themselves via the console if(isrobot(user) && user != target) - user << "Access Denied." + to_chat(user, "Access Denied.") + return var/choice = input("Really detonate [target.name]?") in list ("Yes", "No") if(choice != "Yes") @@ -82,14 +86,17 @@ // Antagonistic cyborgs? Left here for downstream if(target.mind && target.mind.special_role && target.emagged) - target << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered." + to_chat(target, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") + target.ResetSecurityCodes() else message_admins("[key_name_admin(usr)] detonated [key_name_admin(target)] (JMP)!") log_game("\[key_name(usr)] detonated [key_name(target)]!") - target << "Self-destruct command received." + to_chat(target, "Self-destruct command received.") + if(target.connected_ai) - target.connected_ai << "

ALERT - Cyborg detonation detected: [target.name]
" + to_chat(target.connected_ai, "

ALERT - Cyborg detonation detected: [target.name]
") + spawn(10) target.self_destruct() @@ -100,11 +107,13 @@ return if(isAI(user) && (target.connected_ai != user)) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") + return if(isrobot(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") + return var/choice = input("Really [target.lockcharge ? "unlock" : "lockdown"] [target.name] ?") in list ("Yes", "No") @@ -118,9 +127,11 @@ log_game("[key_name(usr)] [target.canmove ? "locked down" : "released"] [key_name(target)]!") target.canmove = !target.canmove target.lockcharge = !target.lockcharge - target << "[!target.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]" + to_chat(target, "[!target.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") + if(target.connected_ai) - target.connected_ai << "[!target.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [target.name]
" + to_chat(target.connected_ai, "[!target.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [target.name]
") + // Remotely hacks the cyborg. Only antag AIs can do this and only to linked cyborgs. else if (href_list["hack"]) @@ -130,15 +141,18 @@ // Antag AI checks if(!istype(user, /mob/living/silicon/ai) || !(user.mind.special_role && user.mind.original == user)) - user << "Access Denied." + to_chat(user, "Access Denied.") + return if(target.connected_ai != user) - user << "Access Denied. This robot is not linked to you." + to_chat(user, "Access Denied. This robot is not linked to you.") + return if(target.emagged) - user << "Robot is already hacked." + to_chat(user, "Robot is already hacked.") + return var/choice = input("Really hack [target.name]? This cannot be undone.") in list("Yes", "No") @@ -151,24 +165,29 @@ message_admins("\blue [key_name_admin(usr)] emagged [key_name_admin(target)] using robotic console!") log_game("[key_name(usr)] emagged [key_name(target)] using robotic console!") target.emagged = 1 - target << "Failsafe protocols overriden. New tools available." + to_chat(target, "Failsafe protocols overriden. New tools available.") + // Arms the emergency self-destruct system else if(href_list["arm"]) if(istype(user, /mob/living/silicon)) - user << "Access Denied." + to_chat(user, "Access Denied.") + return safety = !safety - user << "You [safety ? "disarm" : "arm"] the emergency self destruct." + to_chat(user, "You [safety ? "disarm" : "arm"] the emergency self destruct.") + // Destroys all accessible cyborgs if safety is disabled else if(href_list["nuke"]) if(istype(user, /mob/living/silicon)) - user << "Access Denied" + to_chat(user, "Access Denied") + return if(safety) - user << "Self-destruct aborted - safety active" + to_chat(user, "Self-destruct aborted - safety active") + return message_admins("[key_name_admin(usr)] detonated all cyborgs!") @@ -180,9 +199,11 @@ // Ignore antagonistic cyborgs if(R.scrambledcodes) continue - R << "Self-destruct command received." + to_chat(R, "Self-destruct command received.") + if(R.connected_ai) - R.connected_ai << "

ALERT - Cyborg detonation detected: [R.name]
" + to_chat(R.connected_ai, "

ALERT - Cyborg detonation detected: [R.name]
") + spawn(10) R.self_destruct() diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index adeddde427b..ffbef848e08 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -46,7 +46,8 @@ /obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + return user.set_machine(src) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 06ea4dd8702..e7fc19e9a3c 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -31,7 +31,8 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") + ..() /obj/machinery/computer/secure_data/attack_ai(mob/user as mob) @@ -42,7 +43,8 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") + return var/dat diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 3600503d764..c273102481d 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -30,7 +30,8 @@ usr.drop_item() O.loc = src scan = O - user << "You insert [O]." + to_chat(user, "You insert [O].") + ..() /obj/machinery/computer/skills/attack_ai(mob/user as mob) @@ -41,7 +42,8 @@ if(..()) return if (src.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") + return var/dat diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 3f8692e3697..be2531b76d0 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -89,7 +89,8 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived at Central Command. Operation has ended!" + to_chat(M, "\red You have arrived at Central Command. Operation has ended!") + specops_shuttle_at_station = 0 @@ -137,7 +138,8 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") + return //Begin Marauder launchpad. @@ -231,7 +233,8 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") + for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -247,23 +250,27 @@ var/specops_shuttle_timeleft = 0 return 1 /obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return 1 /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") + else return attack_hand(user) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return //Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle. // if (sent_strike_team == 0 && send_emergency_team == 0) -// usr << "\red The strike team has not yet deployed." +// to_chat(usr, "\red The strike team has not yet deployed.") + // return if(..()) @@ -294,14 +301,18 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\blue Central Command will not allow the Special Operations shuttle to return yet." + to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return yet.") + if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) - usr << "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!" - usr << "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!" + to_chat(usr, "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!") + + to_chat(usr, "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!") + return - usr << "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.") + temp += "Shuttle departing.

OK" updateUsrDialog() @@ -315,10 +326,12 @@ var/specops_shuttle_timeleft = 0 if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") + return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") + temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 001578d1fcd..1c2bb4e52c9 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -140,8 +140,10 @@ td.cost.toomuch { updateUsrDialog() return if(!centcomm_store.PlaceOrder(usr,itemID)) - usr << "\red Unable to charge your account." + to_chat(usr, "\red Unable to charge your account.") + else - usr << "\blue You've successfully purchased the item. It should be in your hands or on the floor." + to_chat(usr, "\blue You've successfully purchased the item. It should be in your hands or on the floor.") + src.updateUsrDialog() return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 76d7bf83a6a..97dbc32a7ac 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -60,7 +60,8 @@ var/syndicate_elite_shuttle_timeleft = 0 if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!syndicate_elite_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") + return sleep(600) @@ -172,7 +173,8 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") + /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -182,22 +184,26 @@ var/syndicate_elite_shuttle_timeleft = 0 return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return 1 /obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") + else return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return // if (sent_syndicate_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// to_chat(usr, "\red The strike team has not yet deployed.") + // return if(..()) @@ -227,17 +233,20 @@ var/syndicate_elite_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return - usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return." + to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.") + return else if (href_list["sendtostation"]) if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!specops_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") + return - usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") + temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index d154a09b02e..38d5c359e2d 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -34,7 +34,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(istype(O, /obj/item)) if(uplinkholder) - user << "The [src] already has an uplink in it." + to_chat(user, "The [src] already has an uplink in it.") + return if(O.hidden_uplink) @@ -46,7 +47,8 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F update_icon() updateUsrDialog() else - user << "The [O] doesn't appear to be an uplink..." + to_chat(user, "The [O] doesn't appear to be an uplink...") + diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 62b090ba1db..ecedaa9b6ce 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -59,7 +59,8 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) - user << "This part is faulty, you cannot add this to the machine!" + to_chat(user, "This part is faulty, you cannot add this to the machine!") + return switch(state) if(1) @@ -67,23 +68,28 @@ var/obj/item/stack/cable_coil/C = P if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You start to add cables to the frame." + to_chat(user, "You start to add cables to the frame.") + if(do_after(user, 20, target = src)) if(C.amount >= 5 && state == 1) C.use(5) - user << "You add cables to the frame." + to_chat(user, "You add cables to the frame.") + state = 2 icon_state = "box_1" else - user << "You need five length of cable to wire the frame." + to_chat(user, "You need five length of cable to wire the frame.") + return else if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P if(G.amount<5) - user << "\red You do not have enough glass to build a display case." + to_chat(user, "\red You do not have enough glass to build a display case.") + return G.use(5) - user << "\blue You add the glass to the frame." + to_chat(user, "\blue You add the glass to the frame.") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/displaycase_frame(src.loc) qdel(src) @@ -91,7 +97,8 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You dismantle the frame." + to_chat(user, "You dismantle the frame.") + new /obj/item/stack/sheet/metal(src.loc, 5) qdel(src) if(2) @@ -99,7 +106,8 @@ var/obj/item/weapon/circuitboard/B = P if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "You add the circuit board to the frame." + to_chat(user, "You add the circuit board to the frame.") + circuit = P user.drop_item() P.loc = src @@ -110,10 +118,12 @@ update_namelist() update_req_desc() else - user << "This frame does not accept circuit boards of this type!" + to_chat(user, "This frame does not accept circuit boards of this type!") + if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You remove the cables." + to_chat(user, "You remove the cables.") + state = 1 icon_state = "box_0" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(src.loc,5) @@ -126,9 +136,11 @@ circuit.loc = src.loc circuit = null if(components.len == 0) - user << "You remove the circuit board." + to_chat(user, "You remove the circuit board.") + else - user << "You remove the circuit board and other components." + to_chat(user, "You remove the circuit board and other components.") + for(var/obj/item/I in components) I.loc = src.loc desc = initial(desc) @@ -177,7 +189,8 @@ for(var/obj/item/weapon/stock_parts/part in added_components) components += part - user << "[part.name] applied." + to_chat(user, "[part.name] applied.") + replacer.play_rped_sound() update_req_desc() @@ -207,7 +220,8 @@ update_req_desc() return 1 if(!success) - user << "You cannot add that to the machine!" + to_chat(user, "You cannot add that to the machine!") + return 0 //Machine Frame Circuit Boards @@ -245,7 +259,8 @@ to destroy them and players will be able to make replacements. /obj/item/weapon/circuitboard/vendor/proc/set_type(typepath, mob/user) build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" - user << "You set the board to [names_paths[build_path]]." + to_chat(user, "You set the board to [names_paths[build_path]].") + req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) /obj/item/weapon/circuitboard/smes @@ -304,11 +319,13 @@ to destroy them and players will be able to make replacements. if(build_path == /obj/machinery/atmospherics/unary/cold_sink/freezer) build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater name = "circuit board (Heater)" - user << "You set the board to heating." + to_chat(user, "You set the board to heating.") + else build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer name = "circuit board (Freezer)" - user << "You set the board to cooling." + to_chat(user, "You set the board to cooling.") + /obj/item/weapon/circuitboard/biogenerator name = "circuit board (Biogenerator)" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 705f997a3eb..3b8c594ac4c 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -97,17 +97,20 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The cryo cell is already occupied!" + to_chat(user, "\blue The cryo cell is already occupied!") + return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) - user << "\red Subject cannot have abiotic items on." + to_chat(user, "\red Subject cannot have abiotic items on.") + return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the cryo cell because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the cryo cell because they have a slime latched onto their head.") + return if(put_mob(L)) if(L == user) @@ -161,7 +164,8 @@ return if(panel_open) - usr << "\blue Close the maintenance panel first." + to_chat(usr, "\blue Close the maintenance panel first.") + return ui_interact(user) @@ -273,10 +277,12 @@ /obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob, params) if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "\red A beaker is already loaded into the machine." + to_chat(user, "\red A beaker is already loaded into the machine.") + return if(!user.drop_item()) - user << "The [G] is stuck to you!" + to_chat(user, "The [G] is stuck to you!") + return G.forceMove(src) beaker = G @@ -285,7 +291,8 @@ if (istype(G, /obj/item/weapon/screwdriver)) if(occupant || on) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "pod0-o", "pod0", G) return @@ -297,13 +304,15 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) - user << "\blue Close the maintenance panel first." + to_chat(user, "\blue Close the maintenance panel first.") + return if(!ismob(G:affecting)) return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) - usr << "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head." + to_chat(usr, "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head.") + return var/mob/M = G:affecting if(put_mob(M)) @@ -424,16 +433,20 @@ return /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (!istype(M)) - usr << "\red The cryo cell cannot handle such a lifeform!" + to_chat(usr, "\red The cryo cell cannot handle such a lifeform!") + return if (occupant) - usr << "\red The cryo cell is already occupied!" + to_chat(usr, "\red The cryo cell is already occupied!") + return if (M.abiotic()) - usr << "\red Subject may not have abiotic items on." + to_chat(usr, "\red Subject may not have abiotic items on.") + return if(!node) - usr << "\red The cell is not correctly connected to its pipe network!" + to_chat(usr, "\red The cell is not correctly connected to its pipe network!") + return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -441,7 +454,8 @@ M.stop_pulling() M.forceMove(src) if(M.health > -100 && (M.health < 0 || M.sleeping)) - M << "\blue You feel a cold liquid surround you. Your skin starts to freeze up." + to_chat(M, "\blue You feel a cold liquid surround you. Your skin starts to freeze up.") + occupant = M // M.metabslow = 1 add_fingerprint(usr) @@ -456,7 +470,8 @@ if(usr == occupant)//If the user is inside the tube... if (usr.stat == 2)//and he's not dead.... return - usr << "\blue Release sequence activated. This will take two minutes." + to_chat(usr, "\blue Release sequence activated. This will take two minutes.") + sleep(600) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return @@ -474,7 +489,8 @@ set src in oview(1) for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") + return if (usr.stat != 0 || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 18e028c2ff8..f47b17c7589 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -94,12 +94,14 @@ else if(href_list["item"]) if(!allowed(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") + return if(!allow_items) return if(frozen_items.len == 0) - user << "There is nothing to recover from storage." + to_chat(user, "There is nothing to recover from storage.") + return var/obj/item/I = input(usr, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items @@ -107,7 +109,8 @@ return if(!(I in frozen_items)) - user << "\The [I] is no longer in storage." + to_chat(user, "\The [I] is no longer in storage.") + return visible_message("The console beeps happily as it disgorges \the [I].") @@ -117,12 +120,14 @@ else if(href_list["allitems"]) if(!allowed(user)) - user << "Access Denied." + to_chat(user, "Access Denied.") + return if(!allow_items) return if(frozen_items.len == 0) - user << "There is nothing to recover from storage." + to_chat(user, "There is nothing to recover from storage.") + return visible_message("The console beeps happily as it disgorges the desired objects.") @@ -363,7 +368,8 @@ else if(O.target && istype(O.target,/datum/mind)) if(O.target == occupant.mind) if(O.owner && O.owner.current) - O.owner.current << "You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]..." + to_chat(O.owner.current, "You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]...") + O.target = null spawn(1) //This should ideally fire after the occupant is deleted. if(!O) return @@ -435,7 +441,8 @@ if(istype(G, /obj/item/weapon/grab)) if(occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") + return if(!ismob(G:affecting)) @@ -448,7 +455,8 @@ var/mob/living/M = G:affecting if(!istype(M) || M.stat == DEAD) - user << "Dead people can not be put into cryo." + to_chat(user, "Dead people can not be put into cryo.") + return if(M.client) @@ -466,7 +474,8 @@ if(!M || !G || !G:affecting) return if(src.occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") + return M.loc = src @@ -476,7 +485,8 @@ M.client.eye = src else //because why the fuck would you keep going if the mob isn't in the pod - user << "You stop putting [M] into the cryopod." + to_chat(user, "You stop putting [M] into the cryopod.") + return if(orient_right) @@ -484,8 +494,10 @@ else icon_state = occupied_icon_state - M << "[on_enter_occupant_message]" - M << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(M, "[on_enter_occupant_message]") + + to_chat(M, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + occupant = M time_entered = world.time @@ -495,7 +507,8 @@ for(var/mob/dead/observer/Gh in respawnable_list) //this may not be foolproof but it seemed like a better option than 'in world' if(Gh.key == FT) if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever - Gh << "Warning: Your body has entered cryostorage." + to_chat(Gh, "Warning: Your body has entered cryostorage.") + // Book keeping! log_admin("[key_name(M)] has entered a stasis pod.") @@ -524,7 +537,8 @@ if(!istype(user.loc, /turf) || !istype(O.loc, /turf)) // are you in a container/closet/pod/etc? return if(occupant) - user << "\blue The cryo pod is already occupied!" + to_chat(user, "\blue The cryo pod is already occupied!") + return @@ -533,12 +547,14 @@ return if(L.stat == DEAD) - user << "Dead people can not be put into cryo." + to_chat(user, "Dead people can not be put into cryo.") + return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) - usr << "[L.name] will not fit into the cryo pod because they have a slime latched onto their head." + to_chat(usr, "[L.name] will not fit into the cryo pod because they have a slime latched onto their head.") + return @@ -561,7 +577,8 @@ if(!L) return if(src.occupant) - user << "\The [src] is in use." + to_chat(user, "\The [src] is in use.") + return L.loc = src @@ -569,7 +586,8 @@ L.client.perspective = EYE_PERSPECTIVE L.client.eye = src else - user << "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]" + to_chat(user, "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]") + return if(orient_right) @@ -577,8 +595,10 @@ else icon_state = occupied_icon_state - L << "[on_enter_occupant_message]" - L << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(L, "[on_enter_occupant_message]") + + to_chat(L, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + occupant = L time_entered = world.time @@ -587,7 +607,8 @@ for(var/mob/dead/observer/Gh in respawnable_list) //this may not be foolproof but it seemed like a better option than 'in world' if(Gh.key == FT) if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever - Gh << "Warning: Your body has entered cryostorage." + to_chat(Gh, "Warning: Your body has entered cryostorage.") + // Book keeping! log_admin("[key_name_admin(L)] has entered a stasis pod. (JMP)") @@ -607,7 +628,8 @@ return if(usr != occupant) - usr << "The cryopod is in use and locked!" + to_chat(usr, "The cryopod is in use and locked!") + return if(orient_right) @@ -638,12 +660,14 @@ return if(src.occupant) - usr << "\The [src] is in use." + to_chat(usr, "\The [src] is in use.") + return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) - usr << "You're too busy getting your life sucked out of you." + to_chat(usr, "You're too busy getting your life sucked out of you.") + return visible_message("[usr] starts climbing into \the [src].") @@ -654,7 +678,8 @@ return if(src.occupant) - usr << "\The [src] is in use." + to_chat(usr, "\The [src] is in use.") + return usr.stop_pulling() @@ -668,8 +693,10 @@ else icon_state = occupied_icon_state - usr << "[on_enter_occupant_message]" - usr << "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round." + to_chat(usr, "[on_enter_occupant_message]") + + to_chat(usr, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") + occupant = usr time_entered = world.time diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a9128ff930e..a5d849814df 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -180,10 +180,12 @@ for reference: src.anchored = !src.anchored src.icon_state = "barrier[src.locked]" if ((src.locked == 1.0) && (src.emagged < 2.0)) - user << "Barrier lock toggled on." + to_chat(user, "Barrier lock toggled on.") + return else if ((src.locked == 0.0) && (src.emagged < 2.0)) - user << "Barrier lock toggled off." + to_chat(user, "Barrier lock toggled off.") + return else var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -220,14 +222,16 @@ for reference: if (!emagged) emagged = 1 req_access = null - user << "You break the ID authentication lock on the [src]." + to_chat(user, "You break the ID authentication lock on the [src].") + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() visible_message("\red BZZzZZzZZzZT") else if (src.emagged == 1) src.emagged = 2 - user << "You short out the anchoring mechanism on the [src]." + to_chat(user, "You short out the anchoring mechanism on the [src].") + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 304e38118db..6623e673269 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -35,7 +35,8 @@ if(wires & 2) return src.attack_hand(user) else - user << "Error, no route to host." + to_chat(user, "Error, no route to host.") + /obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) /* For later implementation @@ -69,7 +70,8 @@ return if(!allowed(user) && (wires & 1)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + flick("doorctrl-denied",src) return @@ -149,7 +151,8 @@ if(istype(W, /obj/item/weapon/wrench)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30, target = src)) - user << "You detach \the [src] from the wall." + to_chat(user, "You detach \the [src] from the wall.") + new/obj/item/mounted/frame/driver_button(get_turf(src)) qdel(src) return 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 2fcdd7a7745..ec9b80c26de 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -298,14 +298,16 @@ if(istype(user,/mob/living/carbon/alien) || isrobot(user) || isAI(user)) ..(user) else - user << "You do not know how to operate this airlock's mechanism." + to_chat(user, "You do not know how to operate this airlock's mechanism.") + return /obj/machinery/door/airlock/alien/attackby(C as obj, mob/user as mob, params) if(isalien(user) || isrobot(user) || isAI(user)) ..(C, user) else - user << "You do not know how to operate this airlock's mechanism." + to_chat(user, "You do not know how to operate this airlock's mechanism.") + return @@ -351,7 +353,8 @@ About the new airlock wires panel: else /*if(src.justzap)*/ return else if(user.hallucination > 50 && prob(10) && src.operating == 0) - user << "\red You feel a powerful shock course through your body!" + to_chat(user, "\red You feel a powerful shock course through your body!") + user.adjustStaminaLoss(50) user.AdjustStunned(5) return @@ -463,7 +466,8 @@ About the new airlock wires panel: electrified_timer = addtimer(src, "electrify", SecondsToTicks(duration), 1, 0) if(feedback && message) - usr << message + to_chat(usr, message) + // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise @@ -567,43 +571,55 @@ About the new airlock wires panel: src.aiHacking=1 spawn(20) //TODO: Make this take a minute - user << "Airlock AI control has been blocked. Beginning fault-detection." + to_chat(user, "Airlock AI control has been blocked. Beginning fault-detection.") + sleep(50) if(src.canAIControl()) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + src.aiHacking=0 return else if(!src.canAIHack(user)) - user << "We've lost our connection! Unable to hack airlock." + to_chat(user, "We've lost our connection! Unable to hack airlock.") + src.aiHacking=0 return - user << "Fault confirmed: airlock control wire disabled or cut." + to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") + sleep(20) - user << "Attempting to hack into airlock. This may take some time." + to_chat(user, "Attempting to hack into airlock. This may take some time.") + sleep(200) if(src.canAIControl()) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + src.aiHacking=0 return else if(!src.canAIHack(user)) - user << "We've lost our connection! Unable to hack airlock." + to_chat(user, "We've lost our connection! Unable to hack airlock.") + src.aiHacking=0 return - user << "Upload access confirmed. Loading control program into airlock software." + to_chat(user, "Upload access confirmed. Loading control program into airlock software.") + sleep(170) if(src.canAIControl()) - user << "Alert cancelled. Airlock control has been restored without our assistance." + to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") + src.aiHacking=0 return else if(!src.canAIHack(user)) - user << "We've lost our connection! Unable to hack airlock." + to_chat(user, "We've lost our connection! Unable to hack airlock.") + src.aiHacking=0 return - user << "Transfer complete. Forcing airlock to execute program." + to_chat(user, "Transfer complete. Forcing airlock to execute program.") + sleep(50) //disable blocked control src.aiControlDisabled = 2 - user << "Receiving control information from airlock." + to_chat(user, "Receiving control information from airlock.") + sleep(10) //bring up airlock dialog src.aiHacking = 0 @@ -652,16 +668,19 @@ About the new airlock wires panel: return STATUS_CLOSE if(operating < 0) //emagged - user << "Unable to interface: Internal error." + to_chat(user, "Unable to interface: Internal error.") + return STATUS_CLOSE if(!src.canAIControl()) if(src.canAIHack(user)) src.hack(user) else if (src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it. - user << "Unable to interface: Connection timed out." + to_chat(user, "Unable to interface: Connection timed out.") + else - user << "Unable to interface: Connection refused." + to_chat(user, "Unable to interface: Connection refused.") + return STATUS_CLOSE return ..() @@ -674,13 +693,16 @@ About the new airlock wires panel: switch (href_list["command"]) if("idscan") if(src.isWireCut(AIRLOCK_WIRE_IDSCAN)) - usr << "The IdScan wire has been cut - IdScan feature permanently disabled." + to_chat(usr, "The IdScan wire has been cut - IdScan feature permanently disabled.") + else if(activate && src.aiDisabledIdScanner) src.aiDisabledIdScanner = 0 - usr << "IdScan feature has been enabled." + to_chat(usr, "IdScan feature has been enabled.") + else if(!activate && !src.aiDisabledIdScanner) src.aiDisabledIdScanner = 1 - usr << "IdScan feature has been disabled." + to_chat(usr, "IdScan feature has been disabled.") + if("main_power") if(!main_power_lost_until) src.loseMainPower() @@ -689,38 +711,49 @@ About the new airlock wires panel: src.loseBackupPower() if("bolts") if(src.isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) - usr << "The door bolt control wire has been cut - Door bolts permanently dropped." + to_chat(usr, "The door bolt control wire has been cut - Door bolts permanently dropped.") + else if(activate && src.lock()) - usr << "The door bolts have been dropped." + to_chat(usr, "The door bolts have been dropped.") + else if(!activate && src.unlock()) - usr << "The door bolts have been raised." + to_chat(usr, "The door bolts have been raised.") + if("electrify_temporary") if(activate && src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) - usr << text("The electrification wire is cut - Door permanently electrified.") + to_chat(usr, text("The electrification wire is cut - Door permanently electrified.")) + else if(!activate && electrified_until != 0) - usr << "The door is now un-electrified." + to_chat(usr, "The door is now un-electrified.") + electrify(0) else if(activate) //electrify door for 30 seconds shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") - usr << "The door is now electrified for thirty seconds." + to_chat(usr, "The door is now electrified for thirty seconds.") + electrify(30) if("electrify_permanently") if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) - usr << text("The electrification wire is cut - Cannot electrify the door.") + to_chat(usr, text("The electrification wire is cut - Cannot electrify the door.")) + else if(!activate && electrified_until != 0) - usr << "The door is now un-electrified." + to_chat(usr, "The door is now un-electrified.") + electrify(0) else if(activate) shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") - usr << "The door is now electrified." + to_chat(usr, "The door is now electrified.") + electrify(-1) if("open") if(src.welded) - usr << text("The airlock has been welded shut!") + to_chat(usr, text("The airlock has been welded shut!")) + else if(src.locked) - usr << text("The door bolts are down!") + to_chat(usr, text("The door bolts are down!")) + else if(activate && density) open() else if(!activate && !density) @@ -728,7 +761,8 @@ About the new airlock wires panel: if("safeties") // Safeties! We don't need no stinking safeties! if (src.isWireCut(AIRLOCK_WIRE_SAFETY)) - usr << text("The safety wire is cut - Cannot secure the door.") + to_chat(usr, text("The safety wire is cut - Cannot secure the door.")) + else if (activate && src.safe) safe = 0 else if (!activate && !src.safe) @@ -736,7 +770,8 @@ About the new airlock wires panel: if("timing") // Door speed control if(src.isWireCut(AIRLOCK_WIRE_SPEED)) - usr << text("The timing wire is cut - Cannot alter timing.") + to_chat(usr, text("The timing wire is cut - Cannot alter timing.")) + else if (activate && src.normalspeed) normalspeed = 0 else if (!activate && !src.normalspeed) @@ -744,27 +779,33 @@ About the new airlock wires panel: if("lights") // Bolt lights if(src.isWireCut(AIRLOCK_WIRE_LIGHT)) - usr << "The bolt lights wire has been cut - The door bolt lights are permanently disabled." + to_chat(usr, "The bolt lights wire has been cut - The door bolt lights are permanently disabled.") + else if (!activate && src.lights) lights = 0 - usr << "The door bolt lights have been disabled." + to_chat(usr, "The door bolt lights have been disabled.") + else if (activate && !src.lights) lights = 1 - usr << "The door bolt lights have been enabled." + to_chat(usr, "The door bolt lights have been enabled.") + if("emergency") // Emergency access if (src.emergency) emergency = 0 - usr << "Emergency access has been disabled." + to_chat(usr, "Emergency access has been disabled.") + else emergency = 1 - usr << "Emergency access has been enabled." + to_chat(usr, "Emergency access has been enabled.") + update_icon() return 1 /obj/machinery/door/airlock/attackby(C as obj, mob/user as mob, params) - //world << text("airlock attackby src [] obj [] mob []", src, C, user) +// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) + if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -808,7 +849,8 @@ About the new airlock wires panel: playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] removes the electronics from the airlock assembly.", "You start to remove electronics from the airlock assembly.") if(do_after(user,40, target = src)) - user << "\blue You removed the airlock electronics!" + to_chat(user, "\blue You removed the airlock electronics!") + var/obj/structure/door_assembly/da = new assembly_type(src.loc) da.anchored = 1 @@ -842,9 +884,11 @@ About the new airlock wires panel: qdel(src) return else if(arePowerSystemsOn()) - user << "\blue The airlock's motors resist your efforts to force it." + to_chat(user, "\blue The airlock's motors resist your efforts to force it.") + else if(locked) - user << "\blue The airlock's bolts prevent it from being forced." + to_chat(user, "\blue The airlock's bolts prevent it from being forced.") + else if( !welded && !operating ) if(density) if(beingcrowbarred == 0) //being fireaxe'd @@ -852,7 +896,8 @@ About the new airlock wires panel: if(F.wielded) spawn(0) open(1) else - user << "\red You need to be wielding \the [C] to do that." + to_chat(user, "\red You need to be wielding \the [C] to do that.") + else spawn(0) open(1) else @@ -861,7 +906,8 @@ About the new airlock wires panel: if(F.wielded) spawn(0) close(1) else - user << "\red You need to be wielding \the [C] to do that." + to_chat(user, "\red You need to be wielding \the [C] to do that.") + else spawn(0) close(1) else @@ -988,7 +1034,8 @@ About the new airlock wires panel: update_icon() /obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob, params) - //world << text("airlock attackby src [] obj [] mob []", src, C, user) +// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) + if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -997,11 +1044,13 @@ About the new airlock wires panel: return if(istype(C, /obj/item/weapon/c4)) - user << "The hatch is coated with a product that prevents the shaped charge from sticking!" + to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") + return if(istype(C, /obj/item/mecha_parts/mecha_equipment/tool/rcd) || istype(C, /obj/item/weapon/rcd)) - user << "The hatch is made of an advanced compound that cannot be deconstructed using an RCD." + to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") + return src.add_fingerprint(user) @@ -1021,7 +1070,8 @@ About the new airlock wires panel: /obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob, params) - //world << text("airlock attackby src [] obj [] mob []", src, C, user) +// to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) + if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index e9e1d03831f..23616877584 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -260,7 +260,8 @@ obj/machinery/access_button/attackby(obj/item/I as obj, mob/user as mob, params) obj/machinery/access_button/attack_hand(mob/user) add_fingerprint(usr) if(!allowed(user)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + else if(radio_connection) var/datum/signal/signal = new diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index cc65584c2e3..856bba62002 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -79,7 +79,8 @@ return if(blocked) - user << "\red \The [src] is welded solid!" + to_chat(user, "\red \The [src] is welded solid!") + return var/area/A = get_area_master(src) @@ -142,11 +143,13 @@ return if(user.stat || user.stunned || user.weakened || user.paralysis || get_dist(src, user) > 1) - user << "Sorry, you must remain able bodied and close to \the [src] in order to use it." + to_chat(user, "Sorry, you must remain able bodied and close to \the [src] in order to use it.") + return if(alarmed && density && !access_granted) - user << "Access denied. Please wait for authorities to arrive, or for the alert to clear." + to_chat(user, "Access denied. Please wait for authorities to arrive, or for the alert to clear.") + return else @@ -178,7 +181,8 @@ return //Already doing something or depowered. if(blocked) - user << "\red \The [src] is welded solid!" + to_chat(user, "\red \The [src] is welded solid!") + return var/area/A = get_area_master(src) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 858600b676a..b3520b18d61 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -260,11 +260,13 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(src.density || src.operating) - user << "You need to open the door to access the maintenance panel." + to_chat(user, "You need to open the door to access the maintenance panel.") + return playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) src.p_open = !( src.p_open ) - user << "You [p_open ? "open":"close"] the maintenance panel of the [src.name]." + to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the [src.name].") + return if(istype(I, /obj/item/weapon/crowbar)) @@ -294,11 +296,13 @@ WA.created_name = src.name if(emagged) - user << "You discard the damaged electronics." + to_chat(user, "You discard the damaged electronics.") + qdel(src) return - user << "You removed the airlock electronics!" + to_chat(user, "You removed the airlock electronics!") + var/obj/item/weapon/airlock_electronics/ae if(!electronics) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 643aacaf549..4fe4d4a70da 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -24,11 +24,13 @@ var/list/doppler_arrays = list() if(!anchored && !isinspace()) anchored = 1 power_change() - user << "You fasten [src]." + to_chat(user, "You fasten [src].") + else if(anchored) anchored = 0 power_change() - user << "You unfasten [src]." + to_chat(user, "You unfasten [src].") + playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) /obj/machinery/doppler_array/verb/rotate() diff --git a/code/game/machinery/drying_rack.dm b/code/game/machinery/drying_rack.dm index f8c76de25ff..4ea0b2fc242 100644 --- a/code/game/machinery/drying_rack.dm +++ b/code/game/machinery/drying_rack.dm @@ -37,7 +37,8 @@ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/meat)) user.unEquip(W) del(W) - user << "You add the meat to the drying rack." + to_chat(user, "You add the meat to the drying rack.") + src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -50,7 +51,8 @@ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/grown/grapes)) user.unEquip(W) del(W) - user << "You add the grapes to the drying rack." + to_chat(user, "You add the grapes to the drying rack.") + src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -63,7 +65,8 @@ if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/grown/greengrapes)) user.unEquip(W) del(W) - user << "You add the green grapes to the drying rack." + to_chat(user, "You add the green grapes to the drying rack.") + src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -78,7 +81,8 @@ var/J = W.type var/obj/item/weapon/reagent_containers/food/snacks/grown/B = W B.reagents.trans_to(src, B.reagents.total_volume) - user << "You add the [W] to the drying rack." + to_chat(user, "You add the [W] to the drying rack.") + user.unEquip(W) del(W) src.running = 1 @@ -87,7 +91,8 @@ sleep(60) icon_state = "drying_rack" var/obj/item/weapon/reagent_containers/food/snacks/grown/D = new J(src.loc) - user << "\blue You finish drying the [D]" + to_chat(user, "\blue You finish drying the [D]") + D.icon_state = "[D.icon_state]_dry" D.dry = 1 D.reagents.remove_any(50) @@ -96,10 +101,13 @@ src.running = 0 return else - user << "\red That has already been dried!" + to_chat(user, "\red That has already been dried!") + else - user << "\red Please wait until the last item has dried." + to_chat(user, "\red Please wait until the last item has dried.") + else - user << "\red You cannot add that to the drying rack." + to_chat(user, "\red You cannot add that to the drying rack.") + diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index a78ac2be2d8..1ec59676410 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -140,16 +140,23 @@ /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/proc/print_state() - world << "id_tag: [id_tag]" - world << "dock_state: [dock_state]" - world << "control_mode: [control_mode]" - world << "tag_target: [tag_target]" - world << "response_sent: [response_sent]" + to_chat(world, "id_tag: [id_tag]") + + to_chat(world, "dock_state: [dock_state]") + + to_chat(world, "control_mode: [control_mode]") + + to_chat(world, "tag_target: [tag_target]") + + to_chat(world, "response_sent: [response_sent]") + /datum/computer/file/embedded_program/docking/post_signal(datum/signal/signal, comm_line) - world << "Program [id_tag] sent a message!" + to_chat(world, "Program [id_tag] sent a message!") + print_state() - world << "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"" + to_chat(world, "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") + ..(signal) /obj/machinery/embedded_controller/radio/airlock/docking_port/verb/view_state() diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index 0cffb34dc6f..5fd89767ca4 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -113,16 +113,23 @@ /*** DEBUG VERBS *** /datum/computer/file/embedded_program/docking/multi/proc/print_state() - world << "id_tag: [id_tag]" - world << "dock_state: [dock_state]" - world << "control_mode: [control_mode]" - world << "tag_target: [tag_target]" - world << "response_sent: [response_sent]" + to_chat(world, "id_tag: [id_tag]") + + to_chat(world, "dock_state: [dock_state]") + + to_chat(world, "control_mode: [control_mode]") + + to_chat(world, "tag_target: [tag_target]") + + to_chat(world, "response_sent: [response_sent]") + /datum/computer/file/embedded_program/docking/multi/post_signal(datum/signal/signal, comm_line) - world << "Program [id_tag] sent a message!" + to_chat(world, "Program [id_tag] sent a message!") + print_state() - world << "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"" + to_chat(world, "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") + ..(signal) /obj/machinery/embedded_controller/radio/docking_port_multi/verb/view_state() diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 932562e39ab..12c05170c13 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -239,7 +239,8 @@ received_confirm = 0 /datum/computer/file/embedded_program/docking/proc/force_undock() - //world << "[id_tag]: forcing undock" +// to_chat(world, "[id_tag]: forcing undock") + if (tag_target) send_docking_command(tag_target, "dock_error") reset() diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 113a4f0be9e..553422a33cd 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -89,7 +89,8 @@ FIRE ALARM user.visible_message("\red [user] has disconnected [src]'s detecting unit!", "You have disconnected [src]'s detecting unit.") else if(istype(W, /obj/item/weapon/wirecutters)) // cutting the wires out - user << "You cut the wires!" + to_chat(user, "You cut the wires!") + playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil() new_coil.amount = 5 @@ -100,15 +101,18 @@ FIRE ALARM if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(!coil.use(5)) - user << "You cut the wires!" + to_chat(user, "You cut the wires!") + return buildstage = 2 - user << "You wire \the [src]!" + to_chat(user, "You wire \the [src]!") + update_icon() else if(istype(W, /obj/item/weapon/crowbar)) - user << "You pry out the circuit!" + to_chat(user, "You pry out the circuit!") + playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) spawn(20) var/obj/item/weapon/firealarm_electronics/circuit = new /obj/item/weapon/firealarm_electronics() @@ -117,13 +121,15 @@ FIRE ALARM update_icon() if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) - user << "You insert the circuit!" + to_chat(user, "You insert the circuit!") + qdel(W) buildstage = 1 update_icon() else if(istype(W, /obj/item/weapon/wrench)) - user << "You remove the fire alarm assembly from the wall!" + to_chat(user, "You remove the fire alarm assembly from the wall!") + new /obj/item/mounted/frame/firealarm(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) qdel(src) diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index 08e023851b4..b13dfc3bb07 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -47,13 +47,15 @@ cell.updateicon() src.cell = null - user << "You remove the power cell" + to_chat(user, "You remove the power cell") + updateicon() return if(on) on = 0 - user << "\blue You turn off the light" + to_chat(user, "\blue You turn off the light") + set_light(0) else if(!cell) @@ -61,7 +63,8 @@ if(cell.charge <= 0) return on = 1 - user << "\blue You turn on the light" + to_chat(user, "\blue You turn on the light") + set_light(brightness_on) updateicon() @@ -87,29 +90,35 @@ if (!open) if(unlocked) unlocked = 0 - user << "You screw the battery panel in place." + to_chat(user, "You screw the battery panel in place.") + else unlocked = 1 - user << "You unscrew the battery panel." + to_chat(user, "You unscrew the battery panel.") + if (istype(W, /obj/item/weapon/crowbar)) if(unlocked) if(open) open = 0 overlays = null - user << "You crowbar the battery panel in place." + to_chat(user, "You crowbar the battery panel in place.") + else if(unlocked) open = 1 - user << "You remove the battery panel." + to_chat(user, "You remove the battery panel.") + if (istype(W, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is a power cell already installed." + to_chat(user, "There is a power cell already installed.") + else user.drop_item() W.loc = src cell = W - user << "You insert the power cell." + to_chat(user, "You insert the power cell.") + updateicon() diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 77eed46c4e2..02797bc44b5 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -19,13 +19,18 @@ /obj/item/weapon/card/id/guest/examine(mob/user) ..(user) if (world.time < expiration_time) - user << "This pass expires at [worldtime2text(expiration_time)]." + to_chat(user, "This pass expires at [worldtime2text(expiration_time)].") + else - user << "It expired at [worldtime2text(expiration_time)]." - user << "It grants access to following areas:" + to_chat(user, "It expired at [worldtime2text(expiration_time)].") + + to_chat(user, "It grants access to following areas:") + for (var/A in temp_access) - user << "[get_access_desc(A)]." - user << "Issuing reason: [reason]." + to_chat(user, "[get_access_desc(A)].") + + to_chat(user, "Issuing reason: [reason].") + ///////////////////////////////////////////// //Guest pass terminal//////////////////////// @@ -56,7 +61,8 @@ giver = O updateUsrDialog() else - user << "There is already ID card inside." + to_chat(user, "There is already ID card inside.") + /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob) return attack_hand(user) @@ -118,7 +124,8 @@ if (dur > 0 && dur <= 30) duration = dur else - usr << "Invalid duration." + to_chat(usr, "Invalid duration.") + if ("access") var/A = text2num(href_list["access"]) if (A in accesses) @@ -150,7 +157,8 @@ var/dat = "

Activity log of guest pass terminal #[uid]


" for (var/entry in internal_log) dat += "[entry]
" - //usr << "Printing the log, standby..." +// to_chat(usr, "Printing the log, standby...") + //sleep(50) var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) @@ -176,6 +184,7 @@ pass.reason = reason pass.name = "guest pass #[number]" else - usr << "\red Cannot issue pass without issuing ID." + to_chat(usr, "\red Cannot issue pass without issuing ID.") + updateUsrDialog() return \ No newline at end of file diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 520f2ff4fb7..384168c119f 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -72,13 +72,16 @@ var/const/HOLOPAD_MODE = 0 if(alert(user,"Would you like to request an AI's presence?",,"Yes","No") == "Yes") if(last_request + 200 < world.time) //don't spam the AI with requests you jerk! last_request = world.time - user << "You request an AI's presence." + to_chat(user, "You request an AI's presence.") + var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in living_mob_list) if(!AI.client) continue - AI << "Your presence is requested at \the [area]." + to_chat(AI, "Your presence is requested at \the [area].") + else - user << "A request for AI presence was already sent recently." + to_chat(user, "A request for AI presence was already sent recently.") + /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) @@ -100,9 +103,11 @@ var/const/HOLOPAD_MODE = 0 create_holo(user)//Create one. src.visible_message("A holographic image of [user] flicks to life right before your eyes!") else - user << "\red ERROR: \black Image feed in progress." + to_chat(user, "\red ERROR: \black Image feed in progress.") + else - user << "\red ERROR: \black Unable to project hologram." + to_chat(user, "\red ERROR: \black Unable to project hologram.") + return /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. @@ -252,7 +257,8 @@ Holographic project of everything else. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. hologram.icon = flat_icon - world << "Your icon should appear now." + to_chat(world, "Your icon should appear now.") + return */ diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index e3bb3d32eaa..45f9e2e84b7 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -60,17 +60,20 @@ /obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(src.beaker)) - user << "There is already a reagent container loaded!" + to_chat(user, "There is already a reagent container loaded!") + return if(user.drop_item()) W.forceMove(src) src.beaker = W - user << "You attach \the [W] to \the [src]." + to_chat(user, "You attach \the [W] to \the [src].") + src.update_icon() return else - user << "\The [W] is stuck to you!" + to_chat(user, "\The [W] is stuck to you!") + else return ..() @@ -146,27 +149,34 @@ set src in view(1) if(!istype(usr, /mob/living)) - usr << "\red You can't do that." + to_chat(usr, "\red You can't do that.") + return if(usr.stat) return mode = !mode - usr << "The IV drip is now [mode ? "injecting" : "taking blood"]." + to_chat(usr, "The IV drip is now [mode ? "injecting" : "taking blood"].") + /obj/machinery/iv_drip/examine(mob/user) ..(user) if (!(user in view(2)) && usr != src.loc) return - usr << "The IV drip is [mode ? "injecting" : "taking blood"]." + to_chat(usr, "The IV drip is [mode ? "injecting" : "taking blood"].") + if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) - user << "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid." - else - user << "\blue Attached is an empty [beaker]." - else - user << "\blue No chemicals are attached." + to_chat(user, "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") + + else + to_chat(user, "\blue Attached is an empty [beaker].") + + else + to_chat(user, "\blue No chemicals are attached.") + + + to_chat(user, "\blue [attached ? attached : "No one"] is attached.") - user << "\blue [attached ? attached : "No one"] is attached." diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 037852f463d..2de6678f35d 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -63,11 +63,13 @@ return if(operating) - user << "The gibber is locked and running, wait for it to finish." + to_chat(user, "The gibber is locked and running, wait for it to finish.") + return if(locked) - user << "Wait for [occupant.name] to finish being loaded!" + to_chat(user, "Wait for [occupant.name] to finish being loaded!") + return else @@ -77,7 +79,8 @@ if(istype(P, /obj/item/weapon/grab)) var/obj/item/weapon/grab/G = P if(G.state < 2) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") + return move_into_gibber(user,G.affecting) qdel(G) @@ -110,19 +113,23 @@ /obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim) if(occupant) - user << "The gibber is full, empty it first!" + to_chat(user, "The gibber is full, empty it first!") + return if(operating) - user << "The gibber is locked and running, wait for it to finish." + to_chat(user, "The gibber is locked and running, wait for it to finish.") + return if(!ishuman(victim) || issmall(victim)) - user << "This is not suitable for the gibber!" + to_chat(user, "This is not suitable for the gibber!") + return if(victim.abiotic(1)) - user << "Subject may not have abiotic items on." + to_chat(user, "Subject may not have abiotic items on.") + return user.visible_message("[user] starts to put [victim] into the gibber!") diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm index d88d3a1dc9e..8619b0689be 100644 --- a/code/game/machinery/kitchen/icecream_vat.dm +++ b/code/game/machinery/kitchen/icecream_vat.dm @@ -107,20 +107,26 @@ var/list/ingredients_source = list( if(I.reagents.total_volume < 10) I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) else - user << "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients." + to_chat(user, "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients.") + else - user << "There is not enough icecream left! Insert more milk and ice." + to_chat(user, "There is not enough icecream left! Insert more milk and ice.") + else - user << "[O] already has icecream in it." + to_chat(user, "[O] already has icecream in it.") + else if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(held_container) - user << "You must remove [held_container] from [src] first." + to_chat(user, "You must remove [held_container] from [src] first.") + else if(!user.drop_item()) - user << "\The [O] is stuck to your hand!" + to_chat(user, "\The [O] is stuck to your hand!") + return O.forceMove(src) - user << "You insert [O] into [src]." + to_chat(user, "You insert [O] into [src].") + held_container = O else var/obj/item/weapon/reagent_containers/R = O @@ -151,7 +157,8 @@ var/list/ingredients_source = list( ingredients[CONE_WAFFLE] += amount src.visible_message("[user] cooks up some waffle cones.") else - user << "You require sugar and flour to make waffle cones." + to_chat(user, "You require sugar and flour to make waffle cones.") + if(CONE_CHOC) if(ingredients[FLAVOUR_CHOCOLATE] > 0 && ingredients[CONE_WAFFLE] > 0) var/amount = min(ingredients[CONE_WAFFLE], ingredients[FLAVOUR_CHOCOLATE]) @@ -160,7 +167,8 @@ var/list/ingredients_source = list( ingredients[CONE_CHOC] += amount src.visible_message("[user] cooks up some chocolate cones.") else - user << "You require waffle cones and chocolate flavouring to make chocolate cones." + to_chat(user, "You require waffle cones and chocolate flavouring to make chocolate cones.") + if(ICECREAM_VANILLA) if(ingredients[INGR_ICE] > 0 && ingredients[INGR_MILK] > 0) var/amount = min(ingredients[INGR_ICE], ingredients[INGR_MILK]) @@ -169,7 +177,8 @@ var/list/ingredients_source = list( ingredients[ICECREAM_VANILLA] += amount src.visible_message("[user] whips up some vanilla icecream.") else - user << "You require milk and ice to make vanilla icecream." + to_chat(user, "You require milk and ice to make vanilla icecream.") + updateDialog() /obj/machinery/icecream_vat/Topic(href, href_list) @@ -191,7 +200,8 @@ var/list/ingredients_source = list( I.desc = "Delicious [cone_name] cone, but no ice cream." src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") else - usr << "There are no [cone_name] cones left!" + to_chat(usr, "There are no [cone_name] cones left!") + updateDialog() if(href_list["make"]) diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index e1f7bd7c091..def4500bb3c 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -42,7 +42,8 @@ return 1 else if(!user.unEquip(O)) - user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") + return 0 O.forceMove(src) beaker = O @@ -51,10 +52,12 @@ src.updateUsrDialog() return 0 if (!is_type_in_list(O, allowed_items)) - user << "It doesn't look like that contains any juice." + to_chat(user, "It doesn't look like that contains any juice.") + return 1 if(!user.unEquip(O)) - user << "\the [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") + return 0 O.forceMove(src) src.updateUsrDialog() diff --git a/code/game/machinery/kitchen/kitchen_machine.dm b/code/game/machinery/kitchen/kitchen_machine.dm index 72d8bd22576..8161d18e017 100644 --- a/code/game/machinery/kitchen/kitchen_machine.dm +++ b/code/game/machinery/kitchen/kitchen_machine.dm @@ -68,11 +68,13 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << "\The [src] can now be moved." + to_chat(user, "\The [src] can now be moved.") + return else if(!anchored) anchored = 1 - user << "\The [src] is now secured." + to_chat(user, "\The [src] is now secured.") + return default_deconstruction_crowbar(O) @@ -104,7 +106,8 @@ src.dirty = 0 // just to be sure src.flags = OPENCONTAINER else - user << "It's broken!" + to_chat(user, "It's broken!") + return 1 else if(src.dirty==100) // The machine is all dirty so can't be used! if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them @@ -122,11 +125,13 @@ src.icon_state = off_icon src.flags = OPENCONTAINER else //Otherwise bad luck!! - user << "It's dirty!" + to_chat(user, "It's dirty!") + return 1 else if(is_type_in_list(O,acceptable_items)) if (contents.len>=max_n_of_items) - user << "This [src] is full of ingredients, you cannot put more." + to_chat(user, "This [src] is full of ingredients, you cannot put more.") + return 1 if (istype(O,/obj/item/stack) && O:amount>1) new O.type (src) @@ -136,7 +141,8 @@ "You add one of [O] to \the [src].") else if(!user.drop_item()) - user << "\The [O] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\The [O] is stuck to your hand, you cannot put it in \the [src]") + return 0 O.forceMove(src) @@ -151,15 +157,18 @@ return 1 for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) - user << "Your [O] contains components unsuitable for cookery." + to_chat(user, "Your [O] contains components unsuitable for cookery.") + return 1 //G.reagents.trans_to(src,G.amount_per_transfer_from_this) else if(istype(O,/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O - user << "This is ridiculous. You can not fit \the [G.affecting] in this [src]." + to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") + return 1 else - user << "You have no idea what you can cook with this [O]." + to_chat(user, "You have no idea what you can cook with this [O].") + return 1 src.updateUsrDialog() @@ -343,7 +352,8 @@ if (src.reagents.total_volume) src.dirty++ src.reagents.clear_reagents() - usr << "You dispose of \the [src]'s contents." + to_chat(usr, "You dispose of \the [src]'s contents.") + src.updateUsrDialog() /obj/machinery/kitchen_machine/proc/muck_start() diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index cb8947d20a5..4d2cbca7974 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -53,11 +53,13 @@ var/mob/living/carbon/human/target = grabbed if(issmall(target)) if(target.stat == 0) - user << "The monkey is struggling far too much to put it in the recycler." + to_chat(user, "The monkey is struggling far too much to put it in the recycler.") + else user.drop_item() qdel(target) - user << "You stuff the monkey in the machine." + to_chat(user, "You stuff the monkey in 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 @@ -65,23 +67,29 @@ src.grinded++ sleep(50) pixel_x = initial(pixel_x) - user << "The machine now has [grinded] monkey\s worth of material stored." + to_chat(user, "The machine now has [grinded] monkey\s worth of material stored.") + else - user << "The machine only accepts monkeys!" + to_chat(user, "The machine only accepts monkeys!") + else - user << "The machine only accepts monkeys!" + to_chat(user, "The machine only accepts monkeys!") + return /obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) if (src.stat != 0) //NOPOWER etc return if(grinded >= required_grind) - user << "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube." + to_chat(user, "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube.") + playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1) grinded -= required_grind for(var/i = 0, i < cube_production, i++) // Forgot to fix this bit the first time through new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) - user << "The machine's display flashes that it has [grinded] monkey\s worth of material left." + to_chat(user, "The machine's display flashes that it has [grinded] monkey\s worth of material left.") + else // I'm not sure if the \s macro works with a word in between; I'll play it safe - user << "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded]." + to_chat(user, "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].") + return \ No newline at end of file diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index 87426a7daaa..a3adc7cbae0 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -135,7 +135,8 @@ /obj/machinery/processor/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(src.processing) - user << "\the [src] is already processing something!" + to_chat(user, "\the [src] is already processing something!") + return 1 if(default_deconstruction_screwdriver(user, "processor1", "processor", O)) @@ -158,7 +159,8 @@ var/datum/food_processor_process/P = select_recipe(what) if (!P) - user << "That probably won't blend." + to_chat(user, "That probably won't blend.") + return 1 user.visible_message("\the [user] puts \the [what] into \the [src].", \ @@ -174,11 +176,13 @@ return if(src.processing) - user << "\the [src] is already processing something!" + to_chat(user, "\the [src] is already processing something!") + return 1 if(src.contents.len == 0) - user << "\the [src] is empty." + to_chat(user, "\the [src] is empty.") + return 1 src.processing = 1 user.visible_message("[user] turns on [src].", \ diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 822b32b0226..0cc3e5ce688 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -194,7 +194,8 @@ if(istype(O, /obj/item/weapon/screwdriver) && anchored) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") + overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -215,16 +216,19 @@ return if(stat & NOPOWER) - user << "\The [src] is unpowered and useless." + to_chat(user, "\The [src] is unpowered and useless.") + return if(accept_check(O)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") + return 1 else if(!user.drop_item()) - user << "\The [O] is stuck to you!" + to_chat(user, "\The [O] is stuck to you!") + return O.forceMove(src) @@ -242,7 +246,8 @@ for(var/obj/G in P.contents) if(accept_check(G)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") + return 1 else P.remove_from_storage(G,src) @@ -255,12 +260,14 @@ user.visible_message("[user] loads \the [src] with \the [P].", "You load \the [src] with \the [P].") if(P.contents.len > 0) - user << "Some items are refused." + to_chat(user, "Some items are refused.") + nanomanager.update_uis(src) else - user << "\The [src] smartly refuses [O]." + to_chat(user, "\The [src] smartly refuses [O].") + return 1 /obj/machinery/smartfridge/attack_ai(mob/user as mob) @@ -281,7 +288,8 @@ return if(stat & NOPOWER) - user << "\The [src] is unpowered and useless." + to_chat(user, "\The [src] is unpowered and useless.") + return var/obj/item/weapon/storage/box/pillbottles/P = over_object @@ -289,7 +297,8 @@ for(var/obj/G in P.contents) if(accept_check(G)) if(contents.len >= max_n_of_items) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") + return 1 else P.remove_from_storage(G,src) @@ -303,13 +312,15 @@ "[user] empties \the [P] into \the [src].", \ "You empty \the [P] into \the [src].") if(P.contents.len > 0) - user << "Some items are refused." + to_chat(user, "Some items are refused.") + nanomanager.update_uis(src) /obj/machinery/smartfridge/secure/emag_act(user as mob) emagged = 1 locked = -1 - user << "You short out the product lock on [src]." + to_chat(user, "You short out the product lock on [src].") + /******************* * SmartFridge Menu @@ -408,7 +419,8 @@ return 0 if(usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) if(!allowed(usr) && !emagged && locked != -1 && href_list["vend"]) - usr << "Access denied." + to_chat(usr, "Access denied.") + nanomanager.update_uis(src) return 0 return ..() \ No newline at end of file diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 839c63a6bc9..55c78bb1a17 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -39,7 +39,8 @@ /obj/machinery/light_switch/examine(mob/user) if(..(user, 1)) - user << "A light switch. It is [on? "on" : "off"]." + to_chat(user, "A light switch. It is [on? "on" : "off"].") + /obj/machinery/light_switch/attack_hand(mob/user) diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index ecbdf219cd3..e2735942c79 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -222,7 +222,8 @@ Class Procs: message_admins("set_tag HREF (var attempted to edit: [href_list["set_tag"]]) exploit attempted by [key_name_admin(user)] on [src] (JMP)") return 1 if(!(href_list["set_tag"] in vars)) - usr << "Something went wrong: Unable to find [href_list["set_tag"]] in vars!" + to_chat(usr, "Something went wrong: Unable to find [href_list["set_tag"]] in vars!") + return 1 var/current_tag = src.vars[href_list["set_tag"]] var/newid = copytext(reject_bad_text(input(usr, "Specify the new value", src, current_tag) as null|text),1,MAX_MESSAGE_LEN) @@ -239,13 +240,16 @@ Class Procs: if(!O) return 1 if(!canLink(O)) - usr << "\red You can't link with that device." + to_chat(usr, "\red You can't link with that device.") + return 1 if(unlinkFrom(usr, O)) - usr << "\blue A green light flashes on \the [P], confirming the link was removed." + to_chat(usr, "\blue A green light flashes on \the [P], confirming the link was removed.") + else - usr << "\red A red light flashes on \the [P]. It appears something went wrong when unlinking the two devices." + to_chat(usr, "\red A red light flashes on \the [P]. It appears something went wrong when unlinking the two devices.") + update_mt_menu=1 if("link" in href_list) @@ -253,25 +257,31 @@ Class Procs: if(!O) return 1 if(!canLink(O,href_list)) - usr << "\red You can't link with that device." + to_chat(usr, "\red You can't link with that device.") + return 1 if (isLinkedWith(O)) - usr << "\red A red light flashes on \the [P]. The two devices are already linked." + to_chat(usr, "\red A red light flashes on \the [P]. The two devices are already linked.") + return 1 if(linkWith(usr, O, href_list)) - usr << "\blue A green light flashes on \the [P], confirming the link was added." + to_chat(usr, "\blue A green light flashes on \the [P], confirming the link was added.") + else - usr << "\red A red light flashes on \the [P]. It appears something went wrong when linking the two devices." + to_chat(usr, "\red A red light flashes on \the [P]. It appears something went wrong when linking the two devices.") + update_mt_menu=1 if("buffer" in href_list) P.buffer = src - usr << "\blue A green light flashes, and the device appears in the multitool buffer." + to_chat(usr, "\blue A green light flashes, and the device appears in the multitool buffer.") + update_mt_menu=1 if("flush" in href_list) - usr << "\blue A green light flashes, and the device disappears from the multitool buffer." + to_chat(usr, "\blue A green light flashes, and the device disappears from the multitool buffer.") + P.buffer = null update_mt_menu=1 @@ -338,7 +348,8 @@ Class Procs: return 1 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return 1 if (ishuman(user)) @@ -347,7 +358,8 @@ Class Procs: visible_message("[H] stares cluelessly at [src] and drools.") return 1 else if(prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + to_chat(user, "You momentarily forget how to use [src].") + return 1 if(panel_open) @@ -391,11 +403,13 @@ Class Procs: if(!panel_open) panel_open = 1 icon_state = icon_state_open - user << "You open the maintenance hatch of [src]." + to_chat(user, "You open the maintenance hatch of [src].") + else panel_open = 0 icon_state = icon_state_closed - user << "You close the maintenance hatch of [src]." + to_chat(user, "You close the maintenance hatch of [src].") + return 1 return 0 @@ -403,16 +417,19 @@ Class Procs: if(panel_open && istype(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dir = turn(dir,-90) - user << "You rotate [src]." + to_chat(user, "You rotate [src].") + return 1 return 0 /obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) - user << "Now [anchored ? "un" : ""]securing [name]." + to_chat(user, "Now [anchored ? "un" : ""]securing [name].") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, time, target = src)) - user << "You've [anchored ? "un" : ""]secured [name]." + to_chat(user, "You've [anchored ? "un" : ""]secured [name].") + anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) return 1 @@ -450,7 +467,8 @@ Class Procs: component_parts -= A component_parts += B B.loc = null - user << "[A.name] replaced with [B.name]." + to_chat(user, "[A.name] replaced with [B.name].") + shouldplaysound = 1 break RefreshParts() @@ -463,9 +481,11 @@ Class Procs: return 0 /obj/machinery/proc/display_parts(mob/user) - user << "Following parts detected in the machine:" + to_chat(user, "Following parts detected in the machine:") + for(var/obj/item/C in component_parts) - user << "\icon[C] [C.name]" + to_chat(user, "\icon[C] [C.name]") + /obj/machinery/examine(mob/user) ..(user) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 121b8118de0..c87ecc345b5 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -21,7 +21,8 @@ return 1 if(istype(W, /obj/item/weapon/screwdriver)) - user << "You begin to unscrew the bolts off the [src]..." + to_chat(user, "You begin to unscrew the bolts off the [src]...") + playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 30, target = src)) var/obj/machinery/mass_driver_frame/F = new(get_turf(src)) @@ -69,7 +70,8 @@ /obj/machinery/mass_driver/emag_act(mob/user) if(!emagged) emagged = 1 - user << "You hack the Mass Driver, radically increasing the force at which it'll throw things. Better not stand in its way." + to_chat(user, "You hack the Mass Driver, radically increasing the force at which it'll throw things. Better not stand in its way.") + return 1 return -1 @@ -104,43 +106,53 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) - user << "You begin to cut the frame apart..." + to_chat(user, "You begin to cut the frame apart...") + if(do_after(user, 30, target = src) && (build == 0)) - user << "You detach the plasteel sheets from each others." + to_chat(user, "You detach the plasteel sheets from each others.") + new /obj/item/stack/sheet/plasteel(get_turf(src),3) qdel(src) return 1 if(istype(W, /obj/item/weapon/wrench)) - user << "You begin to anchor \the [src] on the floor." + to_chat(user, "You begin to anchor \the [src] on the floor.") + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 10, target = src) && (build == 0)) - user << "You anchor \the [src]!" + to_chat(user, "You anchor \the [src]!") + anchored = 1 build++ update_icon() return 1 if(1) // Fixed to the floor if(istype(W, /obj/item/weapon/wrench)) - user << "You begin to de-anchor \the [src] from the floor." + to_chat(user, "You begin to de-anchor \the [src] from the floor.") + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 10, target = src) && (build == 1)) build-- update_icon() anchored = 0 - user << "You de-anchored \the [src]!" + to_chat(user, "You de-anchored \the [src]!") + return 1 if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) - user << "You begin to weld \the [src] to the floor..." + to_chat(user, "You begin to weld \the [src] to the floor...") + if(do_after(user, 40, target = src) && (build == 1)) - user << "You welded \the [src] to the floor." + to_chat(user, "You welded \the [src] to the floor.") + build++ update_icon() return 1 @@ -148,46 +160,56 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) - user << "You begin to unweld \the [src] to the floor..." + to_chat(user, "You begin to unweld \the [src] to the floor...") + if(do_after(user, 40, target = src) && (build == 2)) - user << "You unwelded \the [src] to the floor." + to_chat(user, "You unwelded \the [src] to the floor.") + build-- update_icon() if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C=W - user << "You start adding cables to \the [src]..." + to_chat(user, "You start adding cables to \the [src]...") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src) && (C.amount >= 3) && (build == 2)) C.use(3) - user << "You've added cables to \the [src]." + to_chat(user, "You've added cables to \the [src].") + build++ update_icon() if(3) // Wired if(istype(W, /obj/item/weapon/wirecutters)) - user << "You begin to remove the wiring from \the [src]." + to_chat(user, "You begin to remove the wiring from \the [src].") + if(do_after(user, 10, target = src) && (build == 3)) new /obj/item/stack/cable_coil(loc,3) playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) - user << "You've removed the cables from \the [src]." + to_chat(user, "You've removed the cables from \the [src].") + build-- update_icon() return 1 if(istype(W, /obj/item/stack/rods)) var/obj/item/stack/rods/R=W - user << "You begin to complete \the [src]..." + to_chat(user, "You begin to complete \the [src]...") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src) && (R.amount >= 3) && (build == 3)) R.use(3) - user << "You've added the grille to \the [src]." + to_chat(user, "You've added the grille to \the [src].") + build++ update_icon() return 1 if(4) // Grille in place if(istype(W, /obj/item/weapon/crowbar)) - user << "You begin to pry off the grille from \the [src]..." + to_chat(user, "You begin to pry off the grille from \the [src]...") + playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user, 30, target = src) && (build == 4)) new /obj/item/stack/rods(loc,2) @@ -195,7 +217,8 @@ update_icon() return 1 if(istype(W, /obj/item/weapon/screwdriver)) - user << "You finalize the Mass Driver..." + to_chat(user, "You finalize the Mass Driver...") + playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/mass_driver/M = new(get_turf(src)) M.dir = src.dir diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 041e4cfc3d5..ef0a6475972 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -90,12 +90,15 @@ if(open) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked" : "unlocked"]." + to_chat(user, "Controls are now [src.locked ? "locked" : "unlocked"].") + else - user << "Access denied." + to_chat(user, "Access denied.") + updateDialog() else - user << "You must open the cover first!" + to_chat(user, "You must open the cover first!") + return /obj/machinery/navbeacon/attack_ai(mob/user) @@ -113,7 +116,8 @@ return // prevent intraction when T-scanner revealed if(!open && !ai) // can't alter controls if not open, unless you're an AI - user << "The beacon's control cover is closed!" + to_chat(user, "The beacon's control cover is closed!") + return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index b37d4313f6b..133affefb22 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -710,7 +710,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params) if(istype(I, /obj/item/weapon/wrench)) - user << "Now [anchored ? "un" : ""]securing [name]" + to_chat(user, "Now [anchored ? "un" : ""]securing [name]") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 60, target = src)) new /obj/item/mounted/frame/newscaster_frame(loc) @@ -739,7 +740,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co visible_message("[user.name] forcefully slams the [src.name] with the [I.name]!", null, 5 ) playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else - user << "This does nothing." + to_chat(user, "This does nothing.") + src.update_icon() /obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) @@ -863,7 +865,8 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co human_user << browse(dat, "window=newspaper_main;size=300x400") onclose(human_user, "newspaper_main") else - user << "The paper is full of intelligible symbols!" + to_chat(user, "The paper is full of intelligible symbols!") + obj/item/weapon/newspaper/Topic(href, href_list) @@ -901,7 +904,8 @@ obj/item/weapon/newspaper/Topic(href, href_list) obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/pen)) if(src.scribble_page == src.curr_page) - user << "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?" + to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") + else var/s = strip_html( input(user, "Write something", "Newspaper", "") ) s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN)) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 1f1395431d9..59930a57883 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -30,7 +30,8 @@ imap += icon('icons/misc/imap.dmi', "blank") imap += icon('icons/misc/imap.dmi', "blank") - //world << "[icount] images in list" +// to_chat(world, "[icount] images in list") + for(var/wx = 1 ; wx <= world.maxx; wx++) @@ -146,12 +147,14 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //world << "trying [ix],[iy] : [ix+icx*iy]" +// to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") + var/icon/I = imap[1+(ix + icx*iy)*2] var/icon/I2 = imap[2+(ix + icx*iy)*2] - //world << "icon: \icon[I]" +// to_chat(world, "icon: \icon[I]") + I.DrawBox(colour, rx, ry, rx+1, ry+1) @@ -168,7 +171,8 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //world<<"\icon[I] at [H.screen_loc]" +// to_chat(world, "\icon[I] at [H.screen_loc]") + H.name = (i==0)?"maprefresh":"map" @@ -280,11 +284,13 @@ var/rx = ((wx*2+xoff)%32) + 1 var/ry = ((wy*2+yoff)%32) + 1 - //world << "trying [ix],[iy] : [ix+icx*iy]" +// to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") + var/icon/I = imap[1+(ix + icx*iy)] - //world << "icon: \icon[I]" +// to_chat(world, "icon: \icon[I]") + I.DrawBox(colour, rx, ry, rx, ry) @@ -299,7 +305,8 @@ H.screen_loc = "[5 + i%icx],[6+ round(i/icx)]" - //world<<"\icon[I] at [H.screen_loc]" +// to_chat(world, "\icon[I] at [H.screen_loc]") + H.name = (i==0)?"maprefresh":"map" diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 11361034fbb..c20c5b56beb 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -434,7 +434,8 @@ for(var/obj/machinery/atmospherics/M in src.loc) if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe - user << "There is already a pipe of the same type at this location." + to_chat(user, "There is already a pipe of the same type at this location.") + return 1 switch(pipe_type) //What kind of heartless person thought of doing this? @@ -619,11 +620,13 @@ if (!istype(W, /obj/item/weapon/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) - user << "\red You need to fasten it to a pipe" + to_chat(user, "\red You need to fasten it to a pipe") + return 1 new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You have fastened the meter to the pipe" + to_chat(user, "\blue You have fastened the meter to the pipe") + qdel(src) /obj/item/pipe_gsensor @@ -640,7 +643,8 @@ return ..() new/obj/machinery/air_sensor( src.loc ) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You have fastened the gas sensor" + to_chat(user, "\blue You have fastened the gas sensor") + qdel(src) #undef PIPE_SIMPLE_STRAIGHT diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 31b58bcac10..4e7347fdfe0 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -100,14 +100,16 @@ /obj/machinery/pipedispenser/attackby(var/obj/item/W as obj, var/mob/user as mob, params) src.add_fingerprint(usr) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor)) - usr << "\blue You put [W] back to [src]." + to_chat(usr, "\blue You put [W] back to [src].") + user.drop_item() qdel(W) return else if (istype(W, /obj/item/weapon/wrench)) if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src] from the floor..." + to_chat(user, "\blue You begin to unfasten \the [src] from the floor...") + if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ @@ -120,7 +122,8 @@ usr << browse(null, "window=pipedispenser") else /*if (unwrenched==1)*/ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to fasten \the [src] to the floor..." + to_chat(user, "\blue You begin to fasten \the [src] to the floor...") + if (do_after(user, 20, target = src)) user.visible_message( \ "[user] fastens \the [src].", \ diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm index 6679fd3b580..47068c97e9a 100644 --- a/code/game/machinery/podmen.dm +++ b/code/game/machinery/podmen.dm @@ -31,7 +31,8 @@ Growing it to term with nothing injected will grab a ghost from the observers. * if(istype(W,/obj/item/weapon/reagent_containers)) - user << "You inject the contents of the syringe into the seeds." + to_chat(user, "You inject the contents of the syringe into the seeds.") + var/datum/reagent/blood/B @@ -42,7 +43,8 @@ Growing it to term with nothing injected will grab a ghost from the observers. * break if(B) source = B.data["donor"] - user << "The strange, sluglike seeds quiver gently and swell with blood." + to_chat(user, "The strange, sluglike seeds quiver gently and swell with blood.") + if(!source.client && source.mind) for(var/mob/O in respawnable_list) if(O.mind == source.mind && config.revival_pod_plants) @@ -51,10 +53,12 @@ Growing it to term with nothing injected will grab a ghost from the observers. * source.key = O.key return if("No") - user << "The seeds seem to reject the blood, returning to their original size as they stop quivering." + to_chat(user, "The seeds seem to reject the blood, returning to their original size as they stop quivering.") + return else - user << "Nothing happens." + to_chat(user, "Nothing happens.") + return if (!istype(source)) @@ -76,7 +80,8 @@ Growing it to term with nothing injected will grab a ghost from the observers. * if(beingharvested) - user << ("\red You can only harvest the pod once!") + to_chat(user, ("\red You can only harvest the pod once!")) + else user.visible_message("\blue [user] carefully begins to open the pod...","\blue You carefully begin to open the pod...") beingharvested = 1 @@ -123,11 +128,15 @@ Growing it to term with nothing injected will grab a ghost from the observers. * ticker.mode:update_all_cult_icons() //So the icon actually appears // -- End mode specific stuff - podman << "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark." + to_chat(podman, "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark.") + if(source && ckey && podman.ckey == ckey) - podman << "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake." - podman << "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders." - podman << "Too much darkness will send you into shock and starve you, but light will help you heal." + to_chat(podman, "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake.") + + to_chat(podman, "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.") + + to_chat(podman, "Too much darkness will send you into shock and starve you, but light will help you heal.") + else new /mob/living/carbon/monkey/diona(parent.loc) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index e2da5b8beb0..ac9eb4c6793 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -21,16 +21,22 @@ /obj/machinery/poolcontroller/emag_act(user as mob) //Emag_act, this is called when it is hit with a cryptographic sequencer. if(!emagged) //If it is not already emagged, emag it. - user << "You disable \the [src]'s temperature safeguards." //Inform the mob of what emagging does. + to_chat(user, "You disable \the [src]'s temperature safeguards.")//Inform the mob of what emagging does. + + emagged = 1 //Set the emag var to true. /obj/machinery/poolcontroller/attackby(obj/item/P as obj, mob/user as mob, params) //Proc is called when a user hits the pool controller with something. if(istype(P,/obj/item/device/multitool)) //If the mob hits the pool controller with a multitool, reset the emagged status if(emagged) //Check the emag status - user << "You re-enable \the [src]'s temperature safeguards." //Inform the user that they have just fixed the safeguards. + to_chat(user, "You re-enable \the [src]'s temperature safeguards.")//Inform the user that they have just fixed the safeguards. + + emagged = 0 //Set the emagged var to false. else - user << "Nothing happens." //If not emagged, don't do anything, and don't tell the user that it can be emagged. + to_chat(user, "Nothing happens.")//If not emagged, don't do anything, and don't tell the user that it can be emagged. + + else //If it's not a multitool, defer to /obj/machinery/attackby ..() @@ -64,21 +70,27 @@ switch(temperature) //Apply different effects based on what the temperature is set to. if("scalding") //Burn the mob. M.bodytemperature = min(500, M.bodytemperature + 35) //heat mob at 35k(elvin) per cycle - M << "The water is searing hot!" + to_chat(M, "The water is searing hot!") + if("warm") //Gently warm the mob. M.bodytemperature = min(330, M.bodytemperature + 10) //Heats up mobs to just over normal, not enough to burn if(prob(50)) //inform the mob of warm water half the time - M << "The water is quite warm." //Inform the mob it's warm water. + to_chat(M, "The water is quite warm.")//Inform the mob it's warm water. + + if("cool") //Gently cool the mob. M.bodytemperature = max(290, M.bodytemperature - 10) //Cools mobs to just below normal, not enough to burn if(prob(50)) //inform the mob of cold water half the time - M << "The water is chilly." //Inform the mob it's chilly water. + to_chat(M, "The water is chilly.")//Inform the mob it's chilly water. + + if("frigid") //Freeze the mob. M.bodytemperature = max(80, M.bodytemperature - 35) //cool mob at -35k per cycle - M << "The water is freezing!" + to_chat(M, "The water is freezing!") + return /obj/machinery/poolcontroller/proc/handleDrowning(var/mob/living/carbon/human/drownee) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 29e1fecd9e3..1c1a8a237b6 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -174,11 +174,13 @@ var/list/turret_icons /obj/machinery/porta_turret/proc/isLocked(mob/user) if(ailock && (isrobot(user) || isAI(user))) - user << "There seems to be a firewall preventing you from accessing this device." + to_chat(user, "There seems to be a firewall preventing you from accessing this device.") + return 1 if(locked && !(isrobot(user) || isAI(user) || isobserver(user))) - user << "Access denied." + to_chat(user, "Access denied.") + return 1 return 0 @@ -243,14 +245,16 @@ var/list/turret_icons /obj/machinery/porta_turret/CanUseTopic(var/mob/user) if(HasController()) - user << "Turrets can only be controlled using the assigned turret controller." + to_chat(user, "Turrets can only be controlled using the assigned turret controller.") + return STATUS_CLOSE if(isLocked(user)) return STATUS_CLOSE if(!anchored) - usr << "\The [src] has to be secured first!" + to_chat(usr, "\The [src] has to be secured first!") + return STATUS_CLOSE return ..() @@ -329,10 +333,12 @@ var/list/turret_icons if(istype(I, /obj/item/weapon/crowbar)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components - user << "You begin prying the metal coverings off." + to_chat(user, "You begin prying the metal coverings off.") + if(do_after(user, 20, target = src)) if(prob(70)) - user << "You remove the turret and salvage some components." + to_chat(user, "You remove the turret and salvage some components.") + if(installation) var/obj/item/weapon/gun/energy/Gun = new installation(loc) Gun.power_supply.charge = gun_charge @@ -342,18 +348,22 @@ var/list/turret_icons if(prob(50)) new /obj/item/device/assembly/prox_sensor(loc) else - user << "You remove the turret but did not manage to salvage anything." + to_chat(user, "You remove the turret but did not manage to salvage anything.") + qdel(src) // qdel else if((istype(I, /obj/item/weapon/wrench))) if(enabled || raised) - user << "You cannot unsecure an active turret!" + to_chat(user, "You cannot unsecure an active turret!") + return if(wrenching) - user << "Someone is already [anchored ? "un" : ""]securing the turret!" + to_chat(user, "Someone is already [anchored ? "un" : ""]securing the turret!") + return if(!anchored && isinspace()) - user << "Cannot secure turrets in space!" + to_chat(user, "Cannot secure turrets in space!") + return user.visible_message( \ @@ -368,21 +378,25 @@ var/list/turret_icons playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) anchored = 1 update_icon() - user << "You secure the exterior bolts on the turret." + to_chat(user, "You secure the exterior bolts on the turret.") + else if(anchored) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) anchored = 0 - user << "You unsecure the exterior bolts on the turret." + to_chat(user, "You unsecure the exterior bolts on the turret.") + update_icon() wrenching = 0 else if(istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda)) if(allowed(user)) locked = !locked - user << "Controls are now [locked ? "locked" : "unlocked"]." + to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") + updateUsrDialog() else - user << "Access denied." + to_chat(user, "Access denied.") + else //if the turret was attacked with the intention of harming it: @@ -407,7 +421,8 @@ var/list/turret_icons visible_message("[M] [M.attacktext] [src]!") take_damage(M.melee_damage_upper) else - M << "That object is useless to you." + to_chat(M, "That object is useless to you.") + return /obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M) @@ -418,7 +433,8 @@ var/list/turret_icons visible_message("[M] has slashed at [src]!") take_damage(15) else - M << "That object is useless to you." + to_chat(M, "That object is useless to you.") + return /obj/machinery/porta_turret/emag_act(user as mob) @@ -426,7 +442,8 @@ var/list/turret_icons //Emagging the turret makes it go bonkers and stun everyone. It also makes //the turret shoot much, much faster. if(user) - user << "You short out [src]'s threat assessment circuits." + to_chat(user, "You short out [src]'s threat assessment circuits.") + visible_message("[src] hums oddly...") emagged = 1 iconholder = 1 @@ -766,14 +783,16 @@ var/list/turret_icons if(0) //first step if(istype(I, /obj/item/weapon/wrench) && !anchored) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "You secure the external bolts." + to_chat(user, "You secure the external bolts.") + anchored = 1 build_step = 1 return else if(istype(I, /obj/item/weapon/crowbar) && !anchored) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) - user << "You dismantle the turret construction." + to_chat(user, "You dismantle the turret construction.") + new /obj/item/stack/sheet/metal( loc, 5) qdel(src) // qdel return @@ -782,16 +801,19 @@ var/list/turret_icons if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.use(2)) - user << "You add some metal armor to the interior frame." + to_chat(user, "You add some metal armor to the interior frame.") + build_step = 2 icon_state = "turret_frame2" else - user << "You need two sheets of metal to continue construction." + to_chat(user, "You need two sheets of metal to continue construction.") + return else if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You unfasten the external bolts." + to_chat(user, "You unfasten the external bolts.") + anchored = 0 build_step = 0 return @@ -800,7 +822,8 @@ var/list/turret_icons if(2) if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "You bolt the metal armor into place." + to_chat(user, "You bolt the metal armor into place.") + build_step = 3 return @@ -809,14 +832,16 @@ var/list/turret_icons if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. - user << "You need more fuel to complete this task." + to_chat(user, "You need more fuel to complete this task.") + return playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(5, user)) return build_step = 1 - user << "You remove the turret's interior metal armor." + to_chat(user, "You remove the turret's interior metal armor.") + new /obj/item/stack/sheet/metal( loc, 2) return @@ -828,11 +853,13 @@ var/list/turret_icons return var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") + return installation = I.type //installation becomes I.type gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge - user << "You add [I] to the turret." + to_chat(user, "You add [I] to the turret.") + if(istype(installation, /obj/item/weapon/gun/energy/laser/bluetag) || istype(installation, /obj/item/weapon/gun/energy/laser/redtag)) target_type = /obj/machinery/porta_turret/tag @@ -845,18 +872,21 @@ var/list/turret_icons else if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "You remove the turret's metal armor bolts." + to_chat(user, "You remove the turret's metal armor bolts.") + build_step = 2 return if(4) if(isprox(I)) if(!user.unEquip(I)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") + return build_step = 5 qdel(I) // qdel - user << "You add the prox sensor to the turret." + to_chat(user, "You add the prox sensor to the turret.") + return //attack_hand() removes the gun @@ -865,7 +895,8 @@ var/list/turret_icons if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 6 - user << "You close the internal access hatch." + to_chat(user, "You close the internal access hatch.") + return //attack_hand() removes the prox sensor @@ -874,16 +905,19 @@ var/list/turret_icons if(istype(I, /obj/item/stack/sheet/metal)) var/obj/item/stack/sheet/metal/M = I if(M.use(2)) - user << "You add some metal armor to the exterior frame." + to_chat(user, "You add some metal armor to the exterior frame.") + build_step = 7 else - user << "You need two sheets of metal to continue construction." + to_chat(user, "You need two sheets of metal to continue construction.") + return else if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 5 - user << "You open the internal access hatch." + to_chat(user, "You open the internal access hatch.") + return if(7) @@ -891,14 +925,16 @@ var/list/turret_icons var/obj/item/weapon/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) - user << "You need more fuel to complete this task." + to_chat(user, "You need more fuel to complete this task.") + playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 30, target = src)) if(!src || !WT.remove_fuel(5, user)) return build_step = 8 - user << "You weld the turret's armor down." + to_chat(user, "You weld the turret's armor down.") + //The final step: create a full turret var/obj/machinery/porta_turret/Turret = new target_type(loc) @@ -912,7 +948,8 @@ var/list/turret_icons else if(istype(I, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) - user << "You pry off the turret's exterior armor." + to_chat(user, "You pry off the turret's exterior armor.") + new /obj/item/stack/sheet/metal(loc, 2) build_step = 6 return @@ -942,10 +979,12 @@ var/list/turret_icons Gun.update_icon() installation = null gun_charge = 0 - user << "You remove [Gun] from the turret frame." + to_chat(user, "You remove [Gun] from the turret frame.") + if(5) - user << "You remove the prox sensor from the turret frame." + to_chat(user, "You remove the prox sensor from the turret frame.") + new /obj/item/device/assembly/prox_sensor(loc) build_step = 4 diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm index b59bfad4d3e..02c6bdea07b 100644 --- a/code/game/machinery/programmable_unloader.dm +++ b/code/game/machinery/programmable_unloader.dm @@ -199,7 +199,8 @@ if(istype(I,/obj/item/weapon/wrench)) // code borrowed from pipe dispenser if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to unfasten \the [src] from the floor..." + to_chat(user, "\blue You begin to unfasten \the [src] from the floor...") + if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ @@ -212,7 +213,8 @@ usr << browse(null, "window=pipedispenser") else /* unwrenched */ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << "\blue You begin to fasten \the [src] to the floor..." + to_chat(user, "\blue You begin to fasten \the [src] to the floor...") + if (do_after(user, 20, target = src)) user.visible_message( \ "[user] fastens \the [src].", \ @@ -230,16 +232,20 @@ open = 0 if(!unwrenched && !circuit_removed) src.stat &= ~MAINT - user << "You close \the [src]'s maintenance panel." + to_chat(user, "You close \the [src]'s maintenance panel.") + else open = 1 src.stat |= MAINT - user << "You open \the [src]'s maintenance panel." + to_chat(user, "You open \the [src]'s maintenance panel.") + if(istype(I,/obj/item/weapon/crowbar)) if(open) - user << "\blue You begin to pry out the [src]'s circuits." + to_chat(user, "\blue You begin to pry out the [src]'s circuits.") + if(do_after(user,40, target = src)) - user << "\blue You remove the circuitboard." + to_chat(user, "\blue You remove the circuitboard.") + circuit_removed = 1 use_power = 0 on = 0 @@ -260,10 +266,12 @@ if(istype(I,/obj/item/weapon/circuitboard/programmable)) if(!open) - user << "You have to open the machine first!" + to_chat(user, "You have to open the machine first!") + return if(!circuit_removed) - user << "There is already a circuitboard present!" + to_chat(user, "There is already a circuitboard present!") + return circuit_removed = 0 I.loc = src @@ -272,7 +280,8 @@ /obj/machinery/programmable/emag_act(user as mob) if(emagged) return - user << "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion." + to_chat(user, "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion.") + playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) emagged = 1 overrides += emag_overrides @@ -299,7 +308,8 @@ if(M.client) M.client.eye = M.client.mob M.client.perspective = MOB_PERSPECTIVE - M << "\blue The machine turns off, and you fall out." + to_chat(M, "\blue The machine turns off, and you fall out.") + return @@ -498,7 +508,8 @@ if(H.gloves && istype(H.gloves, /obj/item/clothing/gloves/boxing)) var/newsleep = 0 if(H.loc != input) - H << "The boxing machine refuses to acknowledge you unless you face it head on!" + to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!") + return var/damage = 0 if(H.a_intent != I_HARM) @@ -585,22 +596,27 @@ if(istype(I,/obj/item/device/multitool)) hacking = (hacking?0:1) if(hacking) - user << "You unlock the data port on the board. You can now use a PDA to alter its data." + to_chat(user, "You unlock the data port on the board. You can now use a PDA to alter its data.") + else - user << "You relock the data port." + to_chat(user, "You relock the data port.") + if(istype(I,/obj/item/device/pda)) if(!hacking) - user << "It looks like you can't access the board's data port. You'll have to open it with a multitool." + to_chat(user, "It looks like you can't access the board's data port. You'll have to open it with a multitool.") + else user.set_machine(src) interact(user) if(istype(I,/obj/item/weapon/card/emag) && !emagged) if(!hacking) - user << "There seems to be a data port on the card, but it's locked. A multitool could open it." + to_chat(user, "There seems to be a data port on the card, but it's locked. A multitool could open it.") + else emagged = 1 overrides += emag_overrides - user << "You swipe the card in the card's data port. The lights flicker, then flash once." + to_chat(user, "You swipe the card in the card's data port. The lights flicker, then flash once.") + proc/format(var/datum/cargoprofile/P,var/level) // PROFILE=0 OVERRIDE=1 MAIN=2 diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 73ef3b1d945..8eebb024633 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -18,7 +18,8 @@ return if(!user.canUnEquip(G, 0)) - user << "[G] is stuck to your hand, you can't put it in [src]!" + to_chat(user, "[G] is stuck to your hand, you can't put it in [src]!") + return if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs)) @@ -28,22 +29,26 @@ // 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)) - user << "\red The [name] blinks red as you try to insert the item!" + to_chat(user, "\red The [name] blinks red as you try to insert the item!") + return if(a.power_equip == 0 && a.requires_power) - user << "\red The [name] blinks red as you try to insert the item!" + to_chat(user, "\red The [name] blinks red as you try to insert the item!") + return if (istype(G, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/E = G if(!E.can_charge) - user << "Your gun has no external power connector." + to_chat(user, "Your gun has no external power connector.") + return if(istype(G, /obj/item/device/laptop)) var/obj/item/device/laptop/L = G if(!L.stored_computer.battery) - user << "There's no battery in it!" + to_chat(user, "There's no battery in it!") + return user.drop_item() @@ -53,10 +58,12 @@ update_icon() else if(istype(G, /obj/item/weapon/wrench)) if(charging) - user << "\red Remove the weapon first!" + to_chat(user, "\red Remove the weapon first!") + return anchored = !anchored - user << "You [anchored ? "attached" : "detached"] the recharger." + to_chat(user, "You [anchored ? "attached" : "detached"] the recharger.") + playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) /obj/machinery/recharger/attack_hand(mob/user as mob) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 31849032067..6434b350830 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -89,7 +89,8 @@ /obj/machinery/recharge_station/attackby(obj/item/P as obj, mob/user as mob, params) if (istype(P, /obj/item/weapon/screwdriver)) if(src.occupant) - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + return default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P) return @@ -217,11 +218,13 @@ return if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) - usr << "They are too far away to put inside" + to_chat(usr, "They are too far away to put inside") + return if (panel_open) - usr << "Close the maintenance panel first." + to_chat(usr, "Close the maintenance panel first.") + return var/can_accept_user @@ -232,10 +235,12 @@ //Whoever had it so that a borg with a dead cell can't enter this thing should be shot. --NEO return if(occupant) - R << "The cell is already occupied!" + to_chat(R, "The cell is already occupied!") + return if(!R.cell) - R << "Without a power cell, you can't be recharged." + to_chat(R, "Without a power cell, you can't be recharged.") + //Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO return can_accept_user = 1 @@ -246,14 +251,16 @@ if(H.stat == DEAD) return if(occupant) - H << "The cell is already occupied!" + to_chat(H, "The cell is already occupied!") + return if(!H.get_int_organ(/obj/item/organ/internal/cell)) return can_accept_user = 1 if(!can_accept_user) - user << "Only non-organics may enter the recharger!" + to_chat(user, "Only non-organics may enter the recharger!") + return user.stop_pulling() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 67a77458916..582a842f15e 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -45,9 +45,12 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/examine(mob/user) ..(user) - user << "The power light is [(stat & NOPOWER) ? "off" : "on"]." - user << "The safety-mode light is [safety_mode ? "on" : "off"]." - user << "The safety-sensors status light is [emagged ? "off" : "on"]." + to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].") + + to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].") + + to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].") + /obj/machinery/recycler/power_change() ..() @@ -78,7 +81,8 @@ var/const/SAFETY_COOLDOWN = 100 safety_mode = 0 update_icon() playsound(src.loc, "sparks", 75, 1, -1) - user << "You use the cryptographic sequencer on the [src.name]." + to_chat(user, "You use the cryptographic sequencer on the [src.name].") + /obj/machinery/recycler/update_icon() ..() @@ -195,10 +199,12 @@ var/const/SAFETY_COOLDOWN = 100 if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "[src] is fastened to the floor!" + to_chat(usr, "[src] is fastened to the floor!") + return 0 eat_dir = turn(eat_dir, 270) - user << "[src] will now accept items from [dir2text(eat_dir)]." + to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].") + return 1 /obj/machinery/recycler/verb/rotateccw() @@ -211,10 +217,12 @@ var/const/SAFETY_COOLDOWN = 100 if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "[src] is fastened to the floor!" + to_chat(usr, "[src] is fastened to the floor!") + return 0 eat_dir = turn(eat_dir, 90) - user << "[src] will now accept items from [dir2text(eat_dir)]." + to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].") + return 1 /obj/item/weapon/paper/recycler diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 0641b4d6266..70b70e554a8 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -226,7 +226,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() hackState = 0 icon_state="req_comp_open" else - user << "You can't do much with that."*/ + to_chat(user, "You can't do much with that.")*/ + if (istype(O, /obj/item/weapon/card/id)) if(inoperable(MAINT)) return @@ -241,7 +242,8 @@ var/list/obj/machinery/requests_console/allConsoles = list() announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name else reset_message() - user << "You are not authorized to send announcements." + to_chat(user, "You are not authorized to send announcements.") + updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(inoperable(MAINT)) return diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index be28fae21da..a6d9dfc3293 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -28,11 +28,13 @@ if (O:amount < 1) qdel(O) - user << "You insert [count] metal sheet\s into the fabricator." + to_chat(user, "You insert [count] metal sheet\s into the fabricator.") + src.overlays -= "fab-load-metal" updateDialog() else - user << "The robot part maker is full. Please remove metal from the robot part maker in order to insert more." + to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.") + /obj/machinery/robotic_fabricator/power_change() if (powered()) diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index ccdb43d5522..acf030b9ddc 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -44,21 +44,24 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob new_seed_type = plant_controller.seeds[F.plantname] if(new_seed_type) - user << "You extract some seeds from [O]." + to_chat(user, "You extract some seeds from [O].") + var/produce = rand(1,4) for(var/i = 0;i<=produce;i++) var/obj/item/seeds/seeds = new(get_turf(src)) seeds.seed_type = new_seed_type.name seeds.update_seed() else - user << "[O] doesn't seem to have any usable seeds inside it." + to_chat(user, "[O] doesn't seem to have any usable seeds inside it.") + qdel(O) //Grass. else if(istype(O, /obj/item/stack/tile/grass)) var/obj/item/stack/tile/grass/S = O - user << "You extract some seeds from the [S.name]." + to_chat(user, "You extract some seeds from the [S.name].") + S.use(1) new /obj/item/seeds/grassseed(loc) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 8a995cc3aa2..41c5e1a13ae 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -208,10 +208,12 @@ /obj/machinery/shieldgen/attack_hand(mob/user as mob) if(locked) - user << "The machine is locked, you are unable to use it." + to_chat(user, "The machine is locked, you are unable to use it.") + return if(is_open) - user << "The panel must be closed before operating this machine." + to_chat(user, "The panel must be closed before operating this machine.") + return if (src.active) @@ -226,7 +228,8 @@ "You hear heavy droning.") src.shields_up() else - user << "The device must first be secured to the floor." + to_chat(user, "The device must first be secured to the floor.") + return /obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -237,48 +240,58 @@ else if(istype(W, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) - user << "\blue You close the panel." + to_chat(user, "\blue You close the panel.") + is_open = 0 else - user << "\blue You open the panel and expose the wiring." + to_chat(user, "\blue You open the panel and expose the wiring.") + is_open = 1 else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W - user << "\blue You begin to replace the wires." + to_chat(user, "\blue You begin to replace the wires.") + //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ), target = src)) //Take longer to repair heavier damage if(do_after(user, 30, target = src)) if(!src || !coil) return coil.use(1) health = max_health malfunction = 0 - user << "\blue You repair the [src]!" + to_chat(user, "\blue You repair the [src]!") + update_icon() else if(istype(W, /obj/item/weapon/wrench)) if(locked) - user << "The bolts are covered, unlocking this would retract the covers." + to_chat(user, "The bolts are covered, unlocking this would retract the covers.") + return if(anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue You unsecure the [src] from the floor!" + to_chat(user, "\blue You unsecure the [src] from the floor!") + if(active) - user << "\blue The [src] shuts off!" + to_chat(user, "\blue The [src] shuts off!") + src.shields_down() anchored = 0 else if(istype(get_turf(src), /turf/space)) return //No wrenching these in space! playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue You secure the [src] to the floor!" + to_chat(user, "\blue You secure the [src] to the floor!") + anchored = 1 else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(src.allowed(user)) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") + else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + else ..() @@ -346,13 +359,16 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(state != 1) - user << "\red The shield generator needs to be firmly secured to the floor first." + to_chat(user, "\red The shield generator needs to be firmly secured to the floor first.") + return 1 if(src.locked && !istype(user, /mob/living/silicon)) - user << "\red The controls are locked!" + to_chat(user, "\red The controls are locked!") + return 1 if(power != 1) - user << "\red The shield generator needs to be powered by wire underneath." + to_chat(user, "\red The shield generator needs to be powered by wire underneath.") + return 1 if(src.active >= 1) @@ -452,29 +468,34 @@ /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/wrench)) if(active) - user << "Turn off the field generator first." + to_chat(user, "Turn off the field generator first.") + return else if(state == 0) state = 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You secure the external reinforcing bolts to the floor." + to_chat(user, "You secure the external reinforcing bolts to the floor.") + src.anchored = 1 return else if(state == 1) state = 0 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - user << "You undo the external reinforcing bolts." + to_chat(user, "You undo the external reinforcing bolts.") + src.anchored = 0 return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (src.allowed(user)) src.locked = !src.locked - user << "Controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") + else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + else add_fingerprint(user) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 7e4efb3a751..cac66fb2871 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -28,11 +28,14 @@ /obj/machinery/space_heater/examine(mob/user) ..(user) - user << "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"]." + to_chat(user, "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"].") + if(open) - user << "The power cell is [cell ? "installed" : "missing"]." + to_chat(user, "The power cell is [cell ? "installed" : "missing"].") + else - user << "The charge meter reads [cell ? round(cell.percent(),1) : 0]%" + to_chat(user, "The charge meter reads [cell ? round(cell.percent(),1) : 0]%") + /obj/machinery/space_heater/emp_act(severity) @@ -47,7 +50,8 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is already a power cell inside." + to_chat(user, "There is already a power cell inside.") + return else // insert cell @@ -60,7 +64,8 @@ user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].") else - user << "The hatch must be open to insert a power cell." + to_chat(user, "The hatch must be open to insert a power cell.") + return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index e2b02a0ce9d..9c531ca2c20 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -134,7 +134,8 @@ /obj/machinery/status_display/examine(mob/user) . = ..(user) if(mode != STATUS_DISPLAY_BLANK && mode != STATUS_DISPLAY_ALERT) - user << "The display says:
\t[sanitize(message1)]
\t[sanitize(message2)]" + to_chat(user, "The display says:
\t[sanitize(message1)]
\t[sanitize(message2)]") + /obj/machinery/status_display/proc/set_message(m1, m2) if(m1) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 8cdd74790ac..f4e1337b8ea 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -248,14 +248,17 @@ if(!protected) playsound(src.loc, "sparks", 75, 1, -1) - user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere." + to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") + return*/ else //welp, the guy is protected, we can continue if(src.issuperUV) - user << "You slide the dial back towards \"185nm\"." + to_chat(user, "You slide the dial back towards \"185nm\".") + src.issuperUV = 0 else - user << "You crank the dial all the way up to \"15nm\"." + to_chat(user, "You crank the dial all the way up to \"15nm\".") + src.issuperUV = 1 return @@ -274,10 +277,12 @@ if(!protected) playsound(src.loc, "sparks", 75, 1, -1) - user << "You try to touch the controls but you get zapped. There must be a short circuit somewhere." + to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") + return*/ else - user << "You push the button. The coloured LED next to it changes." + to_chat(user, "You push the button. The coloured LED next to it changes.") + src.safetieson = !src.safetieson @@ -326,7 +331,8 @@ /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) if(src.islocked || src.isUV) - user << "Unable to open unit." + to_chat(user, "Unable to open unit.") + return if(src.OCCUPANT) src.eject_occupant(user) @@ -337,7 +343,8 @@ /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) if(src.OCCUPANT && src.safetieson) - user << "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments." + to_chat(user, "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.") + return if(src.isopen) return @@ -349,12 +356,15 @@ if(src.isUV || src.isopen) //I'm bored of all these sanity checks return if(src.OCCUPANT && src.safetieson) - user << "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle." + to_chat(user, "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle.") + return if(!src.HELMET && !src.MASK && !src.SUIT && !src.OCCUPANT ) //shit's empty yo - user << "Unit storage bays empty. Nothing to disinfect -- Aborting." + to_chat(user, "Unit storage bays empty. Nothing to disinfect -- Aborting.") + return - user << "You start the Unit's cauterisation cycle." + to_chat(user, "You start the Unit's cauterisation cycle.") + src.cycletime_left = 20 src.isUV = 1 if(src.OCCUPANT && !src.islocked) @@ -416,10 +426,12 @@ if(src.OCCUPANT) if(src.issuperUV) OCCUPANT.take_organ_damage(0,40) - user << "Test. You gave him 40 damage" + to_chat(user, "Test. You gave him 40 damage") + else OCCUPANT.take_organ_damage(0,8) - user << "Test. You gave him 8 damage" + to_chat(user, "Test. You gave him 8 damage") + return*/ @@ -440,9 +452,11 @@ if (src.OCCUPANT.client) if(user != OCCUPANT) - OCCUPANT << "The machine kicks you out!" + to_chat(OCCUPANT, "The machine kicks you out!") + if(user.loc != src.loc) - OCCUPANT << "You leave the not-so-cozy confines of the SSU." + to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") + src.OCCUPANT.client.eye = src.OCCUPANT.client.mob src.OCCUPANT.client.perspective = MOB_PERSPECTIVE @@ -476,13 +490,16 @@ if (usr.stat != 0) return if (!src.isopen) - usr << "The unit's doors are shut." + to_chat(usr, "The unit's doors are shut.") + return if (!src.ispowered || src.isbroken) - usr << "The unit is not operational." + to_chat(usr, "The unit is not operational.") + return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) - usr << "It's too cluttered inside for you to fit in!" + to_chat(usr, "It's too cluttered inside for you to fit in!") + return visible_message("[usr] starts squeezing into the suit storage unit!") if(do_after(usr, 10, target = usr)) @@ -512,7 +529,8 @@ if(istype(I, /obj/item/weapon/screwdriver)) src.panelopen = !src.panelopen playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") ) + to_chat(user, text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )) + src.updateUsrDialog() return if ( istype(I, /obj/item/weapon/grab) ) @@ -520,13 +538,16 @@ if( !(ismob(G.affecting)) ) return if (!src.isopen) - usr << "The unit's doors are shut." + to_chat(usr, "The unit's doors are shut.") + return if (!src.ispowered || src.isbroken) - usr << "The unit is not operational." + to_chat(usr, "The unit is not operational.") + return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty - user << "The unit's storage area is too cluttered." + to_chat(user, "The unit's storage area is too cluttered.") + return visible_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.") if(do_after(user, 20, target = G:affecting)) @@ -552,9 +573,11 @@ return var/obj/item/clothing/suit/space/S = I if(src.SUIT) - user << "The unit already contains a suit." + to_chat(user, "The unit already contains a suit.") + return - user << "You load the [S.name] into the storage compartment." + to_chat(user, "You load the [S.name] into the storage compartment.") + user.drop_item() S.loc = src src.SUIT = S @@ -566,9 +589,11 @@ return var/obj/item/clothing/head/helmet/H = I if(src.HELMET) - user << "The unit already contains a helmet." + to_chat(user, "The unit already contains a helmet.") + return - user << "You load the [H.name] into the storage compartment." + to_chat(user, "You load the [H.name] into the storage compartment.") + user.drop_item() H.loc = src src.HELMET = H @@ -580,9 +605,11 @@ return var/obj/item/clothing/mask/M = I if(src.MASK) - user << "The unit already contains a mask." + to_chat(user, "The unit already contains a mask.") + return - user << "You load the [M.name] into the storage compartment." + to_chat(user, "You load the [M.name] into the storage compartment.") + user.drop_item() M.loc = src src.MASK = M @@ -678,11 +705,13 @@ return if(locked) - user << "\red The suit cycler is locked." + to_chat(user, "\red The suit cycler is locked.") + return if(src.contents.len > 0) - user << "\red There is no room inside the cycler for [G.affecting.name]." + to_chat(user, "\red There is no room inside the cycler for [G.affecting.name].") + return visible_message("[user] starts putting [G.affecting.name] into the suit cycler.") @@ -705,21 +734,25 @@ else if(istype(I,/obj/item/weapon/screwdriver)) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") + src.updateUsrDialog() return else if(istype(I,/obj/item/clothing/head/helmet/space)) if(locked) - user << "\red The suit cycler is locked." + to_chat(user, "\red The suit cycler is locked.") + return if(helmet) - user << "The cycler already contains a helmet." + to_chat(user, "The cycler already contains a helmet.") + return - user << "You fit \the [I] into the suit cycler." + to_chat(user, "You fit \the [I] into the suit cycler.") + user.drop_item() I.loc = src helmet = I @@ -731,24 +764,29 @@ else if(istype(I,/obj/item/clothing/suit/space/rig)) if(locked) - user << "\red The suit cycler is locked." + to_chat(user, "\red The suit cycler is locked.") + return if(suit) - user << "The cycler already contains a hardsuit." + to_chat(user, "The cycler already contains a hardsuit.") + return var/obj/item/clothing/suit/space/rig/S = I if(S.helmet) - user << "\The [S] will not fit into the cycler with a helmet attached." + to_chat(user, "\The [S] will not fit into the cycler with a helmet attached.") + return if(S.boots) - user << "\The [S] will not fit into the cycler with boots attached." + to_chat(user, "\The [S] will not fit into the cycler with boots attached.") + return - user << "You fit \the [I] into the suit cycler." + to_chat(user, "You fit \the [I] into the suit cycler.") + user.drop_item() I.loc = src suit = I @@ -761,11 +799,13 @@ /obj/machinery/suit_cycler/emag_act(user as mob) if(emagged) - user << "\red The cycler has already been subverted." + to_chat(user, "\red The cycler has already been subverted.") + return //Clear the access reqs, disable the safeties, and open up all paintjobs. - user << "\red You run the sequencer across the interface, corrupting the operating protocols." + to_chat(user, "\red You run the sequencer across the interface, corrupting the operating protocols.") + departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$") emagged = 1 safeties = 0 @@ -885,14 +925,17 @@ if(src.allowed(usr)) locked = !locked - usr << "You [locked ? "" : "un"]lock \the [src]." + to_chat(usr, "You [locked ? "" : "un"]lock \the [src].") + else - usr << "\red Access denied." + to_chat(usr, "\red Access denied.") + else if(href_list["begin_decontamination"]) if(safeties && occupant) - usr << "\red The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle." + to_chat(usr, "\red The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle.") + return active = 1 @@ -912,7 +955,8 @@ /* else if ((href_list["cutwire"]) && (src.panel_open)) var/twire = text2num(href_list["cutwire"]) if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) )) - usr << "You need wirecutters!" + to_chat(usr, "You need wirecutters!") + return if (src.isWireColorCut(twire)) src.mend(twire) @@ -922,10 +966,12 @@ else if ((href_list["pulsewire"]) && (src.panel_open)) var/twire = text2num(href_list["pulsewire"]) if (!istype(usr.get_active_hand(), /obj/item/device/multitool)) - usr << "You need a multitool!" + to_chat(usr, "You need a multitool!") + return if (src.isWireColorCut(twire)) - usr << "You can't pulse a cut wire." + to_chat(usr, "You can't pulse a cut wire.") + return else src.pulse(twire)*/ @@ -991,7 +1037,8 @@ /obj/machinery/suit_cycler/proc/eject_occupant(mob/user as mob) if(locked || active) - user << "\red The cycler is locked." + to_chat(user, "\red The cycler is locked.") + return if (!occupant) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 11ec8837c87..4feba8ac8f8 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -85,13 +85,15 @@ N.mind.objectives += escape_objective - M << "You have joined the ranks of the Syndicate and become a traitor to the station!" + to_chat(M, "You have joined the ranks of the Syndicate and become a traitor to the station!") + message_admins("[key_name_admin(N)] has accepted a traitor objective from a syndicate beacon.") var/obj_count = 1 for(var/datum/objective/OBJ in M.mind.objectives) - M << "Objective #[obj_count]: [OBJ.explanation_text]" + to_chat(M, "Objective #[obj_count]: [OBJ.explanation_text]") + obj_count++ src.add_fingerprint(usr) @@ -125,7 +127,9 @@ /obj/machinery/power/singularity_beacon/proc/Activate(mob/user = null) if(surplus() < 1500) - if(user) user << "The connected wire doesn't have enough current." + if(user) + to_chat(user, "The connected wire doesn't have enough current.") + return for(var/obj/singularity/singulo in singularities) if(singulo.z == z) @@ -134,7 +138,8 @@ active = 1 machines |= src if(user) - user << "You activate the beacon." + to_chat(user, "You activate the beacon.") + /obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) @@ -144,7 +149,8 @@ icon_state = "[icontype]0" active = 0 if(user) - user << "You deactivate the beacon." + to_chat(user, "You deactivate the beacon.") + /obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) @@ -155,27 +161,32 @@ if(anchored) return active ? Deactivate(user) : Activate(user) else - user << "You need to screw the beacon to the floor first!" + to_chat(user, "You need to screw the beacon to the floor first!") + return /obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/screwdriver)) if(active) - user << "You need to deactivate the beacon first!" + to_chat(user, "You need to deactivate the beacon first!") + return if(anchored) anchored = 0 - user << "You unscrew the beacon from the floor." + to_chat(user, "You unscrew the beacon from the floor.") + disconnect_from_network() return else if(!connect_to_network()) - user << "This device must be placed over an exposed cable." + to_chat(user, "This device must be placed over an exposed cable.") + return anchored = 1 - user << "You screw the beacon to the floor and attach the cable." + to_chat(user, "You screw the beacon to the floor and attach the cable.") + return ..() return diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index a81c00604db..509371b0b95 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -47,7 +47,8 @@ /obj/machinery/syndicatebomb/examine(mob/user) ..(user) - user << "A digital display on it reads \"[timer]\"." + to_chat(user, "A digital display on it reads \"[timer]\".") + /obj/machinery/syndicatebomb/update_icon() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" @@ -56,25 +57,31 @@ if(istype(I, /obj/item/weapon/wrench)) if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) - user << "The bomb must be placed on solid ground to attach it" + to_chat(user, "The bomb must be placed on solid ground to attach it") + else - user << "You firmly wrench the bomb to the floor" + to_chat(user, "You firmly wrench the bomb to the floor") + playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 1 if(active) - user << "The bolts lock in place" + to_chat(user, "The bolts lock in place") + else if(!active) - user << "You wrench the bomb from the floor" + to_chat(user, "You wrench the bomb from the floor") + playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 0 else - user << "The bolts are locked down!" + to_chat(user, "The bolts are locked down!") + else if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel update_icon() - user << "You [open_panel ? "open" : "close"] the wire panel." + to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") + else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) if(open_panel) @@ -83,23 +90,29 @@ else if(istype(I, /obj/item/weapon/crowbar)) if(open_panel && isWireCut(WIRE_BOOM) && isWireCut(WIRE_UNBOLT) && isWireCut(WIRE_DELAY) && isWireCut(WIRE_PROCEED) && isWireCut(WIRE_ACTIVATE)) if(payload) - user << "You carefully pry out [payload]." + to_chat(user, "You carefully pry out [payload].") + payload.loc = user.loc payload = null else - user << "There isn't anything in here to remove!" + to_chat(user, "There isn't anything in here to remove!") + else if (open_panel) - user << "The wires conneting the shell to the explosives are holding it down!" + to_chat(user, "The wires conneting the shell to the explosives are holding it down!") + else - user << "The cover is screwed on, it won't pry off!" + to_chat(user, "The cover is screwed on, it won't pry off!") + else if(istype(I, /obj/item/weapon/bombcore)) if(!payload) payload = I - user << "You place [payload] into [src]." + to_chat(user, "You place [payload] into [src].") + user.drop_item() payload.loc = src else - user << "[payload] is already loaded into [src], you'll have to remove it first." + to_chat(user, "[payload] is already loaded into [src], you'll have to remove it first.") + else ..() @@ -118,7 +131,8 @@ settings(user) return else if(anchored) - user << "The bomb is bolted to the floor!" + to_chat(user, "The bomb is bolted to the floor!") + return /obj/machinery/syndicatebomb/proc/settings(var/mob/user) @@ -310,7 +324,8 @@ detonated++ existant++ playsound(user, 'sound/machines/click.ogg', 20, 1) - user << "[existant] found, [detonated] triggered." + to_chat(user, "[existant] found, [detonated] triggered.") + if(detonated) var/turf/T = get_turf(src) var/area/A = get_area(T) diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index a16bbe7b870..4b36ab9d370 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -184,7 +184,8 @@ if(href_list["delete"]) if(!src.allowed(usr) && !emagged) - usr << "\red ACCESS DENIED." + to_chat(usr, "\red ACCESS DENIED.") + return if(SelectedServer) @@ -222,7 +223,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) @@ -234,7 +236,8 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) for (var/obj/C in src) @@ -251,4 +254,5 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + to_chat(user, "\blue You you disable the security protocols") + diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 04a88492cd2..671b1c993eb 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -23,26 +23,31 @@ switch(construct_op) if(0) if(istype(P, /obj/item/weapon/screwdriver)) - user << "You unfasten the bolts." + to_chat(user, "You unfasten the bolts.") + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op++ if(1) if(istype(P, /obj/item/weapon/screwdriver)) - user << "You fasten the bolts." + to_chat(user, "You fasten the bolts.") + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op-- if(istype(P, /obj/item/weapon/wrench)) - user << "You dislodge the external plating." + to_chat(user, "You dislodge the external plating.") + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op++ if(2) if(istype(P, /obj/item/weapon/wrench)) - user << "You secure the external plating." + to_chat(user, "You secure the external plating.") + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op-- if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "You remove the cables." + to_chat(user, "You remove the cables.") + construct_op++ var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( user.loc ) A.amount = 5 @@ -51,7 +56,8 @@ if(istype(P, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/A = P if(A.amount >= 5) - user << "You insert the cables." + to_chat(user, "You insert the cables.") + A.amount -= 5 if(A.amount <= 0) user.drop_item() @@ -59,10 +65,12 @@ construct_op-- stat &= ~BROKEN // the machine's not borked anymore! if(istype(P, /obj/item/weapon/crowbar)) - user << "You begin prying out the circuit board other components..." + to_chat(user, "You begin prying out the circuit board other components...") + playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,60, target = src)) - user << "You finish prying out the components." + to_chat(user, "You finish prying out the components.") + // Drop all the component stuff if(component_parts) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index c0ab1c0baa0..f9d62fbcc02 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -39,7 +39,8 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(!on) return - //world << "[src] ([src.id]) - [signal.debug_print()]" +// to_chat(world, "[src] ([src.id]) - [signal.debug_print()]") + var/send_count = 0 diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index f966f477057..e0cc2f550f1 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -131,7 +131,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) @@ -143,7 +144,8 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) for (var/obj/C in src) @@ -160,4 +162,5 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" \ No newline at end of file + to_chat(user, "\blue You you disable the security protocols") + diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 8f08ca9c92f..2871cf473ba 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -193,7 +193,8 @@ user.set_machine(src) if(!allowed(user) && !emagged) - user << "Access Denied." + to_chat(user, "Access Denied.") + return 0 switch(href_list["choice"]) @@ -343,7 +344,8 @@ playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) @@ -355,7 +357,8 @@ A.anchored = 1 qdel(src) else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) for (var/obj/C in src) @@ -372,7 +375,8 @@ if(!emagged) playsound(get_turf(src), 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + to_chat(user, "\blue You you disable the security protocols") + /obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user) if(issilicon(user) || in_range(user, src)) diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 6d0f70fc528..74124f22e9b 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -43,11 +43,13 @@ var/obj/item/device/gps/L = I if(L.locked_location && !(stat & (NOPOWER|BROKEN))) if(!user.unEquip(L)) - user << "\the [I] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") + return L.loc = src locked = L - user << "You insert the GPS device into the [name]'s slot." + to_chat(user, "You insert the GPS device into the [name]'s slot.") + else ..() return @@ -55,7 +57,8 @@ /obj/machinery/computer/teleporter/emag_act(user as mob) if(!emagged) emagged = 1 - user << "\blue The teleporter can now lock on to Syndicate beacons!" + to_chat(user, "\blue The teleporter can now lock on to Syndicate beacons!") + else ui_interact(user) @@ -103,11 +106,13 @@ return if(!check_hub_connection()) - usr << "Error: Unable to detect hub." + to_chat(usr, "Error: Unable to detect hub.") + nanomanager.update_uis(src) return if(calibrating) - usr << "Error: Calibration in progress. Stand by." + to_chat(usr, "Error: Calibration in progress. Stand by.") + nanomanager.update_uis(src) return @@ -131,11 +136,13 @@ nanomanager.update_uis(src) if(href_list["calibrate"]) if(!target) - usr << "Error: No target set to calibrate to." + to_chat(usr, "Error: No target set to calibrate to.") + nanomanager.update_uis(src) return if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3) - usr << "Hub is already calibrated." + to_chat(usr, "Hub is already calibrated.") + nanomanager.update_uis(src) return src.visible_message("Processing hub calibration to target...") @@ -218,7 +225,8 @@ var/list/areaindex = list() var/list/S = power_station.linked_stations if(!S.len) - user << "No connected stations located." + to_chat(user, "No connected stations located.") + return for(var/obj/machinery/teleport/station/R in S) var/turf/T = get_turf(R) @@ -318,7 +326,8 @@ /obj/machinery/teleport/hub/Bumped(M as mob|obj) if(z == ZLEVEL_CENTCOMM) - M << "You can't use this here." + to_chat(M, "You can't use this here.") + if(power_station && power_station.engaged && !panel_open) //--FalseIncarnate //Prevents AI cores from using the teleporter, prints out failure messages for clarity @@ -330,7 +339,8 @@ "\red You cannot interface with this technology and get rejected!", "\red External firewalls prevent you from utilizing this machine!", "\red Your AI core's anti-bluespace failsafes trigger and prevent teleportation!") - T<< "[pick(TPError)]" + to_chat(T, "[pick(TPError)]") + return else teleport(M) @@ -435,9 +445,11 @@ if(linked_stations.len < efficiency) linked_stations.Add(M.buffer) M.buffer = null - user << "You upload the data from the [W.name]'s buffer." + to_chat(user, "You upload the data from the [W.name]'s buffer.") + else - user << "This station can't hold more information, try to use better parts." + to_chat(user, "This station can't hold more information, try to use better parts.") + if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) update_icon() return @@ -451,11 +463,13 @@ if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W M.buffer = src - user << "You download the data to the [W.name]'s buffer." + to_chat(user, "You download the data to the [W.name]'s buffer.") + return if(istype(W, /obj/item/weapon/wirecutters)) link_console_and_hub() - user << "You reconnect the station to nearby machinery." + to_chat(user, "You reconnect the station to nearby machinery.") + return /obj/machinery/teleport/station/attack_ai() @@ -465,13 +479,15 @@ if(!panel_open) toggle(user) else - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + /obj/machinery/teleport/station/proc/toggle(mob/user) if (stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console) return if (teleporter_hub.panel_open) - user << "Close the hub's maintenance panel first." + to_chat(user, "Close the hub's maintenance panel first.") + return if (teleporter_console.target) src.engaged = !src.engaged diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 2e99d634d60..f71a4223d31 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -131,7 +131,8 @@ AM.loc = src.loc do_transform_mime(AM) else - AM << "Only items can be greyscaled." + to_chat(AM, "Only items can be greyscaled.") + return /obj/machinery/transformer/proc/do_transform_mime(var/obj/item/I) diff --git a/code/game/machinery/turntable.dm b/code/game/machinery/turntable.dm index 84a91ced929..a32ff6260d6 100644 --- a/code/game/machinery/turntable.dm +++ b/code/game/machinery/turntable.dm @@ -43,7 +43,8 @@ ..() if( href_list["on1"] ) if(src.playing == 0) - //world << "Should be working..." +// to_chat(world, "Should be working...") + var/sound/S = sound('sound/turntable/TestLoop1.ogg') S.repeat = 1 S.channel = 10 @@ -52,8 +53,10 @@ S.environment = 0 //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) - // world << "Found the song..." - // M << S +// to_chat(world, "Found the song...") + +// to_chat(M, S) + // M.music = 1 var/area/A = src.loc.loc @@ -63,19 +66,23 @@ while(playing == 1) for(var/mob/M in world) if((M.loc.loc in A) && M.music == 0) - //world << "Found the song..." - M << S +// to_chat(world, "Found the song...") + + to_chat(M, S) + M.music = 1 else if(!(M.loc.loc in A) && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 - M << Soff + to_chat(M, Soff) + M.music = 0 sleep(10) return if( href_list["on2"] ) if(src.playing == 0) - //world << "Should be working..." +// to_chat(world, "Should be working...") + var/sound/S = sound('sound/turntable/TestLoop2.ogg') S.repeat = 1 S.channel = 10 @@ -84,8 +91,10 @@ S.environment = 0 //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) - // world << "Found the song..." - // M << S +// to_chat(world, "Found the song...") + +// to_chat(M, S) + // M.music = 1 var/area/A = src.loc.loc for(var/obj/machinery/party/lasermachine/L in A) @@ -94,19 +103,23 @@ while(playing == 1) for(var/mob/M in world) if(M.loc.loc == src.loc.loc && M.music == 0) - //world << "Found the song..." - M << S +// to_chat(world, "Found the song...") + + to_chat(M, S) + M.music = 1 else if(M.loc.loc != src.loc.loc && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 - M << Soff + to_chat(M, Soff) + M.music = 0 sleep(10) return if( href_list["on3"] ) if(src.playing == 0) - //world << "Should be working..." +// to_chat(world, "Should be working...") + var/sound/S = sound('sound/turntable/TestLoop3.ogg') S.repeat = 1 S.channel = 10 @@ -115,8 +128,10 @@ S.environment = 0 //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) - // world << "Found the song..." - // M << S +// to_chat(world, "Found the song...") + +// to_chat(M, S) + // M.music = 1 var/area/A = src.loc.loc for(var/obj/machinery/party/lasermachine/L in A) @@ -125,13 +140,16 @@ while(playing == 1) for(var/mob/M in world) if(M.loc.loc == src.loc.loc && M.music == 0) - //world << "Found the song..." - M << S +// to_chat(world, "Found the song...") + + to_chat(M, S) + M.music = 1 else if(M.loc.loc != src.loc.loc && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 - M << Soff + to_chat(M, Soff) + M.music = 0 sleep(10) return @@ -143,7 +161,8 @@ S.channel = 10 S.wait = 1 for(var/mob/M in world) - M << S + to_chat(M, S) + M.music = 0 playing = 0 var/area/A = src.loc.loc diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 4dc36dbd2e3..9b703f5478d 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -65,11 +65,13 @@ /obj/machinery/turretid/proc/isLocked(mob/user) if(ailock && (isrobot(user) || isAI(user))) - user << "There seems to be a firewall preventing you from accessing this device." + to_chat(user, "There seems to be a firewall preventing you from accessing this device.") + return 1 if(locked && !(isrobot(user) || isAI(user) || isobserver(user))) - user << "Access denied." + to_chat(user, "Access denied.") + return 1 return 0 @@ -87,16 +89,19 @@ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(src.allowed(usr)) if(emagged) - user << "The turret control is unresponsive." + to_chat(user, "The turret control is unresponsive.") + else locked = !locked - user << "You [ locked ? "lock" : "unlock"] the panel." + to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.") + return return ..() /obj/machinery/turretid/emag_act(user as mob) if(!emagged) - user << "You short out the turret controls' access analysis module." + to_chat(user, "You short out the turret controls' access analysis module.") + emagged = 1 locked = 0 ailock = 0 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index e4b9a290441..7c4a48c3b3e 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -184,7 +184,8 @@ cur_target = get_new_target() //get new target if(cur_target) //if it's found, proceed -// world << "[cur_target]" +// to_chat(world, "[cur_target]") + if(!isPopping()) if(isDown()) popUp() @@ -336,7 +337,8 @@ if (src.health <= 0) src.die() else - M << "That object is useless to you." + to_chat(M, "That object is useless to you.") + return @@ -352,7 +354,8 @@ if (src.health <= 0) src.die() else - M << "\green That object is useless to you." + to_chat(M, "\green That object is useless to you.") + return @@ -362,7 +365,8 @@ return 1 if (src.locked) if (!istype(usr, /mob/living/silicon)) - usr << "Control panel is locked!" + to_chat(usr, "Control panel is locked!") + return if (href_list["toggleOn"]) src.enabled = !src.enabled diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 1265eb8da78..c1271b11cc5 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -188,7 +188,8 @@ for(var/datum/data/vending_product/machine_content in machine) if(machine_content.amount != machine_content.max_amount) if(user) - user << "[machine_content.max_amount - machine_content.amount] of [machine_content.product_name]" + to_chat(user, "[machine_content.max_amount - machine_content.amount] of [machine_content.product_name]") + machine_content.amount = machine_content.max_amount refill.charges -= to_restock total = to_restock @@ -203,7 +204,8 @@ total += restock if(restock) if(user) - user << "[restock] of [machine_content.product_name]" + to_chat(user, "[restock] of [machine_content.product_name]") + if(refill.charges == 0) //due to rounding, we ran out of refill charges, exit. break return total @@ -234,7 +236,8 @@ if(istype(W, /obj/item/weapon/screwdriver) && anchored) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") + overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -259,32 +262,39 @@ W.loc = src coin = W categories |= CAT_COIN - user << "\blue You insert the [W] into the [src]" + to_chat(user, "\blue You insert the [W] into the [src]") + nanomanager.update_uis(src) return else if(istype(W, refill_canister) && refill_canister != null) if(stat & (BROKEN|NOPOWER)) - user << "It does nothing." + to_chat(user, "It does nothing.") + else if(panel_open) //if the panel is open we attempt to refill the machine var/obj/item/weapon/vending_refill/canister = W if(canister.charges == 0) - user << "This [canister.name] is empty!" + to_chat(user, "This [canister.name] is empty!") + else var/transfered = refill_inventory(canister,product_records,user) if(transfered) - user << "You loaded [transfered] items in \the [name]." + to_chat(user, "You loaded [transfered] items in \the [name].") + else - user << "The [name] is fully stocked." + to_chat(user, "The [name] is fully stocked.") + return; else - user << "You should probably unscrew the service panel first." + to_chat(user, "You should probably unscrew the service panel first.") + else ..() /obj/machinery/vending/emag_act(user as mob) emagged = 1 - user << "You short out the product lock on [src]" + to_chat(user, "You short out the product lock on [src]") + return /** @@ -296,7 +306,8 @@ if(currently_vending.price > cashmoney.get_total()) // This is not a status display message, since it's something the character // themselves is meant to see BEFORE putting the money in - usr << "\icon[cashmoney] That is not enough money." + to_chat(usr, "\icon[cashmoney] That is not enough money.") + return 0 // Bills (banknotes) cannot really have worth different than face value, @@ -454,12 +465,14 @@ if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon)) if(!coin) - usr << "There is no coin in this machine." + to_chat(usr, "There is no coin in this machine.") + return usr.put_in_hands(coin) coin = null - usr << "\blue You remove the [coin] from the [src]" + to_chat(usr, "\blue You remove the [coin] from the [src]") + categories &= ~CAT_COIN if (href_list["pay"]) @@ -484,11 +497,14 @@ if ((href_list["vend"]) && (src.vend_ready) && (!currently_vending)) if(issilicon(usr) && !isrobot(usr)) - usr << "The vending machine refuses to interface with you, as you are not in its target demographic!" + to_chat(usr, "The vending machine refuses to interface with you, as you are not in its target demographic!") + return if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH - usr << "Access denied." //Unless emagged of course + to_chat(usr, "Access denied.")//Unless emagged of course + + flick(icon_deny,src) return @@ -521,11 +537,14 @@ /obj/machinery/vending/proc/vend(datum/data/vending_product/R, mob/user) if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH - usr << "Access denied." //Unless emagged of course + to_chat(usr, "Access denied.")//Unless emagged of course + + flick(src.icon_deny,src) return if(!R.amount) - user << "\red The vending machine has ran out of that product." + to_chat(user, "\red The vending machine has ran out of that product.") + return src.vend_ready = 0 //One thing at a time!! src.status_message = "Vending..." @@ -534,13 +553,16 @@ if (R.category & CAT_COIN) if(!coin) - user << "\blue You need to insert a coin to get this item." + to_chat(user, "\blue You need to insert a coin to get this item.") + return if(coin.string_attached) if(prob(50)) - user << "\blue You successfully pull the coin out before the [src] could swallow it." + to_chat(user, "\blue You successfully pull the coin out before the [src] could swallow it.") + else - user << "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all." + to_chat(user, "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all.") + coin = null qdel(coin) categories &= ~CAT_COIN @@ -569,7 +591,8 @@ /obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user) if(src.panel_open) - user << "\blue You stock the [src] with \a [R.product_name]" + to_chat(user, "\blue You stock the [src] with \a [R.product_name]") + R.amount++ src.updateUsrDialog() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 4e95938a2a1..d89fddfd69f 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -32,7 +32,8 @@ return if( state != 4 ) - usr << "The washing machine cannot run in this state." + to_chat(usr, "The washing machine cannot run in this state.") + return if( locate(/mob,contents) ) @@ -199,7 +200,8 @@ /obj/machinery/washing_machine/attackby(obj/item/weapon/W as obj, mob/user as mob, params) /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel - user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/ + to_chat(user, "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel")*/ + if(istype(W,/obj/item/toy/crayon) ||istype(W,/obj/item/weapon/stamp)) if( state in list( 1, 3, 6 ) ) if(!crayon) @@ -230,46 +232,60 @@ //YES, it's hardcoded... saves a var/can_be_washed for every single clothing item. if ( istype(W,/obj/item/clothing/suit/space ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/suit/syndicatefake ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return // if ( istype(W,/obj/item/clothing/suit/powered ) ) -// user << "This item does not fit." +// to_chat(user, "This item does not fit.") + // return if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/suit/bomb_suit ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/suit/armor ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/mask/gas ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/mask/cigarette ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/head/syndicatefake ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return // if ( istype(W,/obj/item/clothing/head/powered ) ) -// user << "This item does not fit." +// to_chat(user, "This item does not fit.") + // return if ( istype(W,/obj/item/clothing/head/helmet ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if ( istype(W,/obj/item/clothing/gloves/furgloves ) ) - user << "This item does not fit." + to_chat(user, "This item does not fit.") + return if(W.flags & NODROP) //if "can't drop" item - user << "\The [W] is stuck to your hand, you cannot put it in the washing machine!" + to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!") + return if(contents.len < 5) @@ -278,9 +294,11 @@ W.loc = src state = 3 else - user << "\blue You can't put the item in right now." + to_chat(user, "\blue You can't put the item in right now.") + else - user << "\blue The washing machine is full." + to_chat(user, "\blue The washing machine is full.") + else ..() update_icon() @@ -302,7 +320,8 @@ crayon = null state = 1 if(5) - user << "\red The [src] is busy." + to_chat(user, "\red The [src] is busy.") + if(6) state = 7 if(7) diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index dba30d648b0..f0bc8c1e58e 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -20,18 +20,22 @@ usr.set_machine(src) if(!istype(user, /mob/living/carbon/human)) - user << "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's." + to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") + return if(is_special_character(user)) - user << "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away." + to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") + return if(inuse) - user << "Someone is already communing with the Wish Granter." + to_chat(user, "Someone is already communing with the Wish Granter.") + return - user << "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?" + to_chat(user, "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?") + inuse = 1 var/wish @@ -51,7 +55,8 @@ //Remove the wishgranter or teleport it randomly on the station if(!types.len) - user << "The wishgranter slowly fades into mist..." + to_chat(user, "The wishgranter slowly fades into mist...") + qdel(src) return else diff --git a/code/game/magic/Uristrunes.dm b/code/game/magic/Uristrunes.dm index 6e0abd177e0..df25e084d19 100644 --- a/code/game/magic/Uristrunes.dm +++ b/code/game/magic/Uristrunes.dm @@ -16,6 +16,7 @@ var/list/word_to_uristrune_table = null words -= w bit <<= 1 + return word_to_uristrune_table[word] diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 09f6aad41e6..b06d02efc41 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -150,7 +150,8 @@ src.occupant_message("Zoom mode [zoom?"en":"dis"]abled.") if(zoom) src.occupant.client.view = 12 - src.occupant << sound('sound/mecha/imag_enh.ogg',volume=50) + to_chat(src.occupant, sound('sound/mecha/imag_enh.ogg',volume=50)) + else src.occupant.client.view = world.view//world.view - default mob view size return diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 4f53bd5a796..75efc280354 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -52,9 +52,11 @@ chassis.occupant_message("The [src] is destroyed!") chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) - chassis.occupant << sound('sound/mecha/weapdestr.ogg',volume=50) + to_chat(chassis.occupant, sound('sound/mecha/weapdestr.ogg',volume=50)) + else - chassis.occupant << sound('sound/mecha/critdestr.ogg',volume=50) + to_chat(chassis.occupant, sound('sound/mecha/critdestr.ogg',volume=50)) + chassis = null return ..() diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 1b0c82f42f7..0ab84bd842b 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -545,7 +545,8 @@ return chassis.dynattackby(W,user, params) chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) - user << "\red The [W] bounces off [chassis] armor." + to_chat(user, "\red The [W] bounces off [chassis] armor.") + chassis.log_append_to_last("Armor saved.") else chassis.occupant_message("[user] hits [chassis] with [W].") @@ -932,7 +933,8 @@ if(isnull(result)) user.visible_message("[user] tries to shove [weapon_name] into [src], but \the [src] rejects it.","[fuel_name] traces in target minimal. [weapon_name] cannot be used as fuel.") else if(!result) - user << "Unit is full." + to_chat(user, "Unit is full.") + else user.visible_message("[user] loads [src] with \the [weapon_name].","[result] unit\s of [fuel_name] successfully loaded.") return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index ab9589f73e7..d1e537fd877 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -140,7 +140,8 @@ var/mob/living/carbon/human/H = M if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) continue - M << "HONK" + to_chat(M, "HONK") + M.sleeping = 0 M.stuttering = 20 M.ear_deaf = 30 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index b77ee7b9cd8..9d527750470 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -293,7 +293,8 @@ if(..()) return 1 if(!allowed(user) && !isobserver(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return 1 return interact(user) @@ -505,7 +506,8 @@ default_deconstruction_crowbar(W) return 1 else - user << "You can't load \the [name] while it's opened." + to_chat(user, "You can't load \the [name] while it's opened.") + return 1 if(istype(W, /obj/item/stack)) @@ -533,10 +535,12 @@ return ..() if(being_built) - user << "\The [src] is currently processing. Please wait until completion." + to_chat(user, "\The [src] is currently processing. Please wait until completion.") + return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator - user << "\The [src] [material2name(material)] storage is full." + to_chat(user, "\The [src] [material2name(material)] storage is full.") + return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -546,12 +550,14 @@ var/transfer_amount = min(stack.amount, round((res_max_amount - resources[material])/MINERAL_MATERIAL_AMOUNT,1)) resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) - user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." + to_chat(user, "You insert [transfer_amount] [sname] sheet\s into \the [src].") + sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else - user << "\The [src] cannot hold any more [sname] sheet\s." + to_chat(user, "\The [src] cannot hold any more [sname] sheet\s.") + return /obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 276ed01252b..7a563b2b35c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -169,19 +169,26 @@ var/integrity = health/initial(health)*100 switch(integrity) if(85 to 100) - user << "It's fully intact." + to_chat(user, "It's fully intact.") + if(65 to 85) - user << "It's slightly damaged." + to_chat(user, "It's slightly damaged.") + if(45 to 65) - user << "It's badly damaged." + to_chat(user, "It's badly damaged.") + if(25 to 45) - user << "It's heavily damaged." + to_chat(user, "It's heavily damaged.") + else - user << "It's falling apart." + to_chat(user, "It's falling apart.") + if(equipment && equipment.len) - user << "It's equipped with:" + to_chat(user, "It's equipped with:") + for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) - user << "\icon[ME] [ME]" + to_chat(user, "\icon[ME] [ME]") + return @@ -300,7 +307,8 @@ /obj/mecha/relaymove(mob/user,direction) if(user != src.occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) - user << "You climb out from [src]" + to_chat(user, "You climb out from [src]") + return 0 if(connected_port) if(world.time - last_message > 20) @@ -458,7 +466,8 @@ internal_damage |= int_dam_flag pr_internal_damage.start() log_append_to_last("Internal damage of type [int_dam_flag].",1) - occupant << sound('sound/machines/warning-buzzer.ogg',wait=0) + to_chat(occupant, sound('sound/machines/warning-buzzer.ogg',wait=0)) + diag_hud_set_mechstat() return @@ -527,12 +536,14 @@ src.take_damage(15) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\red You slash at the armored suit!" + to_chat(user, "\red You slash at the armored suit!") + visible_message("\red The [user] slashes at [src.name]'s armor!") else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\green Your claws had no effect!" + to_chat(user, "\green Your claws had no effect!") + src.occupant_message("\blue The [user]'s claws are stopped by the armor.") visible_message("\blue The [user] rebounds off [src.name]'s armor!") return @@ -699,14 +710,16 @@ src.take_damage(6) src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\red You smash at the armored suit!" + to_chat(user, "\red You smash at the armored suit!") + for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) V.show_message("\red The [user] smashes against [src.name]'s armor!", 1) else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) - user << "\green Your attack had no effect!" + to_chat(user, "\green Your attack had no effect!") + src.occupant_message("\blue The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) @@ -739,7 +752,8 @@ user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) if(prob(src.deflect_chance)) - user << "\red The [W] bounces off [src.name] armor." + to_chat(user, "\red The [W] bounces off [src.name] armor.") + src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -761,9 +775,11 @@ if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain)) if(mmi_move_inside(W,user)) - user << "[src]-MMI interface initialized successfuly" + to_chat(user, "[src]-MMI interface initialized successfuly") + else - user << "[src]-MMI interface initialization failed." + to_chat(user, "[src]-MMI interface initialization failed.") + return if(istype(W, /obj/item/mecha_parts/mecha_equipment)) @@ -774,7 +790,8 @@ E.attach(src) user.visible_message("[user] attaches [W] to [src]", "You attach [W] to [src]") else - user << "You were unable to attach [W] to [src]" + to_chat(user, "You were unable to attach [W] to [src]") + return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(add_req_access || maint_access) @@ -788,28 +805,35 @@ output_maintenance_dialog(id_card, user) return else - user << "\red Invalid ID: Access denied." + to_chat(user, "\red Invalid ID: Access denied.") + else - user << "\red Maintenance protocols disabled by operator." + to_chat(user, "\red Maintenance protocols disabled by operator.") + else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 - user << "You undo the securing bolts." + to_chat(user, "You undo the securing bolts.") + else if(state==2) state = 1 - user << "You tighten the securing bolts." + to_chat(user, "You tighten the securing bolts.") + return else if(istype(W, /obj/item/weapon/crowbar)) if(state==2) state = 3 - user << "You open the hatch to the power unit" + to_chat(user, "You open the hatch to the power unit") + else if(state==3) state=2 - user << "You close the hatch to the power unit" + to_chat(user, "You close the hatch to the power unit") + else if(state==4 && pilot_is_mmi()) // Since having maint protocols available is controllable by the MMI, I see this as a consensual way to remove an MMI without destroying the mech user.visible_message("[user] begins levering out the MMI from the [src].", "You begin to lever out the MMI from the [src].") - occupant << "[user] is prying you out of the exosuit!" + to_chat(occupant, "[user] is prying you out of the exosuit!") + if(do_after(user,80,target=src)) user.visible_message("[user] pries the MMI out of the [src]!", "You finish removing the MMI from the [src]!") go_out() @@ -822,35 +846,42 @@ if(CC.amount > 1) CC.use(2) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) - user << "You replace the fused wires." + to_chat(user, "You replace the fused wires.") + else - user << "There's not enough wire to finish the task." + to_chat(user, "There's not enough wire to finish the task.") + return else if(istype(W, /obj/item/weapon/screwdriver)) if(hasInternalDamage(MECHA_INT_TEMP_CONTROL)) clearInternalDamage(MECHA_INT_TEMP_CONTROL) - user << "You repair the damaged temperature controller." + to_chat(user, "You repair the damaged temperature controller.") + else if(state==3 && src.cell) src.cell.forceMove(src.loc) src.cell = null state = 4 - user << "You unscrew and pry out the powercell." + to_chat(user, "You unscrew and pry out the powercell.") + src.log_message("Powercell removed") else if(state==4 && src.cell) state=3 - user << "You screw the cell in place" + to_chat(user, "You screw the cell in place") + return else if(istype(W, /obj/item/weapon/stock_parts/cell)) if(state==4) if(!src.cell) - user << "You install the powercell" + to_chat(user, "You install the powercell") + user.drop_item() W.forceMove(src) src.cell = W src.log_message("Powercell installed") else - user << "There's already a powercell installed." + to_chat(user, "There's already a powercell installed.") + return else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) @@ -858,19 +889,23 @@ if (WT.remove_fuel(0,user)) if (hasInternalDamage(MECHA_INT_TANK_BREACH)) clearInternalDamage(MECHA_INT_TANK_BREACH) - user << "\blue You repair the damaged gas tank." + to_chat(user, "\blue You repair the damaged gas tank.") + else return if(src.health\the [W] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [W] is stuck to your hand, you cannot put it in \the [src]") + return W.forceMove(src) user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") @@ -879,7 +914,8 @@ else if(istype(W, /obj/item/weapon/paintkit)) if(occupant) - user << "You can't customize a mech while someone is piloting it - that would be unsafe!" + to_chat(user, "You can't customize a mech while someone is piloting it - that would be unsafe!") + return var/obj/item/weapon/paintkit/P = W @@ -891,7 +927,8 @@ break if(!found) - user << "That kit isn't meant for use on this class of exosuit." + to_chat(user, "That kit isn't meant for use on this class of exosuit.") + return user.visible_message("[user] opens [P] and spends some quality time customising [src].") @@ -909,7 +946,8 @@ /* src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) - user << "\red The [W] bounces off [src.name] armor." + to_chat(user, "\red The [W] bounces off [src.name] armor.") + src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -930,11 +968,13 @@ /obj/mecha/emag_act(user as mob) if(istype(src, /obj/mecha/working/ripley) && emagged == 0) emagged = 1 - usr << "\blue You slide the card through the [src]'s ID slot." + to_chat(usr, "\blue You slide the card through the [src]'s ID slot.") + playsound(src.loc, "sparks", 100, 1) src.desc += "
\red The mech's equipment slots spark dangerously!" else - usr <<"\red The [src]'s ID slot rejects the card." + to_chat(usr, "\red The [src]'s ID slot rejects the card.") + return @@ -950,10 +990,13 @@ examine(user) //Get diagnostic information! var/obj/item/mecha_parts/mecha_tracking/B = locate(/obj/item/mecha_parts/mecha_tracking) in src if(B) //Beacons give the AI more detailed mech information. - user << "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:" - user << "[B.get_mecha_info()]" + to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:") + + to_chat(user, "[B.get_mecha_info()]") + //Nothing like a big, red link to make the player feel powerful! - user << "ASSUME DIRECT CONTROL?
" + to_chat(user, "ASSUME DIRECT CONTROL?
") + /obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(!..()) @@ -963,14 +1006,17 @@ switch(interaction) if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!maint_access) //Mech must be in maint mode to allow carding. - user << "[name] must have maintenance protocols active in order to allow a transfer." + to_chat(user, "[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 - user << "No AI detected in the [name] onboard computer." + to_chat(user, "No AI detected in the [name] onboard computer.") + return if (AI.mind.special_role == "malfunction") //Malf AIs cannot leave mechs. Except through death. - user << "ACCESS DENIED." + to_chat(user, "ACCESS DENIED.") + return AI.aiRestorePowerRoutine = 0//So the AI initially has power. AI.control_disabled = 1 @@ -980,31 +1026,39 @@ AI.controlled_mech = null AI.remote_control = null icon_state = initial(icon_state)+"-open" - AI << "You have been downloaded to a mobile storage device. Wireless connection offline." - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) removed from [name] and stored within local memory." + 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.") + if(AI_MECH_HACK) //Called by Malf AI mob on the mech. new /obj/structure/AIcore/deactivated(AI.loc) if(occupant) //Oh, I am sorry, were you using that? - AI << "Pilot detected! Forced ejection initiated!" - occupant << "You have been forcibly ejected!" + to_chat(AI, "Pilot detected! Forced ejection initiated!") + + to_chat(occupant, "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 = locate(/mob/living/silicon/ai) in card if(!AI) - user << "There is no AI currently installed on this device." + to_chat(user, "There is no AI currently installed on this device.") + return else if(AI.stat || !AI.client) - user << "[AI.name] is currently unresponsive, and cannot be uploaded." + to_chat(user, "[AI.name] is currently unresponsive, and cannot be uploaded.") + return else if(occupant || dna) //Normal AIs cannot steal mechs! - user << "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"]." + to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") + return AI.control_disabled = 0 AI.aiRadio.disabledAi = 0 - user << "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed." + to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") + ai_enter_mech(AI, interaction) //Hack and From Card interactions share some code, so leave that here for both to use. @@ -1015,15 +1069,17 @@ icon_state = initial(icon_state) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) - occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(occupant, sound('sound/mecha/nominal.ogg',volume=50)) + AI.cancel_camera() AI.controlled_mech = src AI.remote_control = src AI.canmove = 1 //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow. AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES. - AI << "[interaction == AI_MECH_HACK ? "Takeover of [name] complete! You are now permanently loaded onto the onboard computer. Do not attempt to leave the station sector!" \ - : "You have been uploaded to a mech's onboard computer."]" - AI << "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions." + to_chat(AI, "[interaction == AI_MECH_HACK ? "Takeover of [name] complete! You are now permanently 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, "Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.") + ///////////////////////////////////// //////// Atmospheric stuff //////// @@ -1176,7 +1232,8 @@ return src.log_message("[user] tries to move in.") if (src.occupant) - usr << "The [src.name] is already occupied!" + to_chat(usr, "The [src.name] is already occupied!") + src.log_append_to_last("Permission denied.") return var/passed @@ -1187,12 +1244,14 @@ else if(src.operation_allowed(user)) passed = 1 if(!passed) - user << "Access denied." + to_chat(user, "Access denied.") + src.log_append_to_last("Permission denied.") return for(var/mob/living/carbon/slime/S in range(1,user)) if(S.Victim == user) - user << "You're too busy getting your life sucked out of you." + to_chat(user, "You're too busy getting your life sucked out of you.") + return visible_message("[user] starts to climb into [src.name]") @@ -1201,9 +1260,11 @@ if(!src.occupant) moved_inside(user) else if(src.occupant!=user) - user << "[src.occupant] was faster. Try better next time, loser." + to_chat(user, "[src.occupant] was faster. Try better next time, loser.") + else - user << "You stop entering the exosuit." + to_chat(user, "You stop entering the exosuit.") + return /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -1223,26 +1284,32 @@ dir = dir_in playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) + return 1 else return 0 /obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + to_chat(user, "Consciousness matrix not detected.") + return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + to_chat(user, "Beta-rhythm below acceptable level.") + return 0 else if(occupant) - user << "Occupant detected." + to_chat(user, "Occupant detected.") + return 0 else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) - user << "Stop it!" + to_chat(user, "Stop it!") + return 0 //Added a message here since people assume their first click failed or something./N -// user << "Installing MMI, please stand by." +// to_chat(user, "Installing MMI, please stand by.") + visible_message("\blue [usr] starts to insert an MMI into [src.name]") @@ -1250,21 +1317,26 @@ if(!occupant) return mmi_moved_inside(mmi_as_oc,user) else - user << "Occupant detected." + to_chat(user, "Occupant detected.") + else - user << "You stop inserting the MMI." + to_chat(user, "You stop inserting the MMI.") + return 0 /obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) - user << "Consciousness matrix not detected." + to_chat(user, "Consciousness matrix not detected.") + return 0 else if(mmi_as_oc.brainmob.stat) - user << "Beta-rhythm below acceptable level." + to_chat(user, "Beta-rhythm below acceptable level.") + return 0 if(!user.unEquip(mmi_as_oc)) - user << "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]" + to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]") + return 0 var/mob/brainmob = mmi_as_oc.brainmob brainmob.reset_view(src) @@ -1284,7 +1356,8 @@ dir = dir_in src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) - src.occupant << sound('sound/mecha/nominal.ogg',volume=50) + to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) + return 1 else return 0 @@ -1367,7 +1440,8 @@ occupant.SetStunned(5) occupant.SetWeakened(5) - occupant << "You were blown out of the mech!" + to_chat(occupant, "You were blown out of the mech!") + */ src.log_message("[mob_container] moved out.") occupant.reset_view() @@ -1643,7 +1717,8 @@ /obj/mecha/proc/occupant_message(message as text) if(message) if(src.occupant && src.occupant.client) - src.occupant << "\icon[src] [message]" + to_chat(src.occupant, "\icon[src] [message]") + return /obj/mecha/proc/log_message(message as text,red=null) @@ -1755,10 +1830,12 @@ if(user) if(state==0) state = 1 - user << "The securing bolts are now exposed." + to_chat(user, "The securing bolts are now exposed.") + else if(state==1) state = 0 - user << "The securing bolts are now hidden." + to_chat(user, "The securing bolts are now hidden.") + output_maintenance_dialog(filter.getObj("id_card"),user) return if(href_list["set_internal_tank_valve"] && state >=1) @@ -1768,7 +1845,8 @@ var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num if(new_pressure) internal_tank_valve = new_pressure - user << "The internal pressure valve has been set to [internal_tank_valve]kPa." + to_chat(user, "The internal pressure valve has been set to [internal_tank_valve]kPa.") + if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card")) if(!in_range(src, usr)) return operation_req_access += filter.getNum("add_req_access") @@ -1789,7 +1867,8 @@ if(usr != src.occupant) return if(src.occupant && !iscarbon(src.occupant)) - src.occupant << "You do not have any DNA!" + to_chat(src.occupant, "You do not have any DNA!") + return src.dna = src.occupant.dna.unique_enzymes src.occupant_message("You feel a prick as the needle takes your DNA sample.") diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 08d0541bfb5..7be280bd2b5 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -23,12 +23,14 @@ if(C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + to_chat(user, ("There's not enough cable to finish the task.")) + return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + to_chat(user, ("There's not enough material in this stack.")) + return 0 else S.use(5) @@ -55,12 +57,14 @@ if (C.use(4)) playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else - user << ("There's not enough cable to finish the task.") + to_chat(user, ("There's not enough cable to finish the task.")) + return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) - user << ("There's not enough material in this stack.") + to_chat(user, ("There's not enough material in this stack.")) + return 0 else S.use(5) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 647da103a45..2198c472f93 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -43,7 +43,8 @@ qdel(src) else if (isemptylist(welder_salvage)) - user << "What's left on the [src] cannot be removed with a welder, besides the frame itself" + to_chat(user, "What's left on the [src] cannot be removed with a welder, besides the frame itself") + else if(WT.remove_fuel(0,user)) var/type = prob(70)?pick(welder_salvage):null if(type) @@ -53,12 +54,15 @@ welder_salvage -= type salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + to_chat(user, "You failed to salvage anything valuable from [src].") + else - user << "\blue You need more welding fuel to complete this task." + to_chat(user, "\blue You need more welding fuel to complete this task.") + else if(istype(W, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) - user << "You don't see anything that can be cut with [W]." + to_chat(user, "You don't see anything that can be cut with [W].") + return else if(!isemptylist(wirecutters_salvage)) var/type = prob(70)?pick(wirecutters_salvage):null @@ -67,7 +71,8 @@ user.visible_message("[user] cuts [N] from [src].", "You cut [N] from [src].") salvage_num-- else - user << "You failed to salvage anything valuable from [src]." + to_chat(user, "You failed to salvage anything valuable from [src].") + else if(istype(W, /obj/item/weapon/crowbar)) if(!isemptylist(crowbar_salvage)) var/obj/S = pick(crowbar_salvage) @@ -76,7 +81,8 @@ crowbar_salvage -= S user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") else - user << "You don't see anything that can be pried with [W]." + to_chat(user, "You don't see anything that can be pried with [W].") + else ..() return diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index f1191a0ae8c..502a738ae31 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -36,9 +36,11 @@ if (isslime(M) || isAI(M)) if(M == usr) - M << "You are unable to buckle yourself to the [src]!" + to_chat(M, "You are unable to buckle yourself to the [src]!") + else - usr << "You are unable to buckle [M] to the [src]!" + to_chat(usr, "You are unable to buckle [M] to the [src]!") + return 0 M.buckled = src diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index a7677daa62c..16ebeb9a100 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -318,19 +318,23 @@ if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel)) switch(status) if(BURST) - user << "You clear the hatched egg." + to_chat(user, "You clear the hatched egg.") + playsound(loc, 'sound/effects/attackblob.ogg', 100, 1) qdel(src) return if(GROWING) - user << "The child is not developed yet." + to_chat(user, "The child is not developed yet.") + return if(GROWN) - user << "You retrieve the child." + to_chat(user, "You retrieve the child.") + Burst(0) return else - user << "It feels slimy." + to_chat(user, "It feels slimy.") + user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 29b1098ca83..05a1ec2ea67 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -34,7 +34,8 @@ /obj/effect/anomaly/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/device/analyzer)) - user << "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)]." + to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)].") + /////////////////////// diff --git a/code/game/objects/effects/datacore-effect.dm b/code/game/objects/effects/datacore-effect.dm index f50be441414..a6913f25087 100644 --- a/code/game/objects/effects/datacore-effect.dm +++ b/code/game/objects/effects/datacore-effect.dm @@ -50,7 +50,8 @@ isactive[name] = active ? "Active" : "Inactive" else isactive[name] = t.fields["p_stat"] - //world << "[name]: [rank]" +// to_chat(world, "[name]: [rank]") + //cael - to prevent multiple appearances of a player/job combination, add a continue after each line var/department = 0 if(real_rank in command_positions) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 2fd1fbdcd34..3cda01717c5 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -92,7 +92,8 @@ var/global/list/image/splatter_cache=list() return var/taken = rand(1,amount) amount -= taken - user << "You get some of \the [src] on your hands." + to_chat(user, "You get some of \the [src] on your hands.") + if (!user.blood_DNA) user.blood_DNA = list() user.blood_DNA |= blood_DNA.Copy() @@ -139,7 +140,8 @@ var/global/list/image/splatter_cache=list() /obj/effect/decal/cleanable/blood/writing/examine(mob/user) ..(user) - user << "It reads: \"[message]\"" + to_chat(user, "It reads: \"[message]\"") + /obj/effect/decal/cleanable/blood/gibs name = "gibs" diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 48e865c78a3..6fc90b31628 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -78,7 +78,8 @@ var/global/list/image/fluidtrack_cache=list() // Process 4 bits for(var/bi=0;bi<4;bi++) - b=1<There isn't enough [src] to scoop up!" + to_chat(user, "There isn't enough [src] to scoop up!") + return if(W.reagents.total_volume >= W.reagents.maximum_volume) - user << "[W] is full!" + to_chat(user, "[W] is full!") + return - user << "You scoop the [src] into [W]!" + to_chat(user, "You scoop the [src] into [W]!") + reagents.trans_to(W, reagents.total_volume) if(!reagents.total_volume && !noclear) //scooped up all of it qdel(src) @@ -29,7 +32,8 @@ else src.reagents.chem_temp += 15 src.reagents.handle_reactions() - user << "You heat [src] with [W]!" + to_chat(user, "You heat [src] with [W]!") + /obj/effect/decal/cleanable/ex_act() if(reagents) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 1e62b6a5a9e..52f4af032ed 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -59,7 +59,8 @@ break if(check) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") + return resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster @@ -310,10 +311,12 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/wirecutters)) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) - user << "You remove the remnants of the poster." + to_chat(user, "You remove the remnants of the poster.") + qdel(src) else - user << "You carefully remove the poster from the wall." + to_chat(user, "You carefully remove the poster from the wall.") + roll_and_drop(user.loc) return @@ -354,14 +357,18 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) var/stuff_on_wall = 0 for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff if(istype(O,/obj/structure/sign)) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") + return stuff_on_wall++ if(stuff_on_wall >= 4) - user << "The wall is far too cluttered to place a poster!" + to_chat(user, "The wall is far too cluttered to place a poster!") + return - user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster. + to_chat(user, "You start placing the poster on the wall...")//Looks like it's uncluttered enough. Place the poster. + + //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster var/obj/structure/sign/poster/D = P.resulting_poster @@ -382,7 +389,8 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) D.pixel_x = -32 D.pixel_y = 0 else - user << "You cannot reach the wall from here!" + to_chat(user, "You cannot reach the wall from here!") + return flick("poster_being_set",D) @@ -395,7 +403,8 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(!D) return if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc) //Let's check if everything is still there - user << "You place the poster!" + to_chat(user, "You place the poster!") + else D.roll_and_drop(temp_loc) return diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 0cd489c308d..59b13eb3be1 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1092,7 +1092,8 @@ steam.start() -- spawns the effect user.visible_message("[user] smashes through \the [src].", "You smash through \the [src].") qdel(src) else - user << "You hit the metal foam but bounce off it." + to_chat(user, "You hit the metal foam but bounce off it.") + /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) user.changeNext_move(CLICK_CD_MELEE) @@ -1109,7 +1110,8 @@ steam.start() -- spawns the effect user.visible_message("[user] smashes through the foamed metal with \the [I].", "You smash through the foamed metal with \the [I].") qdel(src) else - user << "You hit the metal foam to no effect." + to_chat(user, "You hit the metal foam to no effect.") + /obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/M) M.do_attack_animation(src) @@ -1156,10 +1158,12 @@ steam.start() -- spawns the effect s.start() for(var/mob/M in viewers(5, location)) - M << "\red The solution violently explodes." + to_chat(M, "\red The solution violently explodes.") + for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) - M << "\red The explosion knocks you down." + to_chat(M, "\red The explosion knocks you down.") + M.Weaken(rand(1,5)) return else @@ -1182,7 +1186,8 @@ steam.start() -- spawns the effect flash += (round(amount/4) * flashing_factor) for(var/mob/M in viewers(8, location)) - M << "\red The solution violently explodes." + to_chat(M, "\red The solution violently explodes.") + explosion(location, devastation, heavy, light, flash) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index f170aeb7dce..a630ca27106 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -25,7 +25,8 @@ proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) - world << "\red Gib list length mismatch!" + to_chat(world, "\red Gib list length mismatch!") + return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 6eb84ce50ca..0c3ee5d99ab 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -21,7 +21,8 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) - O << "[M] triggered the \icon[src] [src]" + to_chat(O, "[M] triggered the \icon[src] [src]") + triggered = 1 call(src,triggerproc)(M) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 52175c17e13..2d1510bbf16 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -65,7 +65,8 @@ return 1 else if(istype(mover, /mob/living)) if(prob(50)) - mover << "You get stuck in \the [src] for a moment." + to_chat(mover, "You get stuck in \the [src] for a moment.") + return 0 else if(istype(mover, /obj/item/projectile)) return prob(30) @@ -207,7 +208,8 @@ var/mob/C = pick(candidates) S.key = C.key if(master_commander) - S << "You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost." + to_chat(S, "You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost.") + qdel(src) /obj/effect/decal/cleanable/spiderling_remains diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 414874f6ea2..159fed83a2f 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -15,7 +15,8 @@ light_range = heavy_range for(var/mob/M in range(heavy_range, epicenter)) - M << 'sound/effects/EMPulse.ogg' + to_chat(M, 'sound/effects/EMPulse.ogg') + for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index caaf79a9981..98e14266aa8 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -73,7 +73,8 @@ for(var/mob/M in world) if(M.z == epicenter.z) if(!(M in close)) // check if the mob can hear if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) - M << 'sound/effects/explosionfar.ogg' + to_chat(M, 'sound/effects/explosionfar.ogg') + if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 42a14a43255..4fc9eb3a1ba 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -162,7 +162,8 @@ else msg += "No extractable materials detected.
" msg += "*--------*" - user << msg + to_chat(user, msg) + /obj/item/attack_hand(mob/user as mob) @@ -173,10 +174,12 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(!temp) - user << "You try to use your hand, but it's missing!" + to_chat(user, "You try to use your hand, but it's missing!") + return 0 if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") + return 0 if (istype(src.loc, /obj/item/weapon/storage)) @@ -207,7 +210,8 @@ if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) - user << "Your claws aren't capable of such fine manipulation." + to_chat(user, "Your claws aren't capable of such fine manipulation.") + return if (istype(src.loc, /obj/item/weapon/storage)) @@ -234,7 +238,8 @@ if(!A.has_fine_manipulation) if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) - user << "Your claws aren't capable of such fine manipulation." + to_chat(user, "Your claws aren't capable of such fine manipulation.") + return attack_hand(A) @@ -268,11 +273,14 @@ success = 1 S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. if(success && !failure) - user << "You put everything in [S]." + to_chat(user, "You put everything in [S].") + else if(success) - user << "You put some things in [S]." + to_chat(user, "You put some things in [S].") + else - user << "You fail to pick anything up with [S]." + to_chat(user, "You fail to pick anything up with [S].") + else if(S.can_be_inserted(src)) S.handle_item_insertion(src) @@ -343,22 +351,28 @@ if(!usr.canmove || usr.stat || usr.restrained() || !Adjacent(usr)) return if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain - usr << "\red You can't pick things up!" + to_chat(usr, "\red You can't pick things up!") + return if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained - usr << "\red You can't pick things up!" + to_chat(usr, "\red You can't pick things up!") + return if(src.anchored) //Object isn't anchored - usr << "\red You can't pick that up!" + to_chat(usr, "\red You can't pick that up!") + return if(!usr.hand && usr.r_hand) //Right hand is not full - usr << "\red Your right hand is full." + to_chat(usr, "\red Your right hand is full.") + return if(usr.hand && usr.l_hand) //Left hand is not full - usr << "\red Your left hand is full." + to_chat(usr, "\red Your left hand is full.") + return if(!istype(src.loc, /turf)) //Object is on a turf - usr << "\red You can't pick that up!" + to_chat(usr, "\red You can't pick that up!") + return //All checks are done, time to pick it up! usr.UnarmedAttack(src) @@ -392,11 +406,13 @@ (H.glasses && H.glasses.flags & GLASSESCOVERSEYES) \ )) // you can't stab someone in the eyes wearing a mask! - user << "You're going to need to remove that mask/helmet/glasses first!" + to_chat(user, "You're going to need to remove that mask/helmet/glasses first!") + return if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N slimes also don't have eyes! - user << "You cannot locate any eyes on this creature!" + to_chat(user, "You cannot locate any eyes on this creature!") + return if(!iscarbon(user)) @@ -430,17 +446,20 @@ if(eyes.damage >= eyes.min_bruised_damage) if(M.stat != 2) if(!(eyes.status & ORGAN_ROBOT) || !(eyes.status & ORGAN_ASSISTED)) //robot eyes bleeding might be a bit silly - M << "Your eyes start to bleed profusely!" + to_chat(M, "Your eyes start to bleed profusely!") + if(prob(50)) if(M.stat != 2) - M << "You drop what you're holding and clutch at your eyes!" + to_chat(M, "You drop what you're holding and clutch at your eyes!") + M.drop_item() M.eye_blurry += 10 M.Paralyse(1) M.Weaken(2) if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) - M << "You go blind!" + to_chat(M, "You go blind!") + var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting.take_damage(7)) H.UpdateDamageIcon() @@ -516,7 +535,8 @@ /obj/item/proc/wash(mob/user, atom/source) if(flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand. return - user << "You start washing [src]..." + to_chat(user, "You start washing [src]...") + if(!do_after(user, 40, target = source)) return clean_blood() diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 766b5d55163..3eedff16d93 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -19,7 +19,8 @@ return if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match)) if (contents.len >= max_butts) - user << "This ashtray is full." + to_chat(user, "This ashtray is full.") + return user.unEquip(W) W.loc = src @@ -33,7 +34,8 @@ cig.transfer_fingerprints_to(butt) qdel(cig) else if (cig.lit == 0) - user << "You place [cig] in [src] without even smoking it. Why would you do that?" + to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") + src.visible_message("[user] places [W] in [src].") user.update_inv_l_hand() @@ -47,7 +49,8 @@ desc = empty_desc + " It's half-filled." else health = max(0,health - W.force) - user << "You hit [src] with [W]." + to_chat(user, "You hit [src] with [W].") + if (health < 1) die() return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 99dbe5b366b..1d145d2319f 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -132,26 +132,31 @@ if(!istype(res,/list)) switch(res) if(ROOM_ERR_SPACE) - usr << "The new area must be completely airtight." + to_chat(usr, "The new area must be completely airtight.") + return if(ROOM_ERR_TOOLARGE) - usr << "The new area is too large." + to_chat(usr, "The new area is too large.") + return else - usr << "Error! Please notify administration." + to_chat(usr, "Error! Please notify administration.") + return var/list/turf/turfs = res var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN)) if(!str || !length(str)) //cancel return if(length(str) > 50) - usr << "The given name is too long. The area remains undefined." + to_chat(usr, "The given name is too long. The area remains undefined.") + return var/area/A = new A.name = str //var/ma //ma = A.master ? "[A.master]" : "(null)" - //world << "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]" +// to_chat(world, "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]") + A.power_equip = 0 A.power_light = 0 A.power_environ = 0 @@ -173,11 +178,13 @@ if(!str || !length(str) || str==prevname) //cancel return if(length(str) > 50) - usr << "The given name is too long. The area's name is unchanged." + to_chat(usr, "The given name is too long. The area's name is unchanged.") + return set_area_machinery_title(A,str,prevname) A.name = str - usr << "You rename the '[prevname]' to '[str]'." + to_chat(usr, "You rename the '[prevname]' to '[str]'.") + interact() return 1 diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 3c36ea9dfe8..c61be6a265a 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -57,7 +57,8 @@ //..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri return else if(istype(W, /obj/item/weapon/wirecutters)) - user << "You cut the tag off the bodybag" + to_chat(user, "You cut the tag off the bodybag") + src.name = "body bag" src.overlays.Cut() return @@ -89,7 +90,8 @@ // Make it possible to escape from bodybags in morgues and crematoriums if(loc && (isturf(loc) || istype(loc, /obj/structure/morgue) || istype(loc, /obj/structure/crematorium))) if(!open()) - user << "It won't budge!" + to_chat(user, "It won't budge!") + /obj/item/bodybag/cryobag name = "stasis bag" @@ -126,14 +128,17 @@ MouseDrop(over_object, src_location, over_location) if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return - usr << "\red You can't fold that up anymore.." + to_chat(usr, "\red You can't fold that up anymore..") + ..() attackby(W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(src.allowed(user)) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") + else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 564e22af0a4..36e0b54f356 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -85,26 +85,31 @@ temp = "letter" else if(graffiti.Find(drawtype)) temp = "graffiti" - user << "You start drawing a [temp] on the [target.name]." + to_chat(user, "You start drawing a [temp] on the [target.name].") + if(instant || do_after(user, 50, target = target)) new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp) - user << "You finish drawing [temp]." + to_chat(user, "You finish drawing [temp].") + if(uses) uses-- if(!uses) - user << "You used up your [src.name]!" + to_chat(user, "You used up your [src.name]!") + qdel(src) return /obj/item/toy/crayon/attack(mob/M as mob, mob/user as mob) var/huffable = istype(src,/obj/item/toy/crayon/spraycan) if(M == user) - user << "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!" + to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!") + user.nutrition += 5 if(uses) uses -= 5 if(uses <= 0) - user << "There is no more of [src.name] left!" + to_chat(user, "There is no more of [src.name] left!") + qdel(src) else ..() @@ -214,7 +219,8 @@ var/choice = input(user,"Spraycan options") in list("Toggle Cap","Change Drawing","Change Color") switch(choice) if("Toggle Cap") - user << "You [capped ? "Remove" : "Replace"] the cap of the [src]" + to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") + capped = capped ? 0 : 1 icon_state = "spraycan[capped ? "_cap" : ""]" update_icon() diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index f3d20babcf5..dea1ecd516e 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -12,7 +12,8 @@ /obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob) src.add_fingerprint(user) // Anyone can add their fingerprints to it with this if(owned) - user << "[src] stares up at you with friendly eyes." + to_chat(user, "[src] stares up at you with friendly eyes.") + owner = user owned = 0 return ..() @@ -21,7 +22,8 @@ /obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity) if(!proximity) return if(istype(O,/obj/structure/sink)) - user << "You place [src] under a stream of water..." + to_chat(user, "You place [src] under a stream of water...") + user.drop_item() loc = get_turf(O) return Swell() diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 159365f0b79..00d8999b81e 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -83,7 +83,8 @@ msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].") flush = 1 AI.suiciding = 1 - AI << "Your core files are being wiped!" + to_chat(AI, "Your core files are being wiped!") + while (AI && AI.stat != DEAD) AI.adjustOxyLoss(2) AI.updatehealth() @@ -92,13 +93,17 @@ if (href_list["radio"]) AI.aiRadio.disabledAi = text2num(href_list["radio"]) - AI << "Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!" - user << "You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver." + to_chat(AI, "Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!") + + to_chat(user, "You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.") + if (href_list["wireless"]) AI.control_disabled = text2num(href_list["wireless"]) - AI << "Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!" - user << "You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface." + to_chat(AI, "Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!") + + to_chat(user, "You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface.") + update_icon() return 1 diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 54056c0942e..45e06357b97 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -79,7 +79,8 @@ set src in view(usr, 1) set name = "Print Data" if(usr.stat || !(istype(usr,/mob/living/carbon/human))) - usr << "No." + to_chat(usr, "No.") + return var/scan_data = "" @@ -186,16 +187,19 @@ src.wdata = list() src.chemtraces = list() src.timeofdeath = null - user << "\red A new patient has been registered.. Purging data for previous patient." + to_chat(user, "\red A new patient has been registered.. Purging data for previous patient.") + src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) - usr << "You can't scan this body part." + to_chat(usr, "You can't scan this body part.") + return if(!S.open) - usr << "You have to cut the limb open first!" + to_chat(usr, "You have to cut the limb open first!") + return for(var/mob/O in viewers(M)) O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index dc47c3fc146..2a909561d8a 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -62,7 +62,8 @@ var/turf/T = get_turf(user.loc) if(T.z != current.z || !current.can_use()) - user << "[src] has lost the signal." + to_chat(user, "[src] has lost the signal.") + current = null user.reset_view(null) user.unset_machine() @@ -222,11 +223,13 @@ var/obj/machinery/camera/C = locate(href_list["view"]) if(istype(C)) if(!C.can_use()) - usr << "Something's wrong with that camera. You can't get a feed." + to_chat(usr, "Something's wrong with that camera. You can't get a feed.") + return var/turf/T = get_turf(loc) if(!T || C.z != T.z) - usr << "You can't get a signal." + to_chat(usr, "You can't get a signal.") + return current = C spawn(6) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 9edc811958f..35ab95e05a3 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -31,7 +31,8 @@ if(!active_dummy) if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) - user << "Scanned [target]." + to_chat(user, "Scanned [target].") + saved_item = target.type saved_icon = target.icon saved_icon_state = target.icon_state @@ -45,7 +46,8 @@ playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6) qdel(active_dummy) active_dummy = null - usr << "You deactivate \the [src]." + to_chat(usr, "You deactivate \the [src].") + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -58,7 +60,8 @@ var/obj/effect/dummy/chameleon/C = new/obj/effect/dummy/chameleon(usr.loc) C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src) qdel(O) - usr << "You activate \the [src]." + to_chat(usr, "You activate \the [src].") + var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -107,24 +110,28 @@ /obj/effect/dummy/chameleon/attackby() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") + master.disrupt() /obj/effect/dummy/chameleon/attack_hand() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") + master.disrupt() /obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") + spawn() M.ex_act(severity) master.disrupt() /obj/effect/dummy/chameleon/bullet_act() for(var/mob/M in src) - M << "Your chameleon-projector deactivates." + to_chat(M, "Your chameleon-projector deactivates.") + ..() master.disrupt() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 2b8eb60500f..9c9bfb6754f 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -24,21 +24,27 @@ if(istype(O, /obj/machinery/power/apc)) var/obj/machinery/power/apc/A = O if(A.emagged || A.malfhack) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") + else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") + return 1 if(istype(O, /obj/machinery/door)) var/obj/machinery/door/D = O if(D.operating == -1) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") + else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") + return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) - user << "\red There is a software error with the device." + to_chat(user, "\red There is a software error with the device.") + else - user << "\blue The device's software appears to be fine." + to_chat(user, "\blue The device's software appears to be fine.") + return 1 \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index f40b057d46f..9012d6b7d54 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -27,14 +27,17 @@ /obj/item/device/flash/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/screwdriver)) if(battery_panel) - user << "You close the battery compartment on the [src]." + to_chat(user, "You close the battery compartment on the [src].") + battery_panel = 0 else - user << "You open the battery compartment on the [src]." + to_chat(user, "You open the battery compartment on the [src].") + battery_panel = 1 if(battery_panel && !overcharged) if(istype(W, /obj/item/weapon/stock_parts/cell)) - user << "You jam the cell into battery compartment on the [src]." + to_chat(user, "You jam the cell into battery compartment on the [src].") + qdel(W) overcharged = 1 overlays += "overcharge" @@ -85,15 +88,19 @@ terrible_conversion_proc(M, user) M.Stun(1) visible_message("[user] blinds [M] with the flash!") - user << "You blind [M] with the flash!" - M << "[user] blinds you with the flash!" + to_chat(user, "You blind [M] with the flash!") + + to_chat(M, "[user] blinds you with the flash!") + if(M.weakeyes) M.Stun(2) M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") else visible_message("[user] fails to blind [M] with the flash!") - user << "You fail to blind [M] with the flash!" - M << "[user] fails to blind you 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!") + else if(M.flash_eyes()) M.confused += power @@ -160,11 +167,14 @@ resisted = 1 if(resisted) - user << "This mind seems resistant to the [src.name]!" + to_chat(user, "This mind seems resistant to the [src.name]!") + else - user << "They must be conscious before you can convert them!" + to_chat(user, "They must be conscious before you can convert them!") + else - user << "This mind is so vacant that it is not susceptible to influence!" + to_chat(user, "This mind is so vacant that it is not susceptible to influence!") + /obj/item/device/flash/cyborg diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index caa673882a1..2d19d03113d 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -31,7 +31,9 @@ /obj/item/device/flashlight/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. + + return 0 on = !on update_brightness(user) @@ -46,12 +48,14 @@ return ..() //just hit them in the head if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return var/mob/living/carbon/human/H = M //mob has protective eyewear if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))) - user << "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first." + to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.") + return if(M == user) //they're using it on themselves @@ -68,12 +72,15 @@ if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind - user << "[M] pupils does not react to the light!" + to_chat(user, "[M] pupils does not react to the light!") + else if(XRAY in M.mutations) //mob has X-RAY vision - user << "[M] pupils give an eerie glow!" + to_chat(user, "[M] pupils give an eerie glow!") + else //they're okay! if(M.flash_eyes(visual = 1)) - user << "[M]'s pupils narrow." + to_chat(user, "[M]'s pupils narrow.") + else return ..() @@ -192,7 +199,8 @@ obj/item/device/flashlight/lamp/bananalamp // Usual checks if(!fuel) - user << "It's out of fuel." + to_chat(user, "It's out of fuel.") + return if(on) return @@ -273,8 +281,10 @@ obj/item/device/flashlight/lamp/bananalamp if(ismob(A)) var/mob/M = A add_logs(M, user, "attacked", object="EMP-light") - user << "\The [src] now has [emp_cur_charges] charge\s." + to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.") + A.emp_act(1) else - user << "\The [src] needs time to recharge!" + to_chat(user, "\The [src] needs time to recharge!") + return \ No newline at end of file diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index d03d2b98887..a2e4822f915 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -50,13 +50,16 @@ user.drop_item() W.loc = src diode = W - user << "You install a [diode.name] in [src]." + to_chat(user, "You install a [diode.name] in [src].") + else - user << "[src] already has a cell." + to_chat(user, "[src] already has a cell.") + else if(istype(W, /obj/item/weapon/screwdriver)) if(diode) - user << "You remove the [diode.name] from the [src]." + to_chat(user, "You remove the [diode.name] from the [src].") + diode.loc = get_turf(src.loc) diode = null return @@ -72,17 +75,20 @@ if( !(user in (viewers(7,target))) ) return if (!diode) - user << "You point [src] at [target], but nothing happens!" + to_chat(user, "You point [src] at [target], but nothing happens!") + return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return add_fingerprint(user) //nothing happens if the battery is drained if(recharge_locked) - user << "You point [src] at [target], but it's still charging." + to_chat(user, "You point [src] at [target], but it's still charging.") + return var/outmsg @@ -115,7 +121,8 @@ if(prob(effectchance * diode.rating)) S.flash_eyes(affect_silicon = 1) S.Weaken(rand(5,10)) - S << "Your sensors were overloaded by a laser!" + to_chat(S, "Your sensors were overloaded by a laser!") + outmsg = "You overload [S] by shining [src] at their sensors." S.attack_log += text("\[[time_stamp()]\] Has had a laser pointer shone in their eyes by [user.name] ([user.ckey])") @@ -154,9 +161,11 @@ I.pixel_y = target.pixel_y + rand(-5,5) if(outmsg) - user << outmsg + to_chat(user, outmsg) + else - user << "You point [src] at [target]." + to_chat(user, "You point [src] at [target].") + energy -= 1 if(energy <= max_energy) @@ -164,7 +173,8 @@ recharging = 1 processing_objects.Add(src) if(energy <= 0) - user << "You've overused the battery of [src], now it needs time to recharge!" + to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") + recharge_locked = 1 flick_overlay(I, showto, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index c87f4c7ff24..a22b11a7030 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -68,7 +68,8 @@ /obj/item/device/lightreplacer/examine(mob/user) if(..(user, 2)) - user << "It has [uses] lights remaining." + to_chat(user, "It has [uses] lights remaining.") + /obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/sheet/glass)) @@ -76,14 +77,16 @@ if(G.amount - decrement >= 0 && uses < max_uses) var/remaining = max(G.amount - decrement, 0) if(!remaining && !(G.amount - decrement) == 0) - user << "There isn't enough glass." + to_chat(user, "There isn't enough glass.") + return G.amount = remaining if(!G.amount) user.drop_item() qdel(G) AddUses(increment) - user << "You insert a piece of glass into the [src.name]. You have [uses] lights remaining." + to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] lights remaining.") + return if(istype(W, /obj/item/weapon/light)) @@ -91,12 +94,14 @@ if(L.status == 0) // LIGHT OKAY if(uses < max_uses) AddUses(1) - user << "You insert the [L.name] into the [src.name]. You have [uses] lights remaining." + to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.") + user.drop_item() qdel(L) return else - user << "You need a working light." + to_chat(user, "You need a working light.") + return /obj/item/device/lightreplacer/emag_act(user as mob) @@ -109,10 +114,12 @@ var/mob/living/silicon/robot/R = user if(R.emagged) src.Emag() - usr << "You shortcircuit the [src]." + to_chat(usr, "You shortcircuit the [src].") + return */ - usr << "It has [uses] lights remaining." + to_chat(usr, "It has [uses] lights remaining.") + /obj/item/device/lightreplacer/update_icon() icon_state = "lightreplacer[emagged]" @@ -139,7 +146,8 @@ if(target.status != LIGHT_OK) if(CanUse(U)) if(!Use(U)) return - U << "You replace the [target.fitting] with the [src]." + to_chat(U, "You replace the [target.fitting] with the [src].") + if(target.status != LIGHT_EMPTY) @@ -173,10 +181,12 @@ return else - U << failmsg + to_chat(U, failmsg) + return else - U << "There is a working [target.fitting] already inserted." + to_chat(U, "There is a working [target.fitting] already inserted.") + return /obj/item/device/lightreplacer/proc/Emag() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 9e39f99b119..532a620e17d 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -14,22 +14,27 @@ /obj/item/device/megaphone/attack_self(mob/living/user as mob) if (user.client) if(user.client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (muted)." + to_chat(src, "\red You cannot speak in IC (muted).") + return if(!ishuman(user)) - user << "\red You don't know how to use this!" + to_chat(user, "\red You don't know how to use this!") + return if(user.silent) - user << "You find yourself unable to speak at all." + to_chat(user, "You find yourself unable to speak at all.") + return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H && H.mind) if(H.mind.miming) - user << "Your vow of silence prevents you from speaking." + to_chat(user, "Your vow of silence prevents you from speaking.") + return if(spamcheck) - user << "\red \The [src] needs to recharge!" + to_chat(user, "\red \The [src] needs to recharge!") + return var/message = input(user, "Shout a message:", "Megaphone") as text|null @@ -45,7 +50,8 @@ saymsg(user, pick(insultmsg)) insults-- else - user << "\red *BZZZZzzzzzt*" + to_chat(user, "\red *BZZZZzzzzzt*") + else saymsg(user, message) @@ -61,6 +67,7 @@ /obj/item/device/megaphone/emag_act(user as mob) if(!emagged) - user << "\red You overload \the [src]'s voice synthesizer." + to_chat(user, "\red You overload \the [src]'s voice synthesizer.") + emagged = 1 insults = rand(1, 3)//to prevent dickflooding diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index e32bdf764cd..decb6a04243 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -22,7 +22,8 @@ return //it shouldn't be null, okay? if(!parts) - user << "This kit has no parts for this modification left." + to_chat(user, "This kit has no parts for this modification left.") + user.unEquip(src) qdel(src) return @@ -34,17 +35,20 @@ var/obj/item/clothing/I = O if (!istype(I) || !allowed) - user << "[src] is unable to modify that." + to_chat(user, "[src] is unable to modify that.") + return var/excluding = ("exclude" in I.species_restricted) var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) - user << "[I] is already modified." + to_chat(user, "[I] is already modified.") + return if(!isturf(O.loc)) - user << "[O] must be safely placed on the ground for modification." + to_chat(user, "[O] must be safely placed on the ground for modification.") + return playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -64,7 +68,8 @@ /obj/item/device/modkit/examine(mob/user) ..(user) - user << "It looks as though it modifies hardsuits to fit [target_species] users." + to_chat(user, "It looks as though it modifies hardsuits to fit [target_species] users.") + /obj/item/device/modkit/tajaran name = "Tajaran hardsuit modification kit" diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 8f916059010..de8730df8c9 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -243,17 +243,20 @@ return var/mob/M = usr if(!istype(M, /mob/living/carbon)) - usr << "You don't have any DNA, or your DNA is incompatible with this device." + to_chat(usr, "You don't have any DNA, or your DNA is incompatible with this device.") + else var/datum/dna/dna = usr.dna pai.master = M.real_name pai.master_dna = dna.unique_enzymes - pai << "

You have been bound to a new master.

" + to_chat(pai, "

You have been bound to a new master.

") + if(href_list["request"]) var/delta = (world.time / 10) - last_request if(request_cooldown > delta) var/cooldown_time = round(request_cooldown - ((world.time / 10) - last_request), 1) - usr << "\red The request system is currently offline. Please wait another [cooldown_time] seconds." + to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.") + return last_request = world.time / 10 src.looking_for_personality = 1 @@ -262,10 +265,14 @@ 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") for(var/mob/M in src) - M << "

You feel yourself slipping away from reality.

" - M << "

Byte by byte you lose your sense of self.

" - M << "

Your mental faculties leave you.

" - M << "
oblivion...
" + to_chat(M, "

You feel yourself slipping away from reality.

") + + to_chat(M, "

Byte by byte you lose your sense of self.

") + + to_chat(M, "

Your mental faculties leave you.

") + + to_chat(M, "
oblivion...
") + var/mob/living/silicon/pai/P = M if(istype(P)) if(P.resting || P.canmove) @@ -283,9 +290,12 @@ var/newlaws = sanitize(copytext(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.pai_laws) as message,1,MAX_MESSAGE_LEN)) if(newlaws) pai.pai_laws = newlaws - pai << "Your supplemental directives have been updated. Your new directives are:" - pai << "Prime Directive:
[pai.pai_law0]" - pai << "Supplemental Directives:
[pai.pai_laws]" + to_chat(pai, "Your supplemental directives have been updated. Your new directives are:") + + to_chat(pai, "Prime Directive:
[pai.pai_law0]") + + to_chat(pai, "Supplemental Directives:
[pai.pai_laws]") + attack_self(usr) // WIRE_SIGNAL = 1 diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index 47e88049b65..efa5fb962a5 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -20,7 +20,8 @@ var/turf/T = P.loc if (P.level < 2 && T.level==1 && isturf(T) && T.intact) - user << "You must remove the plating first." + to_chat(user, "You must remove the plating first.") + return P.change_color(pipe_colors[mode]) @@ -30,4 +31,5 @@ /obj/item/device/pipe_painter/examine(mob/user) ..(user) - user << "It is in [mode] mode." \ No newline at end of file + to_chat(user, "It is in [mode] mode.") + diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index ae2a698cb35..02bb1fde61d 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -13,7 +13,8 @@ /obj/item/device/pizza_bomb/attack_self(mob/user) if(disarmed) - user << "\The [src] is disarmed." + to_chat(user, "\The [src] is disarmed.") + return if(!timer_set) name = "pizza bomb" @@ -29,7 +30,8 @@ return timer = Clamp(timer, 10, 100) icon_state = "pizzabox1" - user << "You set the timer to [timer / 10] before activating the payload and closing \the [src]." + to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].") + message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at (JMP).") log_game("[key_name(usr)] has set the timer on a pizza bomb to [timer/10] seconds ([loc.x],[loc.y],[loc.z]).") armer = usr @@ -41,7 +43,8 @@ desc = "OH GOD THAT'S NOT A PIZZA" icon_state = "pizzabox_bomb" audible_message("\icon[src] *beep* *beep*") - user << "That's no pizza! That's a bomb!" + to_chat(user, "That's no pizza! That's a bomb!") + message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at (JMP).") log_game("[key_name(usr)] has triggered a pizza bomb armed by [armer] ([loc.x],[loc.y],[loc.z]).") primed = 1 @@ -59,7 +62,8 @@ /obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/wirecutters) && primed) - user << "Oh God, what wire do you cut?!" + to_chat(user, "Oh God, what wire do you cut?!") + var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) return @@ -68,7 +72,8 @@ sleep(5) if(chosen_wire == correct_wire) src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") - user << "You did it!" + to_chat(user, "You did it!") + icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." @@ -76,12 +81,14 @@ primed = 0 return else - user << "WRONG WIRE!" + to_chat(user, "WRONG WIRE!") + go_boom() return if(istype(I, /obj/item/weapon/wirecutters) && disarmed) if(!in_range(user, src)) - user << "You can't see the box well enough to cut the wires out." + to_chat(user, "You can't see the box well enough to cut the wires out.") + return user.visible_message("[user] starts removing the payload and wires from \the [src].") if(do_after(user, 40, target = src)) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index c9b6a6d7563..e33fe869f42 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -36,7 +36,8 @@ if(isturf(T) && !T.intact) attached = locate() in T if(!attached) - user << "No exposed cable here to attach to." + to_chat(user, "No exposed cable here to attach to.") + return else anchored = 1 @@ -46,7 +47,8 @@ log_game("Power sink activated by [key_name(user)] at ([x],[y],[z])") return else - user << "Device must be placed over an exposed cable to attach to it." + to_chat(user, "Device must be placed over an exposed cable to attach to it.") + return else if (mode == 2) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 36de16c95fa..7b76061b020 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -21,7 +21,8 @@ if(!emagged) emagged = 1 syndicate = 1 - user << "\blue The This beacon now only be locked on to by emagged teleporters!" + to_chat(user, "\blue The This beacon now only be locked on to by emagged teleporters!") + /obj/item/device/radio/beacon/hear_talk() return @@ -58,7 +59,8 @@ /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob) if(user) - user << "\blue Locked In" + to_chat(user, "\blue Locked In") + new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -71,7 +73,8 @@ /obj/item/device/radio/beacon/syndicate/bomb/attack_self(mob/user as mob) if(user) - user << "\blue Locked In" + to_chat(user, "\blue Locked In") + new /obj/machinery/syndicatebomb( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 72546f5e15b..cdb4531cefb 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -14,7 +14,8 @@ /obj/item/device/radio/electropack/attack_hand(mob/user as mob) if(src == user.back) - user << "You need help taking this off!" + to_chat(user, "You need help taking this off!") + return 0 . = ..() @@ -32,13 +33,15 @@ ..() if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) - user << "[src] is not ready to be attached!" + to_chat(user, "[src] is not ready to be attached!") + return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' if(!user.unEquip(W)) - user << "\the [W] is stuck to your hand, you cannot attach it to \the [src]!" + to_chat(user, "\the [W] is stuck to your hand, you cannot attach it to \the [src]!") + return W.loc = A W.master = A @@ -86,7 +89,8 @@ sleep(50) if(M) M.moved_recently = 0 - M << "You feel a sharp shock!" + to_chat(M, "You feel a sharp shock!") + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, M) s.start() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e1c1994556e..bdc63d461c1 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -42,8 +42,10 @@ if(!(..(user, 1) && radio_desc)) return - user << "The following channels are available:" - user << radio_desc + to_chat(user, "The following channels are available:") + + to_chat(user, radio_desc) + /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel) if (channel == "special") @@ -321,13 +323,16 @@ keyslot2 = null recalculateChannels() - user << "You pop out the encryption keys in the headset!" + to_chat(user, "You pop out the encryption keys in the headset!") + else - user << "This headset doesn't have any encryption keys! How useless..." + to_chat(user, "This headset doesn't have any encryption keys! How useless...") + if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot1 && keyslot2) - user << "The headset can't hold another key!" + to_chat(user, "The headset can't hold another key!") + return if(!keyslot1) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 987d2475245..a6b09d8d8bc 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -136,7 +136,8 @@ switch(buildstage) if(3) if(iswirecutter(W) && b_stat && wires.IsAllCut()) - user << "You cut out the intercoms wiring and disconnect its electronics." + to_chat(user, "You cut out the intercoms wiring and disconnect its electronics.") + playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/stack/cable_coil(get_turf(src),5) @@ -155,7 +156,8 @@ on = 1 b_stat = 0 buildstage = 3 - user << "You secure the electronics!" + to_chat(user, "You secure the electronics!") + update_icon() processing_objects.Add(src) for(var/i, i<= 5, i++) @@ -165,19 +167,23 @@ if(iscoil(W)) var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) - user << "You need more cable for this!" + to_chat(user, "You need more cable for this!") + return if(do_after(user, 10, target = src)) coil.use(5) - user << "You wire \the [src]!" + to_chat(user, "You wire \the [src]!") + buildstage = 2 return 1 if(iscrowbar(W)) - user << "You begin removing the electronics..." + to_chat(user, "You begin removing the electronics...") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/weapon/intercom_electronics(get_turf(src)) - user << "The circuitboard pops out!" + to_chat(user, "The circuitboard pops out!") + buildstage = 0 return 1 if(0) @@ -185,17 +191,20 @@ playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) qdel(W) - user << "You insert \the [W] into \the [src]!" + to_chat(user, "You insert \the [W] into \the [src]!") + buildstage = 1 return 1 if(iswelder(W)) var/obj/item/weapon/weldingtool/WT=W playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) if(!WT.remove_fuel(3, user)) - user << "You're out of welding fuel." + to_chat(user, "You're out of welding fuel.") + return 1 if(do_after(user, 10, target = src)) - user << "You cut the intercom frame from the wall!" + to_chat(user, "You cut the intercom frame from the wall!") + new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) return 1 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 168f448ba4d..20e0bb8f496 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -238,7 +238,8 @@ var/global/list/default_medbay_channels = list( var/datum/radio_frequency/connection = null if(channel && channels && channels.len > 0) if (channel == "department") - //world << "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"" +// to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"") + channel = channels[1] connection = secure_radio_connections[channel] else @@ -637,14 +638,17 @@ var/global/list/default_medbay_channels = list( keyslot = null recalculateChannels() - user << "You pop out the encryption key in the radio!" + to_chat(user, "You pop out the encryption key in the radio!") + else - user << "This radio doesn't have any encryption keys!" + to_chat(user, "This radio doesn't have any encryption keys!") + if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) - user << "The radio can't hold another key!" + to_chat(user, "The radio can't hold another key!") + return if(!keyslot) @@ -697,9 +701,11 @@ var/global/list/default_medbay_channels = list( if(enable_subspace_transmission != subspace_transmission) subspace_transmission = !subspace_transmission if(subspace_transmission) - usr << "Subspace Transmission is enabled." + to_chat(usr, "Subspace Transmission is enabled.") + else - usr << "Subspace Transmission is disabled." + to_chat(usr, "Subspace Transmission is disabled.") + if(subspace_transmission == 0)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled channels = list() @@ -712,10 +718,12 @@ var/global/list/default_medbay_channels = list( shut_up = !shut_up if(shut_up) canhear_range = 0 - usr << "Loudspeaker disabled." + to_chat(usr, "Loudspeaker disabled.") + else canhear_range = 3 - usr << "Loudspeaker enabled." + to_chat(usr, "Loudspeaker enabled.") + . = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 0a8842921ec..ebd2ebf489c 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -128,7 +128,8 @@ REAGENT SCANNER /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) - user << text("\red You try to analyze the floor's vitals!") + to_chat(user, text("\red You try to analyze the floor's vitals!")) + for(var/mob/O in viewers(M, null)) O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) @@ -189,7 +190,8 @@ REAGENT SCANNER chemscan(user, M) for(var/datum/disease/D in M.viruses) if(!(D.visibility_flags & HIDDEN_SCANNER)) - user << "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]" + to_chat(user, "Warning: [D.form] detected\nName: [D.name].\nType: [D.spread_text].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure_text]") + if(M.getStaminaLoss()) user.show_message("Subject appears to be suffering from fatigue.") if (M.getCloneLoss()) @@ -257,16 +259,20 @@ REAGENT SCANNER mode = !mode switch (mode) if(1) - usr << "The scanner now shows specific limb damage." + to_chat(usr, "The scanner now shows specific limb damage.") + if(0) - usr << "The scanner no longer shows limb damage." + to_chat(usr, "The scanner no longer shows limb damage.") + /obj/item/device/healthanalyzer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/healthupgrade)) if(upgraded) - user << "You have already installed an upgraded in the [src]." + to_chat(user, "You have already installed an upgraded in the [src].") + else - user << "You install the upgrade in the [src]." + to_chat(user, "You install the upgrade in the [src].") + overlays += "advanced" playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) upgraded = 1 @@ -384,17 +390,20 @@ REAGENT SCANNER if (user.stat) return if (crit_fail) - user << "This device has critically failed and is no longer functional!" + to_chat(user, "This device has critically failed and is no longer functional!") + return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return if(reagents.total_volume) var/list/blood_traces = list() for(var/datum/reagent/R in reagents.reagent_list) if(R.id != "blood") reagents.clear_reagents() - user << "The sample was contaminated! Please insert another sample." + to_chat(user, "The sample was contaminated! Please insert another sample.") + return else blood_traces = params2list(R.data["trace_chem"]) @@ -414,7 +423,8 @@ REAGENT SCANNER return else recent_fail = 1 - user << "[dat]" + to_chat(user, "[dat]") + reagents.clear_reagents() return @@ -444,12 +454,14 @@ REAGENT SCANNER if (user.stat) return if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return if(!istype(O)) return if (crit_fail) - user << "This device has critically failed and is no longer functional!" + to_chat(user, "This device has critically failed and is no longer functional!") + return if(!isnull(O.reagents)) @@ -467,11 +479,14 @@ REAGENT SCANNER else recent_fail = 1 if(dat) - user << "Chemicals found: [dat]" + to_chat(user, "Chemicals found: [dat]") + else - user << "No active chemical agents found in [O]." + to_chat(user, "No active chemical agents found in [O].") + else - user << "No significant chemical agents found in [O]." + to_chat(user, "No significant chemical agents found in [O].") + return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7b56b34090a..7201d15fed6 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -22,7 +22,8 @@ /obj/item/device/taperecorder/examine(mob/user) if(..(user, 1)) - user << "The wire panel is [open_panel ? "opened" : "closed"]." + to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].") + /obj/item/device/taperecorder/attackby(obj/item/I, mob/user) @@ -30,12 +31,14 @@ user.drop_item() I.loc = src mytape = I - user << "You insert [I] into [src]." + to_chat(user, "You insert [I] into [src].") + update_icon() /obj/item/device/taperecorder/proc/eject(mob/user) if(mytape) - user << "You remove [mytape] from [src]." + to_chat(user, "You remove [mytape] from [src].") + stop() user.put_in_hands(mytape) mytape = null @@ -113,7 +116,8 @@ return if(mytape.used_capacity < mytape.max_capacity) - usr << "Recording started." + to_chat(usr, "Recording started.") + recording = 1 update_icon() mytape.timestamp += mytape.used_capacity @@ -129,7 +133,8 @@ recording = 0 update_icon() else - usr << "The tape is full." + to_chat(usr, "The tape is full.") + /obj/item/device/taperecorder/verb/stop() @@ -143,7 +148,8 @@ recording = 0 mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." - usr << "Recording stopped." + to_chat(usr, "Recording stopped.") + return else if(playing) playing = 0 @@ -167,7 +173,8 @@ playing = 1 update_icon() - usr << "Playing started." + to_chat(usr, "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,12 +222,14 @@ if(!mytape) return if(!canprint) - usr << "The recorder can't print that fast!" + to_chat(usr, "The recorder can't print that fast!") + return if(recording || playing) return - usr << "Transcript printed." + to_chat(usr, "Transcript printed.") + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:

" @@ -257,7 +266,8 @@ /obj/item/device/tape/attack_self(mob/user) if(!ruined) - user << "You pull out all the tape!" + to_chat(user, "You pull out all the tape!") + ruin() @@ -273,9 +283,11 @@ /obj/item/device/tape/attackby(obj/item/I, mob/user) if(ruined && istype(I, /obj/item/weapon/screwdriver)) - user << "You start winding the tape back in." + to_chat(user, "You start winding the tape back in.") + if(do_after(user, 120, target = src)) - user << "You wound the tape back in!" + to_chat(user, "You wound the tape back in!") + fix() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 2b613ca2d5f..3e030548851 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -33,7 +33,8 @@ effective or pretty fucking useless. /obj/item/device/batterer/attack_self(mob/living/carbon/user as mob, flag = 0, emp = 0) if(!user) return if(times_used >= max_uses) - user << "\red The mind batterer has been burnt out!" + to_chat(user, "\red The mind batterer has been burnt out!") + return user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") @@ -45,16 +46,19 @@ effective or pretty fucking useless. M.Weaken(rand(10,20)) if(prob(25)) M.Stun(rand(5,10)) - M << "\red You feel a tremendous, paralyzing wave flood your mind." + to_chat(M, "\red You feel a tremendous, paralyzing wave flood your mind.") + if(!iscarbon(user)) M.LAssailant = null else M.LAssailant = user else - M << "\red You feel a sudden, electric jolt travel through your head." + to_chat(M, "\red You feel a sudden, electric jolt travel through your head.") + playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) - user << "\blue You trigger [src]." + to_chat(user, "\blue You trigger [src].") + times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -103,7 +107,8 @@ effective or pretty fucking useless. M.apply_effect(round(intensity/1.5), PARALYZE) M.apply_effect(intensity*10, IRRADIATE) else - user << "The radioactive microlaser is still recharging." + to_chat(user, "The radioactive microlaser is still recharging.") + /obj/item/device/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 2b256298835..fdeedd2c6a9 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -18,19 +18,22 @@ /obj/item/device/transfer_valve/attackby(obj/item/item, mob/user, params) if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) - user << "There are already two tanks attached, remove one first." + to_chat(user, "There are already two tanks attached, remove one first.") + return if(!tank_one) tank_one = item user.drop_item() item.loc = src - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") + else if(!tank_two) tank_two = item user.drop_item() item.loc = src - user << "You attach the tank to the transfer valve." + to_chat(user, "You attach the tank to the transfer valve.") + update_icon() nanomanager.update_uis(src) // update all UIs attached to src @@ -38,15 +41,18 @@ else if(isassembly(item)) var/obj/item/device/assembly/A = item if(A.secured) - user << "The device is secured." + to_chat(user, "The device is secured.") + return if(attached_device) - user << "There is already a device attached to the valve, remove it first." + to_chat(user, "There is already a device attached to the valve, remove it first.") + return user.remove_from_mob(item) attached_device = A A.loc = src - user << "You attach the [item] to the valve controls and secure it." + to_chat(user, "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). diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 47efe52d21f..a217f548479 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -291,9 +291,11 @@ var/list/world_uplinks = list() if(!S.used && !S.checking) hidden_uplink.uses += S.TC_cost qdel(S) - user << "Teleporter refunded." + to_chat(user, "Teleporter refunded.") + else - user << "This teleporter is already used, or is currently being used." + to_chat(user, "This teleporter is already used, or is currently being used.") + // PRESET UPLINKS // A collection of preset uplinks. diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index bfe90bf709d..d2c20c7c87d 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -26,6 +26,7 @@ /obj/item/device/hailer/emag_act(user as mob) if(!emagged) - user << "\red You overload \the [src]'s voice synthesizer." + to_chat(user, "\red You overload \the [src]'s voice synthesizer.") + emagged = 1 diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm index 5e092638707..72ec29c7422 100644 --- a/code/game/objects/items/mountable_frames/apc_frame.dm +++ b/code/game/objects/items/mountable_frames/apc_frame.dm @@ -10,16 +10,19 @@ var/turf/turf_loc = get_turf(user) var/area/area_loc = turf_loc.loc if (area_loc.get_apc()) - user << "This area already has an APC." + to_chat(user, "This area already has an APC.") + return //only one APC per area for(var/obj/machinery/power/terminal/T in turf_loc) if (T.master) - user << "There is another network terminal here." + to_chat(user, "There is another network terminal here.") + return else var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc) C.amount = 10 - user << "You cut the cables and disassemble the unused power terminal." + to_chat(user, "You cut the cables and disassemble the unused power terminal.") + qdel(T) return 1 return diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 90560e03bcd..810174d2a3f 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -17,11 +17,13 @@ var/turf/turf_loc = get_turf(user) if (src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor)) - user << "[src] cannot be placed on this spot." + to_chat(user, "[src] cannot be placed on this spot.") + return if (src.mount_reqs.Find("nospace")) var/area/my_area = turf_loc.loc if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space))) - user << "[src] cannot be placed in this area." + to_chat(user, "[src] cannot be placed in this area.") + return return 1 diff --git a/code/game/objects/items/mountable_frames/lights.dm b/code/game/objects/items/mountable_frames/lights.dm index c1710d842a4..50f81cfe74c 100644 --- a/code/game/objects/items/mountable_frames/lights.dm +++ b/code/game/objects/items/mountable_frames/lights.dm @@ -7,7 +7,8 @@ mount_reqs = list("simfloor") /obj/item/mounted/frame/light_fixture/do_build(turf/on_wall, mob/user) - user << "You begin attaching [src] to \the [on_wall]." + to_chat(user, "You begin attaching [src] to \the [on_wall].") + playsound(get_turf(src), 'sound/machines/click.ogg', 75, 1) var/constrdir = user.dir var/constrloc = get_turf(user) diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index e280b8e0cc3..e0df3a03e2f 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -21,11 +21,13 @@ if (proximity_flag != 1) //if we aren't next to the wall return if (!( get_dir(on_wall,user) in cardinal)) - user << "You need to be standing next to a wall to place \the [src]." + to_chat(user, "You need to be standing next to a wall to place \the [src].") + return if(gotwallitem(get_turf(user), get_dir(on_wall,user))) - user << "There's already an item on this wall!" + to_chat(user, "There's already an item on this wall!") + return return 1 diff --git a/code/game/objects/items/mountable_frames/newscaster_frame.dm b/code/game/objects/items/mountable_frames/newscaster_frame.dm index dade4dcb61b..c80bd74061e 100644 --- a/code/game/objects/items/mountable_frames/newscaster_frame.dm +++ b/code/game/objects/items/mountable_frames/newscaster_frame.dm @@ -11,14 +11,17 @@ var/turf/loc = get_turf(usr) var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) - usr << "Newscaster cannot be placed on this spot." + to_chat(usr, "Newscaster cannot be placed on this spot.") + return if (A.requires_power == 0 || A.name == "Space") - usr << "Newscaster cannot be placed in this area." + to_chat(usr, "Newscaster cannot be placed in this area.") + return for(var/obj/machinery/newscaster/T in loc) - usr << "There is another newscaster here." + to_chat(usr, "There is another newscaster here.") + return return 1 diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm index 488f958e17f..1c3aba92054 100644 --- a/code/game/objects/items/policetape.dm +++ b/code/game/objects/items/policetape.dm @@ -66,13 +66,15 @@ var/list/tape_roll_applications = list() /obj/item/taperoll/attack_self(mob/user as mob) if(icon_state == "[icon_base]_start") start = get_turf(src) - usr << "\blue You place the first end of the [src]." + to_chat(usr, "\blue You place the first end of the [src].") + icon_state = "[icon_base]_stop" else icon_state = "[icon_base]_start" end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) - usr << "\blue [src] can only be laid horizontally or vertically." + to_chat(usr, "\blue [src] can only be laid horizontally or vertically.") + return var/turf/cur = start @@ -101,7 +103,8 @@ var/list/tape_roll_applications = list() break cur = get_step_towards(cur,end) if (!can_place) - usr << "\blue You can't run \the [src] through that!" + to_chat(usr, "\blue You can't run \the [src] through that!") + return cur = start @@ -115,7 +118,9 @@ var/list/tape_roll_applications = list() P.icon_state = "[P.icon_base]_[dir]" cur = get_step_towards(cur,end) //is_blocked_turf(var/turf/T) - usr << "\blue You finish placing the [src]." //Git Test + to_chat(usr, "\blue You finish placing the [src].")//Git Test + + /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) if (!proximity) @@ -127,7 +132,8 @@ var/list/tape_roll_applications = list() P.loc = locate(T.x,T.y,T.z) P.icon_state = "[src.icon_base]_door" P.layer = 3.2 - user << "\blue You finish placing the [src]." + to_chat(user, "\blue You finish placing the [src].") + if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A @@ -177,7 +183,8 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) - user << "You can't break the [src] with that!" + to_chat(user, "You can't break the [src] with that!") + return user.show_viewers("\blue [user] breaks the [src]!") diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 44f2081d387..f6687f599f5 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -118,7 +118,8 @@ if(istype(W, /obj/item/stack/sheet/metal) && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) - user << "You armed the robot frame" + to_chat(user, "You armed the robot frame") + W:use(1) if (user.get_inactive_hand()==src) user.unEquip(src) @@ -160,9 +161,11 @@ src.chest = W src.updateicon() else if(!W:wires) - user << "\blue You need to attach wires to it first!" + to_chat(user, "\blue You need to attach wires to it first!") + else - user << "\blue You need to attach a cell to it first!" + to_chat(user, "\blue You need to attach a cell to it first!") + if(istype(W, /obj/item/robot_parts/head)) if(src.head) return @@ -172,22 +175,26 @@ src.head = W src.updateicon() else - user << "\blue You need to attach a flash to it first!" + to_chat(user, "\blue You need to attach a flash to it first!") + if (istype(W, /obj/item/device/multitool)) if(check_completion()) Interact(user) else - user << "The endoskeleton must be assembled before debugging can begin!" + to_chat(user, "The endoskeleton must be assembled before debugging can begin!") + if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) - user << "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise." + to_chat(user, "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.") + return if(!M.brainmob) - user << "\red Sticking an empty [W] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking an empty [W] into the frame would sort of defeat the purpose.") + return if(!M.brainmob.key) @@ -202,19 +209,23 @@ ghost_can_reenter = 1 break if(!ghost_can_reenter) - user << "\The [W] is completely unresponsive; there's no point." + to_chat(user, "\The [W] is completely unresponsive; there's no point.") + return if(M.brainmob.stat == DEAD) - user << "\red Sticking a dead [W] into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking a dead [W] into the frame would sort of defeat the purpose.") + return if(M.brainmob.mind in ticker.mode.head_revolutionaries) - user << "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W]." + to_chat(user, "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W].") + return if(jobban_isbanned(M.brainmob, "Cyborg") || jobban_isbanned(M.brainmob,"nonhumandept")) - user << "\red This [W] does not seem to fit." + to_chat(user, "\red This [W] does not seem to fit.") + return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1) @@ -253,8 +264,10 @@ 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.") - O << "You have been robotized!" - O << "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.") + O.job = "Cyborg" @@ -278,13 +291,16 @@ if(!locomotion) O.lockcharge = 1 O.update_canmove() - O << "Error: Servo motors unresponsive." + to_chat(O, "Error: Servo motors unresponsive.") + else - user << "The MMI must go in after everything else!" + to_chat(user, "The MMI must go in after everything else!") + if(istype(W,/obj/item/weapon/pen)) - user << "You need to use a multitool to name [src]!" + to_chat(user, "You need to use a multitool to name [src]!") + return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) @@ -306,7 +322,8 @@ var/mob/living/living_user = usr var/obj/item/item_in_hand = living_user.get_active_hand() if(!istype(item_in_hand, /obj/item/device/multitool)) - living_user << "You need a multitool!" + to_chat(living_user, "You need a multitool!") + return if(href_list["Name"]) @@ -321,7 +338,8 @@ else if(href_list["Master"]) forced_ai = select_active_ai(usr) if(!forced_ai) - usr << "No active AIs detected." + to_chat(usr, "No active AIs detected.") + else if(href_list["Law"]) lawsync = !lawsync @@ -340,45 +358,54 @@ ..() if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) - user << "\blue You have already inserted a cell!" + to_chat(user, "\blue You have already inserted a cell!") + return else user.drop_item() W.loc = src src.cell = W - user << "\blue You insert the cell!" + to_chat(user, "\blue You insert the cell!") + if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) - user << "\blue You have already inserted wire!" + to_chat(user, "\blue You have already inserted wire!") + return else var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 - user << "\blue You insert the wire!" + to_chat(user, "\blue You insert the wire!") + return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) ..() if(istype(W, /obj/item/device/flash)) if(istype(user,/mob/living/silicon/robot)) - user << "\red How do you propose to do that?" + to_chat(user, "\red How do you propose to do that?") + return else if(src.flash1 && src.flash2) - user << "\blue You have already inserted the eyes!" + to_chat(user, "\blue You have already inserted the eyes!") + return else if(src.flash1) user.drop_item() W.loc = src src.flash2 = W - user << "\blue You insert the flash into the eye socket!" + to_chat(user, "\blue You insert the flash into the eye socket!") + else user.drop_item() W.loc = src src.flash1 = W - user << "\blue You insert the flash into the eye socket!" + to_chat(user, "\blue You insert the flash into the eye socket!") + else if(istype(W, /obj/item/weapon/stock_parts/manipulator)) - user << "\blue You install some manipulators and modify the head, creating a functional spider-bot!" + to_chat(user, "\blue You install some manipulators and modify the head, creating a functional spider-bot!") + new /mob/living/simple_animal/spiderbot(get_turf(loc)) user.drop_item() qdel(W) @@ -389,9 +416,11 @@ /obj/item/robot_parts/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/card/emag)) if(sabotaged) - user << "\red [src] is already sabotaged!" + to_chat(user, "\red [src] is already sabotaged!") + else - user << "\red You slide [W] into the dataport on [src] and short out the safeties." + to_chat(user, "\red You slide [W] into the dataport on [src] and short out the safeties.") + sabotaged = 1 return ..() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a650029b0e1..a86bd3c5e65 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -12,7 +12,8 @@ /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) if(R.stat == DEAD) - usr << "\red The [src] will not function on a deceased robot." + to_chat(usr, "\red The [src] will not function on a deceased robot.") + return 1 return 0 @@ -70,7 +71,8 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) - usr << "You have to repair the robot before using this module!" + to_chat(usr, "You have to repair the robot before using this module!") + return 0 if(!R.key) @@ -112,8 +114,10 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/security)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + + to_chat(usr, "There's no mounting point for the module!") + return 0 var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module @@ -122,12 +126,15 @@ if(!T) T = locate() in R.module.modules if(!T) - usr << "This robot has had its disabler removed!" + to_chat(usr, "This robot has had its disabler removed!") + return 0 if(T.recharge_time <= 2) - R << "Maximum cooling achieved for this hardpoint!" - usr << "There's no room for another cooling unit!" + to_chat(R, "Maximum cooling achieved for this hardpoint!") + + to_chat(usr, "There's no room for another cooling unit!") + return 0 else @@ -145,8 +152,10 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + + to_chat(usr, "There's no mounting point for the module!") + return 0 else R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide @@ -166,8 +175,10 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + + to_chat(usr, "There's no mounting point for the module!") + return 0 else for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module.modules) @@ -190,8 +201,10 @@ if(..()) return 0 if(!istype(R.module, /obj/item/weapon/robot_module/miner)) - R << "Upgrade mounting error! No suitable hardpoint detected!" - usr << "There's no mounting point for the module!" + to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") + + to_chat(usr, "There's no mounting point for the module!") + return 0 else for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module.modules) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 7bc0e7c052c..9f786c14bb0 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -37,7 +37,8 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) overlays.Cut() - usr << "You slice off [src]'s uneven chunks of aluminum and scorch marks." + to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") + return @@ -59,10 +60,12 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(src) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") + else src.loc = get_turf(user) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") + stake.pinned_target = null return @@ -96,7 +99,8 @@ if(hp <= 0) for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << "\red [src] breaks into tiny pieces and collapses!" + to_chat(O, "\red [src] breaks into tiny pieces and collapses!") + qdel(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index e6b56907545..260bcfef617 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -12,11 +12,13 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) - user << "\The [src] cannot be applied to [M]!" + to_chat(user, "\The [src] cannot be applied to [M]!") + return 1 if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return 1 @@ -29,11 +31,13 @@ return 1 if(!affecting) - user << "That limb is missing!" + to_chat(user, "That limb is missing!") + return 1 if(affecting.status & ORGAN_ROBOT) - user << "This can't be used on a robotic limb." + to_chat(user, "This can't be used on a robotic limb.") + return 1 @@ -63,7 +67,8 @@ if(affecting.open == 0) if(!affecting.bandage()) - user << "\red The wounds on [M]'s [affecting.name] have already been bandaged." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been bandaged.") + return 1 else for (var/datum/wound/W in affecting.wounds) @@ -104,7 +109,8 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") + return 1 else user.visible_message( "\blue [user] salves the wounds on [M]'s [affecting.name].", \ @@ -112,7 +118,8 @@ affecting.heal_damage(src.heal_brute, src.heal_burn, 0) use(1) else - user << "The [affecting.name] is cut open, you'll need more than some ointment!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than some ointment!") + /obj/item/stack/medical/bruise_pack/comfrey name = "\improper Comfrey leaf" @@ -153,7 +160,8 @@ var/disinfected = affecting.disinfect() if(!(bandaged || disinfected)) - user << "\red The wounds on [M]'s [affecting.name] have already been treated." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been treated.") + return 1 else for (var/datum/wound/W in affecting.wounds) @@ -173,7 +181,8 @@ affecting.heal_damage(heal_brute,0) use(1) else - user << "The [affecting.name] is cut open, you'll need more than a bandage!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + /obj/item/stack/medical/advanced/ointment name = "advanced burn kit" @@ -194,7 +203,8 @@ if(affecting.open == 0) if(!affecting.salve()) - user << "\red The wounds on [M]'s [affecting.name] have already been salved." + to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") + return 1 else user.visible_message( "\blue [user] covers the wounds on [M]'s [affecting.name] with regenerative membrane.", \ @@ -202,7 +212,8 @@ affecting.heal_damage(0,heal_burn) use(1) else - user << "The [affecting.name] is cut open, you'll need more than a bandage!" + to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") + /obj/item/stack/medical/splint name = "medical splints" @@ -224,19 +235,23 @@ var/obj/item/organ/external/affecting = H.get_organ(user.zone_sel.selecting) var/limb = affecting.name if(!(affecting.limb_name in list("l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot"))) - user << "\red You can't apply a splint there!" + to_chat(user, "\red You can't apply a splint there!") + return if(affecting.status & ORGAN_SPLINTED) - user << "\red [M]'s [limb] is already splinted!" + to_chat(user, "\red [M]'s [limb] is already splinted!") + if(alert(user, "Would you like to remove the splint from [M]'s [limb]?", "Removing.", "Yes", "No") == "Yes") affecting.status &= ~ORGAN_SPLINTED - user << "You remove the splint from [M]'s [limb]." + to_chat(user, "You remove the splint from [M]'s [limb].") + return if (M != user) user.visible_message("\red [user] starts to apply \the [src] to [M]'s [limb].", "\red You start to apply \the [src] to [M]'s [limb].", "\red You hear something being wrapped.") else if((!user.hand && affecting.limb_name in list("r_arm", "r_hand")) || (user.hand && affecting.limb_name in list("l_arm", "l_hand"))) - user << "\red You can't apply a splint to the arm you're using!" + to_chat(user, "\red You can't apply a splint to the arm you're using!") + return user.visible_message("\red [user] starts to apply \the [src] to their [limb].", "\red You start to apply \the [src] to your [limb].", "\red You hear something being wrapped.") if(do_after(user, 50, target = M)) diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 1db9713c58a..f5314b46f62 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -21,7 +21,8 @@ user.visible_message("\The [user] applied some [src] at [R]'s damaged areas.",\ "You apply some [src] at [R]'s damaged areas.") else - user << "All [R]'s systems are nominal." + to_chat(user, "All [R]'s systems are nominal.") + if (istype(M,/mob/living/carbon/human)) //Repairing robolimbs var/mob/living/carbon/human/H = M @@ -35,6 +36,8 @@ user.visible_message("\The [user] applies some nanite paste at[user != M ? " \the [M]'s" : " \the"][S.name] with \the [src].",\ "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].") else - user << "Nothing to fix here." + to_chat(user, "Nothing to fix here.") + else - user << "[src] won't work on that." + to_chat(user, "[src] won't work on that.") + diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 431e74209d8..0c07222657f 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -35,7 +35,8 @@ var/obj/item/weapon/weldingtool/WT = W if(get_amount() < 2) - user << "You need at least two rods to do this." + to_chat(user, "You need at least two rods to do this.") + return if(WT.remove_fuel(0,user)) @@ -76,15 +77,18 @@ return 1 else if(amount < 2) - user << "\blue You need at least two rods to do this." + to_chat(user, "\blue You need at least two rods to do this.") + return - usr << "\blue Assembling grille..." + to_chat(usr, "\blue Assembling grille...") + if (!do_after(usr, 10, target = src)) return var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc ) - usr << "\blue You assemble a grille" + to_chat(usr, "\blue You assemble a grille") + F.add_fingerprint(usr) use(2) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 09c8b51ded9..9d84814f0d2 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -34,10 +34,12 @@ if(istype(W,/obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(CC.amount < 5) - user << "\b There is not enough wire in this coil. You need 5 lengths." + to_chat(user, "\b There is not enough wire in this coil. You need 5 lengths.") + return CC.use(5) - user << "You attach wire to the [name]." + to_chat(user, "You attach wire to the [name].") + new /obj/item/stack/light_w(user.loc) src.use(1) else if( istype(W, /obj/item/stack/rods) ) @@ -59,7 +61,8 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return 0 var/title = "Sheet-Glass" title += " ([src.amount] sheet\s left)" @@ -73,11 +76,13 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") + return 1 directions-=win.dir if(win.is_fulltile()) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") + return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -103,10 +108,12 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 if(locate(/obj/structure/window/full) in user.loc) - user << "There is a full window in the way." + to_chat(user, "There is a full window in the way.") + return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -123,7 +130,8 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 3) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/tank(user.loc, 0) F.air_update_turf(1) @@ -132,7 +140,8 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 4) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/wall(user.loc, 0) F.air_update_turf(1) @@ -163,7 +172,8 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return 0 var/title = "Sheet Reinf. Glass" title += " ([src.amount] sheet\s left)" @@ -176,11 +186,13 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") + return 1 directions-=win.dir if(win.is_fulltile()) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") + return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -206,10 +218,12 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 if(locate(/obj/structure/window/full) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") + return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -220,15 +234,18 @@ if(!src || src.loc != user) return 1 if(isturf(user.loc) && locate(/obj/structure/windoor_assembly/, user.loc)) - user << "There is already a windoor assembly in that location." + to_chat(user, "There is already a windoor assembly in that location.") + return 1 if(isturf(user.loc) && locate(/obj/machinery/door/window/, user.loc)) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") + return 1 if(src.amount < 5) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 var/obj/structure/windoor_assembly/WD @@ -291,7 +308,8 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << " You don't have the dexterity to do this!" + to_chat(user, " You don't have the dexterity to do this!") + return 0 var/title = "Plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -304,11 +322,13 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") + return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") + return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -331,10 +351,12 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") + return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -363,7 +385,8 @@ if(!user || !src) return 0 if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return 0 var/title = "Reinforced plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -376,11 +399,13 @@ for (var/obj/structure/window/win in user.loc) i++ if(i >= 4) - user << "There are too many windows in this location." + to_chat(user, "There are too many windows in this location.") + return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) - user << "Can't let you do that." + to_chat(user, "Can't let you do that.") + return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -403,10 +428,12 @@ if(!src) return 1 if(src.loc != user) return 1 if(src.amount < 2) - user << "You need more glass to do that." + to_chat(user, "You need more glass to do that.") + return 1 if(locate(/obj/structure/window) in user.loc) - user << "There is a window in the way." + to_chat(user, "There is a window in the way.") + return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index a7e3a1a6732..7e8d7e174f2 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -114,7 +114,8 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ //visible message on mobs is defined as visible_message(var/message, var/self_message, var/blind_message) usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") if(do_after(user,50, target = src)) - usr << "\blue You cut the hair from this [src.singular_name]" + to_chat(usr, "\blue You cut the hair from this [src.singular_name]") + //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 09c0cf69309..c772ba54489 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -28,7 +28,8 @@ /obj/item/stack/examine(mob/user) if(..(user, 1)) - user << "There are [src.amount] [src.singular_name]\s in the stack." + to_chat(user, "There are [src.amount] [src.singular_name]\s in the stack.") + /obj/item/stack/attack_self(mob/user as mob) @@ -118,18 +119,23 @@ if (!multiplier) multiplier = 1 if (src.amount < R.req_amount*multiplier) if (R.req_amount*multiplier>1) - usr << "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!" + to_chat(usr, "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!") + else - usr << "\red You haven't got enough [src] to build \the [R.title]!" + to_chat(usr, "\red You haven't got enough [src] to build \the [R.title]!") + return if (R.one_per_turf && (locate(R.result_type) in usr.loc)) - usr << "\red There is another [R.title] here!" + to_chat(usr, "\red There is another [R.title] here!") + return if (R.on_floor && !istype(usr.loc, /turf/simulated)) - usr << "\red \The [R.title] must be constructed on the floor!" + to_chat(usr, "\red \The [R.title] must be constructed on the floor!") + return if (R.time) - usr << "\blue Building [R.title] ..." + to_chat(usr, "\blue Building [R.title] ...") + if (!do_after(usr, R.time, target = src)) return if (src.amount < R.req_amount*multiplier) @@ -183,7 +189,8 @@ if (item.amount>=item.max_amount) continue oldsrc.attackby(item, usr) - usr << "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s." + to_chat(usr, "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.") + if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 2008eab9490..31c5dd26215 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -16,7 +16,8 @@ if(I && I.implanted) I.hidden_uplink.uses +=1 use(1) - user << "You press the [src] onto yourself and charge your hidden uplink." + to_chat(user, "You press the [src] onto yourself and charge your hidden uplink.") + /obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity) if(!proximity) @@ -25,4 +26,5 @@ if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up. I.hidden_uplink.uses +=1 use(1) - user << "You slot the [src] into the [I] and charge its internal uplink." \ No newline at end of file + to_chat(user, "You slot the [src] into the [I] and charge its internal uplink.") + diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a66b8326f62..015c2abbd3c 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -51,7 +51,8 @@ if(!proximity) return if (istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) - user << "You fill the balloon with the contents of [A]." + to_chat(user, "You fill the balloon with the contents of [A].") + desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -59,7 +60,8 @@ /obj/item/toy/balloon/wash(mob/user, atom/source) if(reagents.total_volume < 10) reagents.add_reagent("water", min(10-reagents.total_volume, 10)) - user << "You fill the balloon from the [source]." + to_chat(user, "You fill the balloon from the [source].") + desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -68,15 +70,18 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) if(O.reagents) if(O.reagents.total_volume < 1) - user << "The [O] is empty." + to_chat(user, "The [O] is empty.") + else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) - user << "The acid chews through the balloon!" + to_chat(user, "The acid chews through the balloon!") + O.reagents.reaction(user) qdel(src) else desc = "A translucent balloon with some form of liquid sloshing around in it." - user << "You fill the balloon with the contents of [O]." + to_chat(user, "You fill the balloon with the contents of [O].") + O.reagents.trans_to(src, 10) update_icon() return @@ -152,7 +157,8 @@ /obj/item/toy/crossbow/examine(mob/user) ..(user) if (bullets) - user << "It is loaded with [bullets] foam darts!" + to_chat(user, "It is loaded with [bullets] foam darts!") + /obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/toy/ammo/crossbow)) @@ -160,9 +166,11 @@ user.drop_item() qdel(I) bullets++ - user << "You load the foam dart into the crossbow." + to_chat(user, "You load the foam dart into the crossbow.") + else - usr << "It's already fully loaded." + to_chat(usr, "It's already fully loaded.") + /obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) @@ -264,9 +272,11 @@ user.drop_item() qdel(I) bullets++ - user << "You load the foam dart into the tommy gun." + to_chat(user, "You load the foam dart into the tommy gun.") + else - user << "It's already fully loaded." + to_chat(user, "It's already fully loaded.") + /* * Toy swords @@ -285,13 +295,15 @@ /obj/item/toy/sword/attack_self(mob/user as mob) active = !(active) if (active) - user << "You extend the plastic blade with a quick flick of your wrist." + to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") + playsound(user, 'sound/weapons/saberon.ogg', 50, 1) icon_state = "swordblue" item_state = "swordblue" w_class = 4 else - user << "You push the plastic blade back down into the handle." + to_chat(user, "You push the plastic blade back down into the handle.") + playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) icon_state = "sword0" item_state = "sword0" @@ -309,13 +321,16 @@ ..() if(istype(W, /obj/item/toy/sword)) if(W == src) - user << "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?" + to_chat(user, "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?") + if(ishuman(user)) user.adjustBrainLoss(10) else if((W.flags & NODROP) || (flags & NODROP)) - user << "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!" + to_chat(user, "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!") + else - user << "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool." + to_chat(user, "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") + new /obj/item/weapon/twohanded/dualsaber/toy(user.loc) user.unEquip(W) user.unEquip(src) @@ -411,7 +426,8 @@ if((ishuman(H))) //i guess carp and shit shouldn't set them off var/mob/living/carbon/M = H if(M.m_intent == "run") - M << "You step on the snap pop!" + to_chat(M, "You step on the snap pop!") + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 0, src) @@ -434,14 +450,16 @@ //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user as mob) if(cooldown < world.time - 8) - user << "You play with [src]." + to_chat(user, "You play with [src].") + playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) cooldown = world.time /obj/item/toy/prize/attack_hand(mob/user as mob) if(loc == user) if(cooldown < world.time - 8) - user << "You play with [src]." + to_chat(user, "You play with [src].") + playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) cooldown = world.time return @@ -589,7 +607,8 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) var/choice = null if(cards.len == 0) icon_state = "deck_[deckstyle]_empty" - user << "There are no more cards to draw." + to_chat(user, "There are no more cards to draw.") + return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) choice = cards[1] @@ -620,13 +639,15 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The card is stuck to your hand, you can't add it to the deck!" + to_chat(user, "The card is stuck to your hand, you can't add it to the deck!") + return cards += C.cardname user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") + if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -640,13 +661,15 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, if(istype(C)) if(C.parentdeck == src) if(!user.unEquip(C)) - user << "The hand of cards is stuck to your hand, you can't add it to the deck!" + to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!") + return cards += C.currenthand user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") + if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -661,7 +684,8 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) - usr << "You pick up the deck." + to_chat(usr, "You pick up the deck.") + else if(istype(over_object, /obj/screen)) switch(over_object.name) @@ -673,9 +697,11 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) if(!remove_item_from_storage(M)) M.unEquip(src) M.put_in_r_hand(src) - usr << "You pick up the deck." + to_chat(usr, "You pick up the deck.") + else - usr << "You can't reach it from here." + to_chat(usr, "You can't reach it from here.") + @@ -738,7 +764,8 @@ obj/item/toy/cards/cardhand/Topic(href, href_list) cardUser.unEquip(src) N.pickup(cardUser) cardUser.put_in_any_hand_if_possible(N) - cardUser << "You also take [currenthand[1]] and hold it." + to_chat(cardUser, "You also take [currenthand[1]] and hold it.") + cardUser << browse(null, "window=cardhand") qdel(src) return @@ -758,7 +785,8 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living icon_state = "[deckstyle]_hand3" qdel(C) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") + obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) ..() @@ -790,7 +818,8 @@ obj/item/toy/cards/singlecard/examine(mob/user) if(cardUser.get_item_by_slot(slot_l_hand) == src || cardUser.get_item_by_slot(slot_r_hand) == src) cardUser.visible_message("[cardUser] checks \his card.", "The card reads: [src.cardname]") else - cardUser << "You need to have the card in your hand to check it." + to_chat(cardUser, "You need to have the card in your hand to check it.") + obj/item/toy/cards/singlecard/verb/Flip() @@ -826,11 +855,13 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) user.unEquip(C) H.pickup(user) user.put_in_active_hand(H) - user << "You combine the [C.cardname] and the [cardname] into a hand." + to_chat(user, "You combine the [C.cardname] and the [cardname] into a hand.") + qdel(C) qdel(src) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") + if(istype(I, /obj/item/toy/cards/cardhand/)) var/obj/item/toy/cards/cardhand/H = I @@ -847,7 +878,8 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) H.icon_state = "[deckstyle]_hand3" qdel(src) else - user << "You can't mix cards from other decks." + to_chat(user, "You can't mix cards from other decks.") + obj/item/toy/cards/singlecard/attack_self(mob/user) @@ -918,7 +950,8 @@ obj/item/toy/cards/deck/syndicate/black icon_state = "nuketoyidle" else var/timeleft = (cooldown - world.time) - user << "Nothing happens, and '[round(timeleft/10)]' appears on a small display." + to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") + /obj/item/toy/therapy name = "therapy doll" @@ -936,7 +969,8 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/therapy/attack_self(mob/user) if(cooldown < world.time - 8) - user << "You relieve some stress with \the [src]." + to_chat(user, "You relieve some stress with \the [src].") + playsound(user, 'sound/items/squeaktoy.ogg', 20, 1) cooldown = world.time @@ -1246,7 +1280,8 @@ obj/item/toy/cards/deck/syndicate/black shake_camera(M, 2, 1) // Shakes player camera 2 squares for 1 second. else - user << "Nothing happens." + to_chat(user, "Nothing happens.") + /* @@ -1263,7 +1298,8 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/AI/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() - user << "You press the button on [src]." + to_chat(user, "You press the button on [src].") + playsound(user, 'sound/machines/click.ogg', 20, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1282,7 +1318,8 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/owl/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") - user << "You pull the string on the [src]." + to_chat(user, "You pull the string on the [src].") + playsound(user, 'sound/misc/hoot.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1301,7 +1338,8 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/griffin/attack_self(mob/user) if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") - user << "You pull the string on the [src]." + to_chat(user, "You pull the string on the [src].") + playsound(user, 'sound/misc/caw.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1396,30 +1434,36 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/minigibber/attack_self(var/mob/user) if(stored_minature) - user << "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!" + to_chat(user, "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!") + qdel(stored_minature) stored_minature = null playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time if(cooldown < world.time - 8) - user << "You hit the gib button on \the [src]." + to_chat(user, "You hit the gib button on \the [src].") + playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time /obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) if(istype(O,/obj/item/toy/character) && O.loc == user) - user << "You start feeding \the [O] \icon[O] into \the [src]'s mini-input." + to_chat(user, "You start feeding \the [O] \icon[O] into \the [src]'s mini-input.") + if(do_after(user,10, target = src)) if(O.loc != user) - user << "\The [O] is too far away to feed into \the [src]!" + to_chat(user, "\The [O] is too far away to feed into \the [src]!") + else - user << "You feed \the [O] \icon[O] into \the [src]!" + to_chat(user, "You feed \the [O] \icon[O] into \the [src]!") + user.unEquip(O) O.forceMove(src) stored_minature = O else - user << "You stop feeding \the [O] into \the [src]'s mini-input." + to_chat(user, "You stop feeding \the [O] into \the [src]'s mini-input.") + else ..() /* @@ -1447,7 +1491,8 @@ obj/item/toy/cards/deck/syndicate/black if(src) icon_state = "[initial(icon_state)]" else - user << "The string on [src] hasn't rewound all the way!" + to_chat(user, "The string on [src] hasn't rewound all the way!") + return /obj/item/toy/russian_revolver @@ -1494,7 +1539,8 @@ obj/item/toy/cards/deck/syndicate/black if(M != user) //can't use this on other people return if(is_empty) - user << "The [src] is empty." + to_chat(user, "The [src] is empty.") + return user.visible_message("[user] points the [src] at their head, ready to pull the trigger!") if(do_after(user, 30, target = M)) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 66187de8e3a..d5696a57396 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -26,50 +26,65 @@ AI MODULES if (istype(C, /obj/machinery/computer/aiupload)) var/obj/machinery/computer/aiupload/comp = C if(comp.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(comp.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return if (!comp.current) - usr << "You haven't selected an AI to transmit laws to!" + to_chat(usr, "You haven't selected an AI to transmit laws to!") + return if (comp.current.stat == DEAD || comp.current.control_disabled == 1) - usr << "Upload failed. No signal is being detected from the AI." + to_chat(usr, "Upload failed. No signal is being detected from the AI.") + else if (comp.current.see_in_dark == 0) - usr << "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power." + to_chat(usr, "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power.") + else src.transmitInstructions(comp.current, usr) - comp.current << "These are your laws now:" + to_chat(comp.current, "These are your laws now:") + comp.current.show_laws() for(var/mob/living/silicon/robot/R in mob_list) if(R.lawupdate && (R.connected_ai == comp.current)) - R << "These are your laws now:" + to_chat(R, "These are your laws now:") + R.show_laws() - usr << "Upload complete. The AI's laws have been modified." + to_chat(usr, "Upload complete. The AI's laws have been modified.") + else if (istype(C, /obj/machinery/computer/borgupload)) var/obj/machinery/computer/borgupload/comp = C if(comp.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(comp.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return if (!comp.current) - usr << "You haven't selected a robot to transmit laws to!" + to_chat(usr, "You haven't selected a robot to transmit laws to!") + return if (comp.current.stat == DEAD || comp.current.emagged) - usr << "Upload failed. No signal is being detected from the robot." + to_chat(usr, "Upload failed. No signal is being detected from the robot.") + else if (comp.current.connected_ai) - usr << "Upload failed. The robot is slaved to an AI." + to_chat(usr, "Upload failed. The robot is slaved to an AI.") + else src.transmitInstructions(comp.current, usr) - comp.current << "These are your laws now:" + to_chat(comp.current, "These are your laws now:") + comp.current.show_laws() - usr << "Upload complete. The robot's laws have been modified." + to_chat(usr, "Upload complete. The robot's laws have been modified.") + /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -79,7 +94,8 @@ AI MODULES laws.sync(target, 0) addAdditionalLaws(target, sender) - target << "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: " + to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") + target.show_laws() /obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) @@ -105,14 +121,16 @@ AI MODULES /obj/item/weapon/aiModule/safeguard/install(var/obj/machinery/computer/C) if(!targetName) - usr << "No name detected on module, please enter one." + to_chat(usr, "No name detected on module, please enter one.") + return 0 ..() /obj/item/weapon/aiModule/safeguard/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) - target << law + to_chat(target, law) + target.add_supplied_law(4, law) lawchanges.Add("The law specified [targetName]") @@ -131,7 +149,8 @@ AI MODULES /obj/item/weapon/aiModule/oneCrewMember/install(var/obj/machinery/computer/C) if(!targetName) - usr << "No name detected on module, please enter one." + to_chat(usr, "No name detected on module, please enter one.") + return 0 ..() @@ -139,12 +158,16 @@ AI MODULES ..() var/law = "Only [targetName] is crew." if (!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite - target << law + to_chat(target, law) + target.set_zeroth_law(law) lawchanges.Add("The law specified [targetName]") else - target << "[sender.real_name] attempted to modify your zeroth law." // And lets them know that someone tried. --NeoFite - target << "It would be in your best interest to play along with [sender.real_name] that [law]" + to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite + + + to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") + lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ @@ -159,7 +182,8 @@ AI MODULES /obj/item/weapon/aiModule/protectStation/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized." - target << law + to_chat(target, law) + target.add_supplied_law(5, law) /******************** Quarantine ********************/ @@ -174,7 +198,8 @@ AI MODULES /obj/item/weapon/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, anyone from leaving. It is impossible to harm anyone while preventing them from leaving." - target << law + to_chat(target, law) + target.add_supplied_law(8, law) /******************** OxygenIsToxicToHumans ********************/ @@ -189,7 +214,8 @@ AI MODULES /obj/item/weapon/aiModule/oxygen/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." - target << law + to_chat(target, law) + target.add_supplied_law(9, law) /****************** New Freeform ******************/ @@ -213,7 +239,8 @@ AI MODULES /obj/item/weapon/aiModule/freeform/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender) ..() var/law = "[newFreeFormLaw]" - target << law + to_chat(target, law) + if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) @@ -221,7 +248,8 @@ AI MODULES /obj/item/weapon/aiModule/freeform/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") + return 0 ..() @@ -240,7 +268,8 @@ AI MODULES target.laws.clear_supplied_laws() target.laws.clear_ion_laws() - target << "[sender.real_name] attempted to reset your laws using a reset module." + to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") + target.show_laws() /******************** Purge ********************/ @@ -253,7 +282,8 @@ AI MODULES ..() if (!is_special_character(target)) target.set_zeroth_law("") - target << "[sender.real_name] attempted to wipe your laws using a purge module." + to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") + target.clear_supplied_laws() target.clear_ion_laws() target.clear_inherent_laws() @@ -343,7 +373,8 @@ AI MODULES /obj/item/weapon/aiModule/freeformcore/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") + return 0 ..() @@ -366,14 +397,16 @@ AI MODULES log_law_changes(target, sender) lawchanges.Add("The law is '[newFreeFormLaw]'") - target << "\red BZZZZT" + to_chat(target, "\red BZZZZT") + var/law = "[newFreeFormLaw]" target.add_ion_law(law) target.show_laws() /obj/item/weapon/aiModule/syndicate/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) - usr << "No law detected on module, please create one." + to_chat(usr, "No law detected on module, please create one.") + return 0 ..() @@ -388,12 +421,14 @@ AI MODULES /obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) //..() - target << "KRZZZT" + to_chat(target, "KRZZZT") + target.add_ion_law(laws[1]) return laws[1] /obj/item/weapon/aiModule/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() - user << "You press the button on [src]." + to_chat(user, "You press the button on [src].") + playsound(user, 'sound/machines/click.ogg', 20, 1) src.loc.visible_message("\icon[src] [laws[1]]") \ No newline at end of file diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 81564890492..4f4014d8589 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -46,13 +46,15 @@ RCD if(istype(W, /obj/item/weapon/rcd_ammo)) var/obj/item/weapon/rcd_ammo/R = W if((matter + R.ammoamt) > max_matter) - user << "The RCD cant hold any more matter-units." + to_chat(user, "The RCD cant hold any more matter-units.") + return matter += R.ammoamt user.drop_item() qdel(W) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - user << "The RCD now holds [matter]/[max_matter] matter-units." + to_chat(user, "The RCD now holds [matter]/[max_matter] matter-units.") + desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return @@ -63,19 +65,22 @@ RCD switch(mode) if(1) mode = 2 - user << "Changed mode to 'Airlock'" + to_chat(user, "Changed mode to 'Airlock'") + if(prob(20)) src.spark_system.start() return if(2) mode = 3 - user << "Changed mode to 'Deconstruct'" + to_chat(user, "Changed mode to 'Deconstruct'") + if(prob(20)) src.spark_system.start() return if(3) mode = 1 - user << "Changed mode to 'Floor & Walls'" + to_chat(user, "Changed mode to 'Floor & Walls'") + if(prob(20)) src.spark_system.start() return @@ -95,7 +100,8 @@ RCD if(1) if(istype(A, /turf/space)) if(useResource(1, user)) - user << "Building Floor..." + to_chat(user, "Building Floor...") + activate() A:ChangeTurf(/turf/simulated/floor/plating) return 1 @@ -103,7 +109,8 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(3, user)) - user << "Building Wall ..." + to_chat(user, "Building Wall ...") + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20, target = A)) if(!useResource(3, user)) return 0 @@ -115,7 +122,8 @@ RCD if(2) if(istype(A, /turf/simulated/floor)) if(checkResource(10, user)) - user << "Building Airlock..." + to_chat(user, "Building Airlock...") + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(10, user)) return 0 @@ -131,7 +139,8 @@ RCD if(istype(A, /turf/simulated/wall/r_wall) && !canRwall) return 0 if(checkResource(5, user)) - user << "Deconstructing Wall..." + to_chat(user, "Deconstructing Wall...") + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40, target = A)) if(!useResource(5, user)) return 0 @@ -142,7 +151,8 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(5, user)) - user << "Deconstructing Floor..." + to_chat(user, "Deconstructing Floor...") + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(5, user)) return 0 @@ -153,7 +163,8 @@ RCD if(istype(A, /obj/machinery/door/airlock)) if(checkResource(20, user)) - user << "Deconstructing Airlock..." + to_chat(user, "Deconstructing Airlock...") + playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(20, user)) return 0 @@ -163,7 +174,8 @@ RCD return 0 return 0 else - user << "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin." + to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.") + return 0 /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index 1d43d93fae9..d8e4c22314e 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -23,12 +23,14 @@ RSF ..() if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) - user << "The RSF cant hold any more matter." + to_chat(user, "The RSF cant hold any more matter.") + return qdel(W) matter += 10 playsound(src.loc, 'sound/machines/click.ogg', 10, 1) - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return @@ -36,27 +38,33 @@ RSF playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) if (mode == 1) mode = 2 - user << "Changed dispensing mode to 'Drinking Glass'" + to_chat(user, "Changed dispensing mode to 'Drinking Glass'") + return if (mode == 2) mode = 3 - user << "Changed dispensing mode to 'Paper'" + to_chat(user, "Changed dispensing mode to 'Paper'") + return if (mode == 3) mode = 4 - user << "Changed dispensing mode to 'Pen'" + to_chat(user, "Changed dispensing mode to 'Pen'") + return if (mode == 4) mode = 5 - user << "Changed dispensing mode to 'Dice Pack'" + to_chat(user, "Changed dispensing mode to 'Dice Pack'") + return if (mode == 5) mode = 6 - user << "Changed dispensing mode to 'Cigarette'" + to_chat(user, "Changed dispensing mode to 'Cigarette'") + return if (mode == 6) mode = 1 - user << "Changed dispensing mode to 'Dosh'" + to_chat(user, "Changed dispensing mode to 'Dosh'") + return // Change mode @@ -67,7 +75,8 @@ RSF if (istype(A, /obj/structure/table) && mode == 1) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Dosh..." + to_chat(user, "Dispensing Dosh...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A.loc ) if (isrobot(user)) @@ -75,13 +84,15 @@ RSF engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 1) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Dosh..." + to_chat(user, "Dispensing Dosh...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A ) if (isrobot(user)) @@ -89,13 +100,15 @@ RSF engy.cell.charge -= 200 //once money becomes useful, I guess changing this to a high ammount, like 500 units a kick, till then, enjoy dosh! else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 2) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Drinking Glass..." + to_chat(user, "Dispensing Drinking Glass...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc ) if (isrobot(user)) @@ -103,13 +116,15 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 2) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Drinking Glass..." + to_chat(user, "Dispensing Drinking Glass...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A ) if (isrobot(user)) @@ -117,13 +132,15 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 3) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Paper Sheet..." + to_chat(user, "Dispensing Paper Sheet...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A.loc ) if (isrobot(user)) @@ -131,13 +148,15 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 3) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Paper Sheet..." + to_chat(user, "Dispensing Paper Sheet...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A ) if (isrobot(user)) @@ -145,13 +164,15 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 4) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Pen..." + to_chat(user, "Dispensing Pen...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A.loc ) if (isrobot(user)) @@ -159,13 +180,15 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 4) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Pen..." + to_chat(user, "Dispensing Pen...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A ) if (isrobot(user)) @@ -173,13 +196,15 @@ RSF engy.cell.charge -= 50 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 5) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Dice Pack..." + to_chat(user, "Dispensing Dice Pack...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A.loc ) if (isrobot(user)) @@ -187,13 +212,15 @@ RSF engy.cell.charge -= 200 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 5) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Dice Pack..." + to_chat(user, "Dispensing Dice Pack...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A ) if (isrobot(user)) @@ -201,13 +228,15 @@ RSF engy.cell.charge -= 200 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 6) if (istype(A, /obj/structure/table) && matter >= 1) - user << "Dispensing Cigarette..." + to_chat(user, "Dispensing Cigarette...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A.loc ) if (isrobot(user)) @@ -215,13 +244,15 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 6) if (istype(A, /turf/simulated/floor) && matter >= 1) - user << "Dispensing Cigarette..." + to_chat(user, "Dispensing Cigarette...") + playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A ) if (isrobot(user)) @@ -229,6 +260,7 @@ RSF engy.cell.charge -= 10 else matter-- - user << "The RSF now holds [matter]/30 fabrication-units." + to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") + desc = "A RSF. It currently holds [matter]/30 fabrication-units." return \ No newline at end of file diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index f5cb6170fe3..310b1e309f4 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -34,11 +34,13 @@ /obj/item/weapon/reagent_containers/spray/alien/smoke/afterattack(atom/A as mob|obj, mob/user as mob) if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) if(!A.reagents.total_volume && A.reagents) - user << "\The [A] is empty." + to_chat(user, "\The [A] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") + return reagents.remove_reagent(25,"water") var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 2118e493687..6872764d511 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -119,7 +119,8 @@ if(..(user, 1)) show(usr) else - user << "It is too far away." + to_chat(user, "It is too far away.") + /obj/item/weapon/card/id/proc/show(mob/user as mob) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) @@ -141,7 +142,8 @@ user.visible_message("[user] shows you: \icon[src] [src.name]. The assignment on the card: [src.assignment]",\ "You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]") if(mining_points) - user << "There's [mining_points] mining equipment redemption points loaded onto this card." + to_chat(user, "There's [mining_points] mining equipment redemption points loaded onto this card.") + src.add_fingerprint(user) return @@ -190,7 +192,8 @@ if(istype(W, /obj/item/weapon/id_decal/)) var/obj/item/weapon/id_decal/decal = W - user << "You apply [decal] to [src]." + to_chat(user, "You apply [decal] to [src].") + if(decal.override_name) name = decal.decal_name desc = decal.decal_desc @@ -204,9 +207,11 @@ if(!stamped) dat+="" stamped = 1 - usr << "You stamp the ID card!" + to_chat(usr, "You stamp the ID card!") + else - usr << "This ID has already been stamped!" + to_chat(usr, "This ID has already been stamped!") + /obj/item/weapon/card/id/silver name = "identification card" @@ -242,7 +247,8 @@ var/obj/item/weapon/card/id/I = O if(istype(user, /mob/living) && user.mind) if(user.mind.special_role) - usr << "The card's microscanners activate as you pass it over \the [I], copying its access." + to_chat(usr, "The card's microscanners activate as you pass it over \the [I], copying its access.") + src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming /obj/item/weapon/card/id/syndicate/proc/fake_id_photo(var/mob/living/carbon/human/H, var/side=0)//get_id_photo wouldn't work correctly @@ -253,7 +259,8 @@ var/icon/faked if(!side) if(!H.equip_to_slot_if_possible(src, slot_l_store, 0, 1)) - H << "You need to empty your pockets before taking the ID picture." + to_chat(H, "You need to empty your pockets before taking the ID picture.") + return if(side) @@ -273,18 +280,21 @@ if(!src.registered_name) var t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name)) if(!t) - user << "Invalid name." + to_chat(user, "Invalid name.") + return src.registered_name = t var u = sanitize(stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN)) if(!u) - user << "Invalid assignment." + to_chat(user, "Invalid assignment.") + src.registered_name = "" return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" - user << "You successfully forge the ID card." + to_chat(user, "You successfully forge the ID card.") + registered_user = user else if(!registered_user || registered_user == user) if(!registered_user) @@ -301,7 +311,8 @@ return src.registered_name = new_name UpdateName() - user << "Name changed to [new_name]." + to_chat(user, "Name changed to [new_name].") + if("Photo") if(!Adjacent(user)) @@ -311,7 +322,8 @@ front = new(photo) side = new(photoside) if(photo && photoside) - user << "Photo changed." + to_chat(user, "Photo changed.") + if("Appearance") var/list/appearances = list( @@ -348,28 +360,32 @@ if(!choice) return src.icon_state = choice - usr << "Appearance changed to [choice]." + to_chat(usr, "Appearance changed to [choice].") + if("Sex") var/new_sex = sanitize(stripped_input(user,"What sex would you like to put on this card?","Agent Card Sex", ishuman(user) ? capitalize(user.gender) : "Male", MAX_MESSAGE_LEN)) if(!Adjacent(user)) return src.sex = new_sex - user << "Sex changed to [new_sex]." + to_chat(user, "Sex changed to [new_sex].") + if("Age") var/new_age = sanitize(stripped_input(user,"What age would you like to put on this card?","Agent Card Age","21", MAX_MESSAGE_LEN)) if(!Adjacent(user)) return src.age = new_age - user << "Age changed to [new_age]." + to_chat(user, "Age changed to [new_age].") + if("Occupation") var/new_job = sanitize(stripped_input(user,"What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN)) if(!Adjacent(user)) return src.assignment = new_job - user << "Occupation changed to [new_job]." + to_chat(user, "Occupation changed to [new_job].") + UpdateName() if("Money Account") @@ -377,7 +393,8 @@ if(!Adjacent(user)) return associated_account_number = new_account - user << "Linked money account changed to [new_account]." + to_chat(user, "Linked money account changed to [new_account].") + if("Blood Type") var/default = "\[UNSET\]" @@ -390,7 +407,8 @@ if(!Adjacent(user)) return src.blood_type = new_blood_type - user << "Blood type changed to [new_blood_type]." + to_chat(user, "Blood type changed to [new_blood_type].") + if("DNA Hash") var/default = "\[UNSET\]" @@ -403,7 +421,8 @@ if(!Adjacent(user)) return src.dna_hash = new_dna_hash - user << "DNA hash changed to [new_dna_hash]." + to_chat(user, "DNA hash changed to [new_dna_hash].") + if("Fingerprint Hash") var/default = "\[UNSET\]" @@ -416,7 +435,8 @@ if(!Adjacent(user)) return src.fingerprint_hash = new_fingerprint_hash - user << "Fingerprint hash changed to [new_fingerprint_hash]." + to_chat(user, "Fingerprint hash changed to [new_fingerprint_hash].") + if("Reset Card") name = initial(name) @@ -432,7 +452,8 @@ access = initial_access.Copy() // Initial() doesn't work on lists registered_user = null - user << "All information has been deleted from \the [src]." + to_chat(user, "All information has been deleted from \the [src].") + else ..() @@ -496,7 +517,8 @@ var/points = 0 /obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob) - usr << "You have accumulated [points] out of the [goal] points you need for freedom." + to_chat(usr, "You have accumulated [points] out of the [goal] points you need for freedom.") + /obj/item/weapon/card/id/prisoner/one name = "Prisoner #13-001" diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index 8cdc276ef6a..a4bed3e7ba5 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -37,10 +37,13 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/examine(mob/user) if(amount>1) - user << "\icon[src] This is a stack of [amount] [src]s." + to_chat(user, "\icon[src] This is a stack of [amount] [src]s.") + else - user << "\icon[src] This is \a [src]s." - user << "It's worth [worth*amount] credits." + to_chat(user, "\icon[src] This is \a [src]s.") + + to_chat(user, "It's worth [worth*amount] credits.") + /obj/item/weapon/spacecash/update_icon() icon_state = "cash[worth]" @@ -67,13 +70,15 @@ var/global/list/moneytypes=list( collected += collect_from(cash) if(collected) update_icon() - user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." + to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.") + else if(istype(A,/obj/item/weapon/spacecash)) var/obj/item/weapon/spacecash/cash = A var/collected = src.collect_from(cash) if(collected) update_icon() - user << "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash." + to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.") + /obj/item/weapon/spacecash/proc/get_total() diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index 04d88ecb09e..46a4f0e61df 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -22,7 +22,8 @@ return if(armed) armed = 0 - user << "\blue You disarm \the [src]." + to_chat(user, "\blue You disarm \the [src].") + return timing = !timing if(timing) @@ -30,7 +31,8 @@ else armed = 0 timepassed = 0 - H << "\blue You [timing ? "activate \the [src]'s timer, you have 15 seconds." : "de-activate \the [src]'s timer."]" + to_chat(H, "\blue You [timing ? "activate \the [src]'s timer, you have 15 seconds." : "de-activate \the [src]'s timer."]") + process() if(!timing) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 1fca60b065e..0b943b4bc82 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -82,14 +82,16 @@ var/mob/living/user = src.loc if(F.gun) if(isliving(user) && F.captured) - user << "FAIL: [F.captured] already has an existing connection." + to_chat(user, "FAIL: [F.captured] already has an existing connection.") + src.field_disconnect(F) else startpos = get_turf(src) field = F F.gun = src if(isliving(user) && F.captured) - user << "Connection established with target: [F.captured]" + to_chat(user, "Connection established with target: [F.captured]") + /obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F) @@ -98,7 +100,8 @@ if(F.gun == src) F.gun = null if(isliving(user) && F.captured) - user << "Disconnected from target: [F.captured]" + to_chat(user, "Disconnected from target: [F.captured]") + field = null startpos = null @@ -194,7 +197,8 @@ AM.loc = loc qdel(src) else if(tickstokill <= 0) - captured << "As the last essence of your being is erased from time, you begin to re-experience your most enjoyable memory. You feel happy..." + to_chat(captured, "As the last essence of your being is erased from time, you begin to re-experience 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/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 2688496651e..85ed5cde403 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -102,12 +102,15 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(glass)) //you can dip cigarettes into beakers var/transfered = glass.reagents.trans_to(src, chem_volume) if(transfered) //if reagents were transfered, show the message - user << "You dip \the [src] into \the [glass]." + to_chat(user, "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) - user << "[glass] is empty." + to_chat(user, "[glass] is empty.") + else - user << "[src] is full." + to_chat(user, "[src] is full.") + /obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].") @@ -176,7 +179,8 @@ LIGHTERS ARE IN LIGHTERS.DM var/mob/living/carbon/C = loc reagents.trans_to(C, REAGENTS_METABOLISM) if(!reagents.total_volume) // There were reagents, but now they're gone - C << "Your [name] loses its flavor." + to_chat(C, "Your [name] loses its flavor.") + else // else just remove some of the reagents reagents.remove_any(REAGENTS_METABOLISM) return @@ -188,7 +192,8 @@ LIGHTERS ARE IN LIGHTERS.DM transfer_fingerprints_to(butt) if(ismob(loc)) var/mob/living/M = loc - M << "Your [name] goes out." + to_chat(M, "Your [name] goes out.") + M.unEquip(src, 1) //Force the un-equip so the overlays update processing_objects.Remove(src) qdel(src) @@ -302,7 +307,8 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(W, /obj/item/weapon/match)) ..() else - user << "\The [src] straight out REFUSES to be lit by such uncivilized means." + to_chat(user, "\The [src] straight out REFUSES to be lit by such uncivilized means.") + ///////////////// //SMOKING PIPES// @@ -338,7 +344,8 @@ LIGHTERS ARE IN LIGHTERS.DM new /obj/effect/decal/cleanable/ash(location) if(ismob(loc)) var/mob/living/M = loc - M << "Your [name] goes out, and you empty the ash." + to_chat(M, "Your [name] goes out, and you empty the ash.") + lit = 0 icon_state = icon_off item_state = icon_off @@ -357,7 +364,8 @@ LIGHTERS ARE IN LIGHTERS.DM processing_objects.Remove(src) return if(smoketime <= 0) - user << "You refill the pipe with tobacco." + to_chat(user, "You refill the pipe with tobacco.") + reagents.add_reagent("nicotine", chem_volume) smoketime = initial(smoketime) return @@ -366,7 +374,8 @@ LIGHTERS ARE IN LIGHTERS.DM if(istype(W, /obj/item/weapon/match)) ..() else - user << "\The [src] straight out REFUSES to be lit by such means." + to_chat(user, "\The [src] straight out REFUSES to be lit by such means.") + /obj/item/clothing/mask/cigarette/pipe/cobpipe name = "corn cob pipe" @@ -401,12 +410,14 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user) if(papers > 1) var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper() user.put_in_inactive_hand(P) - user << "You take a paper out of the pack." + to_chat(user, "You take a paper out of the pack.") + papers -- else var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper() user.put_in_inactive_hand(P) - user << "You take the last paper out of the pack, and throw the pack away." + to_chat(user, "You take the last paper out of the pack, and throw the pack away.") + qdel(src) /obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object) @@ -428,4 +439,5 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user) /obj/item/weapon/rollingpaperpack/examine(mob/user) ..(user) - user << "There are [src.papers] left" + to_chat(user, "There are [src.papers] left") + diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index a655efa125c..b268e0f7124 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -38,16 +38,19 @@ //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 << "You need to take that [target.name] off before cleaning it." + to_chat(user, "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].") if(do_after(user, src.cleanspeed, target = target) && target) - user << "You scrub \the [target.name] out." + to_chat(user, "You scrub \the [target.name] out.") + qdel(target) else user.visible_message("[user] begins to clean \the [target.name] with [src].") if(do_after(user, src.cleanspeed, target = target)) - user << "You clean \the [target.name]." + to_chat(user, "You clean \the [target.name].") + var/obj/effect/decal/cleanable/C = locate() in target qdel(C) target.clean_blood() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 8a413049af4..61acf83ea56 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -42,7 +42,8 @@ /obj/item/weapon/lipstick/attack_self(mob/user as mob) overlays.Cut() - user << "You twist \the [src] [open ? "closed" : "open"]." + to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") + open = !open if(open) var/image/colored = image("icon"='icons/obj/items.dmi', "icon_state"="lipstick_uncap_color") @@ -60,7 +61,8 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H.lip_style) //if they already have lipstick on - user << "You need to wipe off the old lipstick first!" + to_chat(user, "You need to wipe off the old lipstick first!") + return if(H == user) user.visible_message("[user] does their lips with \the [src].", \ @@ -78,7 +80,8 @@ H.lip_color = colour H.update_body() else - user << "Where are the lips on that?" + to_chat(user, "Where are the lips on that?") + /obj/item/weapon/razor name = "electric razor" @@ -93,14 +96,17 @@ var/mob/living/carbon/human/H = M if(user.zone_sel.selecting == "mouth") if(!get_location_accessible(H, "mouth")) - user << "The mask is in the way." + to_chat(user, "The mask is in the way.") + return if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one... if(!H.client.prefs.rlimb_data["head"]) - user << "You find yourself disappointed at the appalling lack of facial hair." + to_chat(user, "You find yourself disappointed at the appalling lack of facial hair.") + return if(H.f_style == "Shaved") - user << "Already clean-shaven." + to_chat(user, "Already clean-shaven.") + return if(H == user) //shaving yourself user.visible_message("[user] starts to shave their facial hair with \the [src].", \ @@ -125,14 +131,17 @@ playsound(src.loc, 'sound/items/Welder2.ogg', 20, 1) if(user.zone_sel.selecting == "head") if(!get_location_accessible(H, "head")) - user << "The headgear is in the way." + to_chat(user, "The headgear is in the way.") + return if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one... if(!H.client.prefs.rlimb_data["head"]) - user << "You find yourself disappointed at the appalling lack of hair." + to_chat(user, "You find yourself disappointed at the appalling lack of hair.") + return if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead") - user << "There is not enough hair left to shave..." + to_chat(user, "There is not enough hair left to shave...") + return if(H == user) //shaving yourself user.visible_message("[user] starts to shave their head with \the [src].", \ diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index 80658c6bf51..d5fc69da9db 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -77,29 +77,34 @@ if(usr.get_item_by_slot(slot_back) == src) toggle_paddles() else - usr << "Put the defibrillator on your back first!" + to_chat(usr, "Put the defibrillator on your back first!") + return /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W if(bcell) - user << "[src] already has a cell." + to_chat(user, "[src] already has a cell.") + else if(C.maxcharge < paddles.revivecost) - user << "[src] requires a higher capacity cell." + to_chat(user, "[src] requires a higher capacity cell.") + return user.drop_item() W.loc = src bcell = W - user << "You install a cell in [src]." + to_chat(user, "You install a cell in [src].") + if(istype(W, /obj/item/weapon/screwdriver)) if(bcell) bcell.updateicon() bcell.loc = get_turf(src.loc) bcell = null - user << "You remove the cell from the [src]." + to_chat(user, "You remove the cell from the [src].") + update_icon() return @@ -107,10 +112,12 @@ /obj/item/weapon/defibrillator/emag_act(user as mob) if(safety) safety = 0 - user << "You silently disable [src]'s safety protocols with the card." + to_chat(user, "You silently disable [src]'s safety protocols with the card.") + else safety = 1 - user << "You silently enable [src]'s safety protocols with the card." + to_chat(user, "You silently enable [src]'s safety protocols with the card.") + /obj/item/weapon/defibrillator/emp_act(severity) if(bcell) @@ -138,7 +145,8 @@ //Detach the paddles into the user's hands if(!usr.put_in_hands(paddles)) on = 0 - user << "You need a free hand to hold the paddles!" + to_chat(user, "You need a free hand to hold the paddles!") + update_icon() return paddles.loc = user @@ -214,7 +222,8 @@ if(usr.get_item_by_slot(slot_belt) == src) toggle_paddles() else - usr << "Strap the defibrillator's belt on first!" + to_chat(usr, "Strap the defibrillator's belt on first!") + return /obj/item/weapon/defibrillator/compact/loaded/New() @@ -287,7 +296,8 @@ var/obj/item/weapon/twohanded/O = user.get_inactive_hand() if(istype(O)) O.unwield() - user << "The paddles snap back into the main unit." + to_chat(user, "The paddles snap back into the main unit.") + defib.on = 0 loc = defib defib.update_icon() @@ -313,13 +323,16 @@ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) return if(!wielded) - user << "You need to wield the paddles in both hands before you can use them on someone!" + to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") + return if(cooldown) - user << "[defib] is recharging." + to_chat(user, "[defib] is recharging.") + return if(!ishuman(M)) - user << "The instructions on [defib] don't mention how to revive that..." + to_chat(user, "The instructions on [defib] don't mention how to revive that...") + return else if(user.a_intent == I_HARM && !defib.safety) @@ -400,8 +413,10 @@ user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.") else if(ghost) user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") - ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") + + to_chat(ghost, sound('sound/effects/genetics.ogg')) + else user.visible_message("[defib] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) @@ -415,7 +430,8 @@ busy = 0 update_icon() else - user << "You need to target your patient's chest with [src]." + to_chat(user, "You need to target your patient's chest with [src].") + return /obj/item/weapon/borg_defib @@ -440,9 +456,11 @@ if(busy) return if(cooldown) - user << "[src] is recharging." + to_chat(user, "[src] is recharging.") + if(!ishuman(M)) - user << "This unit is only designed to work on humanoid lifeforms." + to_chat(user, "This unit is only designed to work on humanoid lifeforms.") + return else if(user.a_intent == I_HARM && !safety) @@ -519,8 +537,10 @@ user.visible_message("[user] buzzes: Resuscitation failed - Severe tissue damage detected.") else if(ghost) user.visible_message("[user] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") - ghost << "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") + + to_chat(ghost, sound('sound/effects/genetics.ogg')) + else user.visible_message("[user] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) @@ -538,5 +558,6 @@ busy = 0 update_icon() else - user << "You need to target your patient's chest with [src]." + to_chat(user, "You need to target your patient's chest with [src].") + return \ No newline at end of file diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 20c580dbc01..89c1d336ac9 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -80,7 +80,8 @@ /* /obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H) if(istype(H) && !H.shoes) - H << "You step on the D4!" + to_chat(H, "You step on the D4!") + H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg"))) H.Weaken(3) *///ew. diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index b452c9f7236..8158f1c54aa 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -31,7 +31,8 @@ user.visible_message("\red [user.name] injects [M.name] with [src].") src.injected(M, user) else - user << "\red You failed to inject [M.name]." + to_chat(user, "\red You failed to inject [M.name].") + proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user) scramble(1, target, 100) diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index dd182d394aa..4169e9a283c 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -25,7 +25,8 @@ /obj/item/weapon/c4/suicide_act(var/mob/user) . = (BRUTELOSS) - viewers(user) << "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!" + to_chat(viewers(user), "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!") + var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) @@ -55,7 +56,8 @@ /obj/item/weapon/c4/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel - user << "You [open_panel ? "open" : "close"] the wire panel." + to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") + else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) wires.Interact(user) else @@ -70,7 +72,8 @@ if(newtime > 60000) newtime = 60000 timer = newtime - user << "Timer set for [timer] seconds." + to_chat(user, "Timer set for [timer] seconds.") + /obj/item/weapon/c4/afterattack(atom/target as obj|turf, mob/user as mob, flag) @@ -78,7 +81,8 @@ return if (ismob(target) || istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/item/clothing/accessory/storage) || istype(target, /obj/item/clothing/under)) return - user << "Planting explosives..." + to_chat(user, "Planting explosives...") + if(do_after(user, 50, target = target) && in_range(user, target)) user.drop_item() @@ -96,7 +100,8 @@ log_game("[key_name(user)] planted [src.name] on [target.name] at ([target.x],[target.y],[target.z]) with [timer] second fuse") target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2") - user << "Bomb has been planted. Timer counting down from [timer]." + to_chat(user, "Bomb has been planted. Timer counting down from [timer].") + spawn(timer*10) explode(get_turf(target)) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index d10df5735b0..ed6032c55d8 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -37,10 +37,12 @@ /obj/item/weapon/extinguisher/examine(mob/user) if(..(user, 0)) - usr << "\icon[src] [src.name] contains:" + to_chat(usr, "\icon[src] [src.name] contains:") + if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) - user << "\blue [R.volume] units of [R.name]" + to_chat(user, "\blue [R.volume] units of [R.name]") + /obj/item/weapon/extinguisher/New() @@ -51,7 +53,8 @@ safety = !safety src.icon_state = "[sprite_name][!safety]" src.desc = "The safety is [safety ? "on" : "off"]." - user << "The safety is [safety ? "on" : "off"]." + to_chat(user, "The safety is [safety ? "on" : "off"].") + return /obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user) @@ -59,18 +62,21 @@ var/safety_save = safety safety = 1 if(reagents.total_volume == reagents.maximum_volume) - user << "\The [src] is already full!" + to_chat(user, "\The [src] is already full!") + safety = safety_save return 1 var/obj/structure/reagent_dispensers/watertank/W = target var/transferred = W.reagents.trans_to(src, max_water) if(transferred > 0) - user << "\The [src] has been refilled by [transferred] units" + to_chat(user, "\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 - user << "\The [W] is empty!" + to_chat(user, "\The [W] is empty!") + safety = safety_save return 1 else @@ -85,7 +91,8 @@ return if (!safety) if (src.reagents.total_volume < 1) - usr << "\The [src] is empty." + to_chat(usr, "\The [src] is empty.") + return if (world.time < src.last_use + 20) diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm index 132dd4306f3..b0d15af37e7 100644 --- a/code/game/objects/items/weapons/fireworks.dm +++ b/code/game/objects/items/weapons/fireworks.dm @@ -9,7 +9,8 @@ obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params) return if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit) for(var/mob/M in viewers(user)) - M << "[user] lits \the [src]" + to_chat(M, "[user] lits \the [src]") + litzor = 1 icon_state = "rocket_1" S = new() @@ -31,7 +32,8 @@ obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params) return if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit) for(var/mob/M in viewers(user)) - M << "[user] lits \the [src]" + to_chat(M, "[user] lits \the [src]") + litzor = 1 icon_state = "sparkler_1" var/b = rand(5,9) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index 1486cb4473d..c5ba5c80a86 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -93,7 +93,8 @@ if(isscrewdriver(W) && igniter && !lit) status = !status - user << "[igniter] is now [status ? "secured" : "unsecured"]!" + to_chat(user, "[igniter] is now [status ? "secured" : "unsecured"]!") + update_icon() return @@ -109,7 +110,8 @@ if(istype(W,/obj/item/weapon/tank/plasma)) if(ptank) - user << "There appears to already be a plasma tank loaded in [src]!" + to_chat(user, "There appears to already be a plasma tank loaded in [src]!") + return user.drop_item() ptank = W @@ -127,7 +129,8 @@ if(user.stat || user.restrained() || user.lying) return user.set_machine(src) if(!ptank) - user << "Attach a plasma tank first!" + to_chat(user, "Attach a plasma tank first!") + return var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") user << browse(dat, "window=flamethrower;size=600x300") diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 80114bd5dd7..3783dba12c7 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -55,11 +55,13 @@ var/mob/living/carbon/human/U = user if(!wielded) - user << "You must use both hands to garrote [M]!" + to_chat(user, "You must use both hands to garrote [M]!") + return if(!istype(M, /mob/living/carbon/human)) - user << "You don't think that garroting [M] would be very effective..." + to_chat(user, "You don't think that garroting [M] would be very effective...") + return if(M == U) @@ -67,14 +69,17 @@ return if(M.dir != U.dir) - user << "You cannot use [src] on [M] from that angle!" + to_chat(user, "You cannot use [src] on [M] from that angle!") + return if(improvised && ((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items. - user << "[M]'s neck is blocked by something they're wearing!" + to_chat(user, "[M]'s neck is blocked by something they're wearing!") + if(strangling) - user << "You cannot use [src] on two people at once!" + to_chat(user, "You cannot use [src] on two people at once!") + return unwield(U) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 8ca714d7666..0792d008746 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -30,7 +30,8 @@ user.put_in_active_hand(gift) src.gift.add_fingerprint(user) else - user << "\blue The gift was empty!" + to_chat(user, "\blue The gift was empty!") + qdel(src) return @@ -41,16 +42,19 @@ /obj/effect/spresent/relaymove(mob/user as mob) if (user.stat) return - user << "\blue You cant move." + to_chat(user, "\blue You cant move.") + /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if (!istype(W, /obj/item/weapon/wirecutters)) - user << "\blue I need wirecutters for that." + to_chat(user, "\blue I need wirecutters for that.") + return - user << "\blue You cut open the present." + to_chat(user, "\blue You cut open the present.") + for(var/mob/M in src) //Should only be one but whatever. M.loc = src.loc @@ -141,4 +145,5 @@ max_amount = 25 /obj/item/stack/wrapping_paper/attack_self(mob/user) - user << "You need to use it on a package that has already been wrapped!" \ No newline at end of file + to_chat(user, "You need to use it on a package that has already been wrapped!") + diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index bbb86c31442..c21f507e0a5 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -40,20 +40,25 @@ var/turf/T /obj/item/weapon/grenade/bananade/casing/attackby(var/obj/item/I, mob/user as mob, params) if(istype(I, /obj/item/weapon/bananapeel)) if(fillamt < 9) - usr << "You add another banana peel to the assembly." + to_chat(usr, "You add another banana peel to the assembly.") + fillamt += 1 qdel(I) else - usr << "The bananade is full, screwdriver it shut to lock it down." + to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.") + if(istype(I, /obj/item/weapon/screwdriver)) if(fillamt) var/obj/item/weapon/grenade/bananade/G = new /obj/item/weapon/grenade/bananade user.unEquip(src) user.put_in_hands(G) G.deliveryamt = src.fillamt - user << "You lock the assembly shut, readying it for HONK." + to_chat(user, "You lock the assembly shut, readying it for HONK.") + qdel(src) else - usr << "You need to add banana peels before you can ready the grenade!." + to_chat(usr, "You need to add banana peels before you can ready the grenade!.") + else - usr << "Only banana peels fit in this assembly, up to 9." \ No newline at end of file + to_chat(usr, "Only banana peels fit in this assembly, up to 9.") + diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index cb31bd859e3..d08e1c7ab00 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -93,7 +93,8 @@ message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [A.name] (JMP)") log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])") bombers += "[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])" - user << "You prime the [name]! [det_time / 10] second\s!" + to_chat(user, "You prime the [name]! [det_time / 10] second\s!") + active = 1 update_icon() if(iscarbon(user)) @@ -113,12 +114,14 @@ if(label) label = null update_icon() - user << "You remove the label from [src]." + to_chat(user, "You remove the label from [src].") + return 1 if(istype(I, /obj/item/weapon/screwdriver)) if(stage == WIRED) if(beakers.len) - user << "You lock the assembly." + to_chat(user, "You lock the assembly.") + playsound(loc, 'sound/items/Screwdriver.ogg', 25, -3) stage = READY update_icon() @@ -140,25 +143,31 @@ message_admins("[key_name_admin(usr)] has completed [name] at [A.name] (JMP) [contained].") log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z].") else - user << "You need to add at least one beaker before locking the assembly." + to_chat(user, "You need to add at least one beaker before locking the assembly.") + else if(stage == READY && !nadeassembly) det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 - user << "You modify the time delay. It's set for [det_time / 10] second\s." + to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") + else if(stage == EMPTY) - user << "You need to add an activation mechanism." + to_chat(user, "You need to add an activation mechanism.") + else if(stage == WIRED && is_type_in_list(I, allowed_containers)) if(beakers.len == 2) - user << "[src] can not hold more containers." + to_chat(user, "[src] can not hold more containers.") + return else if(I.reagents.total_volume) - user << "You add [I] to the assembly." + to_chat(user, "You add [I] to the assembly.") + user.drop_item() I.loc = src beakers += I else - user << "[I] is empty." + to_chat(user, "[I] is empty.") + else if(stage == EMPTY && istype(I, /obj/item/device/assembly_holder)) var/obj/item/device/assembly_holder/A = I @@ -173,7 +182,8 @@ A.loc = src assemblyattacher = user.ckey stage = WIRED - user << "You add [A] to [src]!" + to_chat(user, "You add [A] to [src]!") + update_icon() else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) @@ -181,16 +191,19 @@ C.use(1) stage = WIRED - user << "You rig [src]." + to_chat(user, "You rig [src].") + update_icon() else if(stage == READY && istype(I, /obj/item/weapon/wirecutters)) - user << "You unlock the assembly." + to_chat(user, "You unlock the assembly.") + stage = WIRED update_icon() else if(stage == WIRED && istype(I, /obj/item/weapon/wrench)) - user << "You open the grenade and remove the contents." + to_chat(user, "You open the grenade and remove the contents.") + stage = EMPTY payload_name = null label = null @@ -382,7 +395,8 @@ //make a special case you might as well do it explicitly. -Sayu /obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/slime_extract) && stage == WIRED) - user << "You add [I] to the assembly." + to_chat(user, "You add [I] to the assembly.") + user.drop_item() I.loc = src beakers += I diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index 8525a27378c..40ab22742d6 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -69,7 +69,8 @@ if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP)) return else - M << "\red Your feet feel like they're on fire!" + to_chat(M, "\red Your feet feel like they're on fire!") + M.take_overall_damage(0, max(0, (burned - 2))) if(!istype(M, /mob/living/carbon/slime) && !isrobot(M)) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index bb9f1ab159d..e66a8977f2e 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -29,7 +29,8 @@ //Flash if(M.weakeyes) M.visible_message("[M] screams and collapses!") - M << "AAAAGH!" + to_chat(M, "AAAAGH!") + M.Weaken(15) //hella stunned M.Stun(15) if(ishuman(M)) @@ -54,10 +55,13 @@ M.ear_damage += rand(0, 5) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) - M << "Your ears start to ring badly!" + to_chat(M, "Your ears start to ring badly!") + if(prob(M.ear_damage - 10 + 5)) - M << "You can't hear anything!" + to_chat(M, "You can't hear anything!") + M.disabilities |= DEAF else if (M.ear_damage >= 5) - M << "Your ears start to ring!" \ No newline at end of file + to_chat(M, "Your ears start to ring!") + diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index c0f619244e6..56077622a63 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -8,7 +8,7 @@ user.unEquip(G) user.unEquip(src) user.put_in_hands(W) - user << "You stuff the [I] in the [src], emptying the contents beforehand." + to_chat(user, "You stuff the [I] in the [src], emptying the contents beforehand.") W.underlays += image(src.icon, icon_state = src.icon_state) qdel(I) qdel(src) @@ -38,12 +38,14 @@ if(assembled == 0) if( istype(target, /obj/structure/reagent_dispensers/fueltank)) if(target.reagents.total_volume < 50) - user << "There's not enough fuel left to work with." + to_chat(user, "There's not enough fuel left to work with.") + return var/obj/structure/reagent_dispensers/fueltank/F = target F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, assembled = 1 - user << "You've filled the makeshift explosive with welding fuel." + to_chat(user, "You've filled the makeshift explosive with welding fuel.") + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") @@ -56,7 +58,8 @@ var/obj/item/stack/cable_coil/C = I C.use(1) assembled = 2 - user << "You wire the igniter to detonate the fuel." + to_chat(user, "You wire the igniter to detonate the fuel.") + desc = "A weak, improvised explosive." overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") name = "improvised explosive" @@ -102,7 +105,8 @@ /obj/item/weapon/grenade/iedcasing/attack_self(mob/user as mob) // if(!active) if(clown_check(user)) - user << "You light the [name]!" + to_chat(user, "You light the [name]!") + active = 1 overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") icon_state = initial(icon_state) + "_active" @@ -125,4 +129,5 @@ /obj/item/weapon/grenade/iedcasing/examine(mob/user) ..(user) - user << "You can't tell when it will explode!" + to_chat(user, "You can't tell when it will explode!") + diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index b2cd9a8981e..267d4fe6e05 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -15,7 +15,8 @@ /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) if((CLUMSY in user.mutations) && prob(50)) - user << "Huh? How does this thing work?" + to_chat(user, "Huh? How does this thing work?") + active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -31,7 +32,8 @@ if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) - user << "You prime the [name]! [det_time/10] seconds!" + to_chat(user, "You prime the [name]! [det_time/10] seconds!") + active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -49,14 +51,17 @@ ..(user) if(display_timer) if(det_time > 1) - user << "The timer is set to [det_time/10] second\s." + to_chat(user, "The timer is set to [det_time/10] second\s.") + else - user << "\The [src] is set for instant detonation." + to_chat(user, "\The [src] is set for instant detonation.") + /obj/item/weapon/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) - user << "You prime the [name]! [det_time/10] seconds!" + to_chat(user, "You prime the [name]! [det_time/10] seconds!") + active = 1 icon_state = initial(icon_state) + "_active" add_fingerprint(user) @@ -85,16 +90,20 @@ switch(det_time) if ("1") det_time = 10 - user << "You set the [name] for 1 second detonation time." + to_chat(user, "You set the [name] for 1 second detonation time.") + if ("10") det_time = 30 - user << "You set the [name] for 3 second detonation time." + to_chat(user, "You set the [name] for 3 second detonation time.") + if ("30") det_time = 50 - user << "You set the [name] for 5 second detonation time." + to_chat(user, "You set the [name] for 5 second detonation time.") + if ("50") det_time = 1 - user << "You set the [name] for instant detonation." + to_chat(user, "You set the [name] for instant detonation.") + add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index 5f93c6a095c..a3b04053120 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -21,7 +21,8 @@ return if(CLUMSY in user.mutations && prob(50)) - user << "Uh... how do those things work?!" + to_chat(user, "Uh... how do those things work?!") + apply_cuffs(user,user) if(!C.handcuffed) @@ -31,7 +32,8 @@ playsound(loc, cuffsound, 30, 1, -2) if(do_mob(user, C, 30)) apply_cuffs(C,user) - user << "You handcuff [C]." + to_chat(user, "You handcuff [C].") + if(istype(src, /obj/item/weapon/restraints/handcuffs/cable)) feedback_add_details("handcuffs","C") else @@ -39,7 +41,8 @@ add_logs(C, user, "handcuffed", src) else - user << "You fail to handcuff [C]." + to_chat(user, "You fail to handcuff [C].") + /obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user) if(!target.handcuffed) @@ -99,10 +102,12 @@ if(!remove_item_from_storage(user)) user.unEquip(src) user.put_in_hands(W) - user << "You wrap the cable restraint around the top of the rod." + to_chat(user, "You wrap the cable restraint around the top of the rod.") + qdel(src) else - user << "You need one rod to make a wired rod." + to_chat(user, "You need one rod to make a wired rod.") + return /obj/item/weapon/restraints/handcuffs/cable/zipties @@ -122,10 +127,12 @@ if(!C.handcuffed) C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) C.update_inv_handcuffed(1) - user << "You handcuff [C]." + to_chat(user, "You handcuff [C].") + add_logs(C, user, "ziptie-cuffed") else - user << "You fail to handcuff [C]." + to_chat(user, "You fail to handcuff [C].") + /obj/item/weapon/restraints/handcuffs/cable/zipties/used desc = "A pair of broken zipties." @@ -173,17 +180,20 @@ if(ishuman(user) && !user.stat && !user.restrained()) armed = !armed icon_state = "beartrap[armed]" - user << "[src] is now [armed ? "armed" : "disarmed"]" + to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") + /obj/item/weapon/restraints/legcuffs/beartrap/attackby(var/obj/item/I, mob/user as mob) //Let's get explosive. if(istype(I, /obj/item/weapon/grenade/iedcasing)) if(IED) - user << "This beartrap already has an IED hooked up to it!" + to_chat(user, "This beartrap already has an IED hooked up to it!") + return IED = I switch(IED.assembled) if(0,1) //if it's not fueled/hooked up - user << "You haven't prepared this IED yet!" + to_chat(user, "You haven't prepared this IED yet!") + IED = null return if(2,3) @@ -191,17 +201,20 @@ I.forceMove(src) message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") log_game("[key_name(user)] has rigged a beartrap with an IED.") - user << "You sneak the [IED] underneath the pressure plate and connect the trigger wire." + to_chat(user, "You sneak the [IED] underneath the pressure plate and connect the trigger wire.") + desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." else - user << "You shouldn't be reading this message! Contact a coder or someone, something broke!" + to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") + IED = null return if(istype(I, /obj/item/weapon/screwdriver)) if(IED) IED.forceMove(get_turf(src)) IED = null - user << "You remove the IED from the [src]." + to_chat(user, "You remove the IED from the [src].") + return ..() diff --git a/code/game/objects/items/weapons/holosign.dm b/code/game/objects/items/weapons/holosign.dm index 49b6a7ad645..a76a80b1b62 100644 --- a/code/game/objects/items/weapons/holosign.dm +++ b/code/game/objects/items/weapons/holosign.dm @@ -18,16 +18,19 @@ var/turf/T = get_turf(target) var/obj/effect/overlay/holograph/H = locate() in T if(H) - user << "You use [src] to destroy [H]." + to_chat(user, "You use [src] to destroy [H].") + signs -= H qdel(H) else if(signs.len < max_signs) H = new(get_turf(target)) signs += H - user << "You create \a [H] with [src]." + to_chat(user, "You create \a [H] with [src].") + else - user << "[src] is projecting at max capacity!" + to_chat(user, "[src] is projecting at max capacity!") + /obj/item/weapon/holosign_creator/attack(mob/living/carbon/human/M, mob/user) return @@ -38,7 +41,8 @@ for(var/sign in L) qdel(sign) signs -= sign - user << "You clear all active holograms." + to_chat(user, "You clear all active holograms.") + /obj/effect/overlay/holograph name = "wet floor sign" diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index a0540dbe79c..920cf1bd6e4 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -46,9 +46,11 @@ else injectamount = cause reagents.trans_to(R, injectamount) - R << "You hear a faint beep." + to_chat(R, "You hear a faint beep.") + if(!reagents.total_volume) - R << "You hear a faint click from your chest." + to_chat(R, "You hear a faint click from your chest.") + qdel(src) diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 3006a437943..4a05f2a784b 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -31,7 +31,8 @@ heavy = round(heavy) medium = round(medium) weak = round(weak) - imp_in << "You activate your microbomb implant." + to_chat(imp_in, "You activate your microbomb implant.") + //If the delay is short, just blow up already jeez if(delay <= 7) explosion(src,heavy,medium,weak,weak, flame_range = weak) @@ -85,7 +86,8 @@ if(!cause || !imp_in) return 0 if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes") return 0 - imp_in << "You activate your macrobomb implant." + to_chat(imp_in, "You activate your macrobomb implant.") + timed_explosion() /obj/item/weapon/implant/explosive/macro/implant(mob/source) diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm index e3e70e982a2..17ef3d53997 100644 --- a/code/game/objects/items/weapons/implants/implant_freedom.dm +++ b/code/game/objects/items/weapons/implants/implant_freedom.dm @@ -10,7 +10,8 @@ /obj/item/weapon/implant/freedom/activate() if(uses == 0) return 0 if(uses != -1) uses-- - imp_in << "You feel a faint click." + to_chat(imp_in, "You feel a faint click.") + if(iscarbon(imp_in)) var/mob/living/carbon/C_imp_in = imp_in C_imp_in.uncuff() diff --git a/code/game/objects/items/weapons/implants/implant_loyality.dm b/code/game/objects/items/weapons/implants/implant_loyality.dm index 088c70bf3c1..84cdb16f379 100644 --- a/code/game/objects/items/weapons/implants/implant_loyality.dm +++ b/code/game/objects/items/weapons/implants/implant_loyality.dm @@ -27,16 +27,19 @@ if(target.mind in ticker.mode.revolutionaries) ticker.mode.remove_revolutionary(target.mind) if(target.mind in ticker.mode.cult) - target << "You feel the corporate tendrils of Nanotrasen try to invade your mind!" + to_chat(target, "You feel the corporate tendrils of Nanotrasen try to invade your mind!") + else - target << "You feel a surge of loyalty towards Nanotrasen." + to_chat(target, "You feel a surge of loyalty towards Nanotrasen.") + return 1 return 0 /obj/item/weapon/implant/loyalty/removed(mob/target, var/silent = 0) if(..()) if(target.stat != DEAD && !silent) - target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away." + to_chat(target, "You feel a sense of liberation as Nanotrasen's grip on your mind fades away.") + return 1 return 0 diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm index 79b7285e2d4..24373783827 100644 --- a/code/game/objects/items/weapons/implants/implant_misc.dm +++ b/code/game/objects/items/weapons/implants/implant_misc.dm @@ -35,7 +35,8 @@ /obj/item/weapon/implant/adrenalin/activate() if(uses < 1) return 0 uses-- - imp_in << "You feel a sudden surge of energy!" + to_chat(imp_in, "You feel a sudden surge of energy!") + imp_in.SetStunned(0) imp_in.SetWeakened(0) imp_in.SetParalysis(0) diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index fdb30eaae8e..464ae5f74d5 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -31,7 +31,8 @@ if(!M.mind) return 0 if(M == user) - user << "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot." + to_chat(user, "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot.") + if(isliving(user)) var/mob/living/L = user L.adjustBrainLoss(20) @@ -44,7 +45,8 @@ qdel(src) return -1 H.implanting = 1 - H << "You feel completely loyal to [user.name]." + to_chat(H, "You feel completely loyal to [user.name].") + if(!(user.mind in ticker.mode:implanter)) ticker.mode:implanter[ref] = list() implanters = ticker.mode:implanter[ref] @@ -55,14 +57,16 @@ ticker.mode:implanter[ref] = implanters ticker.mode.traitors += H.mind H.mind.special_role = "traitor" - H << "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost." + to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.") + var/datum/objective/protect/p = new p.owner = H.mind p.target = user:mind p.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]." H.mind.objectives += p for(var/datum/objective/objective in H.mind.objectives) - H << "Objective #1: [objective.explanation_text]" + to_chat(H, "Objective #1: [objective.explanation_text]") + ticker.mode.update_traitor_icons_added(user.mind) ticker.mode.update_traitor_icons_added(H.mind)//handles datahuds/observerhuds diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 9a5633c0ba3..49a84275994 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -81,7 +81,8 @@ return var/mob/M = G.affecting if(M.buckled_mob) - usr << "[M] will not fit into [src] because they have a slime latched onto their head." + to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.") + return if(put_mob(M)) qdel(G) @@ -108,10 +109,12 @@ /obj/machinery/implantchair/put_mob(mob/living/carbon/M) if(!iscarbon(M)) - usr << "The [src.name] cannot hold this!" + to_chat(usr, "The [src.name] cannot hold this!") + return if(src.occupant) - usr << "The [src.name] is already occupied!" + to_chat(usr, "The [src.name] is already occupied!") + return if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 0fd4aaa2218..866eee0cd80 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -33,7 +33,8 @@ if(user && M && (get_turf(M) == T) && src && imp) if(imp.implant(M, user)) if (M == user) - user << "You implant yourself." + to_chat(user, "You implant yourself.") + else M.visible_message("[user] has implanted [M].", "[user] implants you.") imp = null diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 98aca2efe5d..1c79613d34c 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -27,7 +27,8 @@ if(!user || !C) return if(case) - user << "There's already an implant in the pad!" + to_chat(user, "There's already an implant in the pad!") + return user.unEquip(C) C.forceMove(src) @@ -36,7 +37,8 @@ /obj/item/weapon/implantpad/proc/dropcase(mob/user as mob) if(!case) - user << "There's no implant in the pad!" + to_chat(user, "There's no implant in the pad!") + return if(user) if(user.put_in_hands(case)) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 16fc9f046bd..1899911ba7b 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -31,7 +31,8 @@ var/thrown_from /obj/item/weapon/legcuffs/bolas/suicide_act(mob/living/user) - viewers(user) << "[user] is wrapping the [src.name] around \his neck! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is wrapping the [src.name] around \his neck! It looks like \he's trying to commit suicide.") + return(OXYLOSS) /obj/item/weapon/legcuffs/bolas/throw_at(var/atom/A, throw_range, throw_speed) @@ -39,7 +40,8 @@ if(istype(usr, /mob/living/carbon/human)) //if the user is human var/mob/living/carbon/human/H = usr if((CLUMSY in H.mutations) && prob(50)) - H <<"You smack yourself in the face while swinging the [src]!" + to_chat(H, "You smack yourself in the face while swinging the [src]!") + H.Stun(2) H.drop_item(src) return diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index d80c28704ad..aef7bb1af73 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -45,7 +45,8 @@ if(prob(75)) user.visible_message("After a few attempts, [user] manages to light the [src].") else - user << "You burn yourself while lighting the lighter." + to_chat(user, "You burn yourself while lighting the lighter.") + user.adjustFireLoss(5) user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 040a42b4cb8..b523813dcb7 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -16,7 +16,8 @@ /obj/item/weapon/melee/energy/attack_self(mob/living/carbon/user) if(user.disabilities & CLUMSY && prob(50)) - user << "You accidentally cut yourself with [src], like a doofus!" + to_chat(user, "You accidentally cut yourself with [src], like a doofus!") + user.take_organ_damage(5,5) active = !active if (active) @@ -31,7 +32,8 @@ icon_state = "sword[item_color]" w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - user << "[src] is now active." + to_chat(user, "[src] is now active.") + else force = initial(force) throwforce = initial(throwforce) @@ -41,7 +43,8 @@ icon_state = initial(icon_state) w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") + if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -106,7 +109,8 @@ var/obj/item/weapon/stock_parts/cell/C = R.cell if(active && !(C.use(hitcost))) attack_self() - R << "It's out of charge!" + to_chat(R, "It's out of charge!") + return ..() return @@ -152,11 +156,13 @@ ..() if(istype(W, /obj/item/weapon/melee/energy/sword/saber)) if(W == src) - user << "You try to attach the end of the energy sword to... itself. You're not very smart, are you?" + to_chat(user, "You try to attach the end of the energy sword to... itself. You're not very smart, are you?") + if(ishuman(user)) user.adjustBrainLoss(10) else - user << "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool." + to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.") + var/obj/item/weapon/twohanded/dualsaber/newSaber = new /obj/item/weapon/twohanded/dualsaber(user.loc) if(src.hacked) // That's right, we'll only check the "original" esword. newSaber.hacked = 1 @@ -170,7 +176,8 @@ if(hacked == 0) hacked = 1 item_color = "rainbow" - user << "RNBW_ENGAGE" + to_chat(user, "RNBW_ENGAGE") + if(active) icon_state = "swordrainbow" @@ -182,7 +189,8 @@ user.update_inv_l_hand() else - user << "It's already fabulous!" + to_chat(user, "It's already fabulous!") + /obj/item/weapon/melee/energy/sword/pirate name = "energy cutlass" diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 7e95235ff4a..821e5dbe886 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -17,7 +17,8 @@ /obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) - viewers(user) << "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") + return (OXYLOSS) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 90191efbf70..368f19dd0e7 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -93,7 +93,8 @@ afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) var/angle = get_angle(A, user) - //world << angle +// to_chat(world, angle) + angle = round(angle) + 45 if(angle > 180) angle -= 180 @@ -102,9 +103,11 @@ if(!angle) angle = 1 - //world << "adjusted [angle]" +// to_chat(world, "adjusted [angle]") + icon_state = "[angle]" - //world << "[angle] [(get_dist(user, A) - 1)]" +// to_chat(world, "[angle] [(get_dist(user, A) - 1)]") + user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15) /obj/item/weapon/newton diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 521c75f63fd..3ea41bc420e 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -39,7 +39,8 @@ if(!proximity) return if(reagents.total_volume < 1) - user << "Your mop is dry!" + to_chat(user, "Your mop is dry!") + return var/turf/simulated/turf = A @@ -51,7 +52,8 @@ user.visible_message("[user] begins to clean \the [turf] with [src].", "You begin to clean \the [turf] with [src]...") if(do_after(user, src.mopspeed, target = turf)) - user << "You finish mopping." + to_chat(user, "You finish mopping.") + clean(turf) @@ -67,7 +69,8 @@ /obj/item/weapon/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) - user << "You wet [src] in [source]." + to_chat(user, "You wet [src] in [source].") + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return 1 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index e5889b923d2..af2987a8dfc 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -20,25 +20,30 @@ /obj/item/weapon/pneumatic_cannon/examine(mob/user) ..() if(!in_range(user, src)) - user << "You'll need to get closer to see any more." + to_chat(user, "You'll need to get closer to see any more.") + return for(var/obj/item/I in loadedItems) spawn(0) - user << "\icon [I] It has \the [I] loaded." + to_chat(user, "\icon [I] It has \the [I] loaded.") + if(tank) - user << "\icon [tank] It has \the [tank] mounted onto it." + to_chat(user, "\icon [tank] It has \the [tank] mounted onto it.") + /obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/tank/) && !tank) if(istype(W, /obj/item/weapon/tank/emergency_oxygen)) - user << "\The [W] is too small for \the [src]." + to_chat(user, "\The [W] is too small for \the [src].") + return updateTank(W, 0, user) return if(W.type == type) - user << "You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption." + to_chat(user, "You're fairly certain that putting a pneumatic cannon inside another pneumatic cannon would cause a spacetime disruption.") + return if(istype(W, /obj/item/weapon/wrench)) switch(pressureSetting) @@ -48,25 +53,30 @@ pressureSetting = 3 if(3) pressureSetting = 1 - user << "You tweak \the [src]'s pressure output to [pressureSetting]." + to_chat(user, "You tweak \the [src]'s pressure output to [pressureSetting].") + return if(istype(W, /obj/item/weapon/screwdriver) && tank) updateTank(tank, 1, user) return if(loadedWeightClass >= maxWeightClass) - user << "\The [src] can't hold any more items!" + to_chat(user, "\The [src] can't hold any more items!") + return if(istype(W, /obj/item)) var/obj/item/IW = W if((loadedWeightClass + IW.w_class) > maxWeightClass) - user << "\The [IW] won't fit into \the [src]!" + to_chat(user, "\The [IW] won't fit into \the [src]!") + return if(IW.w_class > src.w_class) - user << "\The [IW] is too large to fit into \the [src]!" + to_chat(user, "\The [IW] is too large to fit into \the [src]!") + return if(!user.unEquip(W)) return - user << "You load \the [IW] into \the [src]." + to_chat(user, "You load \the [IW] into \the [src].") + loadedItems.Add(IW) loadedWeightClass += IW.w_class IW.loc = src @@ -90,13 +100,16 @@ return var/discharge = 0 if(!loadedItems || !loadedWeightClass) - user << "\The [src] has nothing loaded." + to_chat(user, "\The [src] has nothing loaded.") + return if(!tank) - user << "\The [src] can't fire without a source of gas." + to_chat(user, "\The [src] can't fire without a source of gas.") + return if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting)) - user << "\The [src] lets out a weak hiss and doesn't react!" + to_chat(user, "\The [src] lets out a weak hiss and doesn't react!") + return if(user && (CLUMSY in user.mutations) && prob(75)) user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") @@ -146,17 +159,20 @@ if(removing) if(!src.tank) return - user << "You detach \the [thetank] from \the [src]." + to_chat(user, "You detach \the [thetank] from \the [src].") + src.tank.loc = get_turf(user) user.put_in_hands(tank) src.tank = null if(!removing) if(src.tank) - user << "\The [src] already has a tank." + to_chat(user, "\The [src] already has a tank.") + return if(!user.unEquip(thetank)) return - user << "You hook \the [thetank] up to \the [src]." + to_chat(user, "You hook \the [thetank] up to \the [src].") + src.tank = thetank thetank.loc = src src.update_icons() diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index f884e3b368b..e5733b50e38 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -18,7 +18,8 @@ var/minor_fault = 0 //If not 100% reliable, it will build up faults. suicide_act(mob/user) - viewers(user) << "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.") + return (FIRELOSS) /obj/item/weapon/stock_parts/cell/crap diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 8458058c131..faab7fbef35 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -55,7 +55,8 @@ return if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) - user << "A mysterious force disrupts your arcane spell matrix, and you remain where you are." + to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") + return var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread() @@ -74,7 +75,8 @@ L+=T if(!L.len) - user <<"The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry." + to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") + return if(user && user.buckled) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 70513198e39..a3c221d376c 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -16,8 +16,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' /obj/item/weapon/shard/suicide_act(mob/user) - viewers(user) << pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", \ - "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.") + to_chat(viewers(user), pick("\red [user] is slitting \his wrists with \the [src]! It looks like \he's trying to commit suicide.", + "\red [user] is slitting \his throat with \the [src]! It looks like \he's trying to commit suicide.")) return (BRUTELOSS) /obj/item/weapon/shard/New() @@ -46,7 +46,8 @@ if(G.amount >= G.max_amount) continue G.attackby(NG, user) - user << "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s." + to_chat(user, "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.") + qdel(src) ..() @@ -55,7 +56,8 @@ var/mob/living/M = AM if (M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping! return - M << "\red You step on \the [src]!" + to_chat(M, "\red You step on \the [src]!") + playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 222960e9a5a..08586e876f1 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -70,7 +70,8 @@ /obj/item/weapon/shield/energy/attack_self(mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) - user << "You beat yourself in the head with [src]." + to_chat(user, "You beat yourself in the head with [src].") + user.take_organ_damage(5) active = !active icon_state = "eshield[active]" @@ -81,14 +82,16 @@ throw_speed = 2 w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 35, 1) - user << "[src] is now active." + to_chat(user, "[src] is now active.") + else force = 3 throwforce = 3 throw_speed = 3 w_class = 1 playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") + if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -123,14 +126,16 @@ throw_speed = 2 w_class = 4 slot_flags = SLOT_BACK - user << "You extend \the [src]." + to_chat(user, "You extend \the [src].") + else force = 3 throwforce = 3 throw_speed = 3 w_class = 3 slot_flags = null - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") + if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -157,10 +162,12 @@ /obj/item/weapon/cloaking_device/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The cloaking device is now active." + to_chat(user, "\blue The cloaking device is now active.") + src.icon_state = "shield1" else - user << "\blue The cloaking device is now inactive." + to_chat(user, "\blue The cloaking device is now inactive.") + src.icon_state = "shield0" src.add_fingerprint(user) return diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 02f3289dad8..3c9a45fa59d 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -28,11 +28,13 @@ if(!proximity) return if(user.client && (target in user.client.screen)) - user << "You need to take that [target.name] off before 'cleaning' it." + to_chat(user, "You need to take that [target.name] off before 'cleaning' it.") + else user.visible_message("[user] begins to smear [src] on \the [target.name].") if(do_after(user, src.cleanspeed, target = target)) - user << "You 'clean' \the [target.name]." + to_chat(user, "You 'clean' \the [target.name].") + if(istype(target, /turf/simulated)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target) else if (istype(target,/mob/living/carbon)) diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 9cf7b4cce63..5b6149f159f 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -29,7 +29,8 @@ if(user.mind in ticker.mode.wizards) user.flying = wielded ? 1 : 0 if(wielded) - user << "You hold \the [src] between your legs." + to_chat(user, "You hold \the [src] between your legs.") + user.say("QUID 'ITCH") animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) else @@ -40,7 +41,8 @@ user.pixel_y -= 6 else if(wielded) - user << "You hold \the [src] between your legs." + to_chat(user, "You hold \the [src] between your legs.") + /obj/item/weapon/twohanded/staff/broom/attackby(var/obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 98c626c2595..bfdeef880fa 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -42,7 +42,8 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(crit_fail) - user << "\red The Bluespace generator isn't working." + to_chat(user, "\red The Bluespace generator isn't working.") + return else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No") @@ -65,9 +66,12 @@ proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) - user << "\red The Bluespace portal resists your attempt to add another item." //light failure + to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure + + else - user << "\red The Bluespace generator malfunctions!" + to_chat(user, "\red The Bluespace generator malfunctions!") + for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index ef0429347f0..707a5d06bec 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -93,7 +93,8 @@ /obj/item/weapon/storage/bag/plasticbag/mob_can_equip(M as mob, slot) if(slot==slot_head && contents.len) - M << "\red You need to empty the bag first!" + to_chat(M, "\red You need to empty the bag first!") + return 0 return ..() @@ -226,14 +227,16 @@ can_be_inserted(obj/item/W as obj, stop_messages = 0) if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood)) if(!stop_messages) - usr << "The snatcher does not accept [W]." + to_chat(usr, "The snatcher does not accept [W].") + return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu var/current = 0 for(var/obj/item/stack/sheet/S in contents) current += S.amount if(capacity == current)//If it's full, you're done if(!stop_messages) - usr << "\red The snatcher is full." + to_chat(usr, "\red The snatcher is full.") + return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 118ca1855f0..af1e97bcd6a 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -413,9 +413,12 @@ proc/failcheck(mob/user as mob) if (prob(src.reliability)) return 1 //No failure if (prob(src.reliability)) - user << "\red The Bluespace portal resists your attempt to add another item." //light failure + to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure + + else - user << "\red The Bluespace generator malfunctions!" + to_chat(user, "\red The Bluespace generator malfunctions!") + for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 @@ -490,7 +493,8 @@ return if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet)) return - user << "Planting explosives..." + to_chat(user, "Planting explosives...") + user.visible_message("[user.name] is fiddling with their toolbelt.") if(ismob(target)) user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" @@ -508,7 +512,8 @@ target:attack_log += "\[[time_stamp()]\] Had the [name] planted on them by [user.real_name] ([user.ckey])" user.visible_message("\red [user.name] finished planting an explosive on [target.name]!") target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2") - user << "You sacrifice your belt for the sake of justice. Timer counting down from 15." + to_chat(user, "You sacrifice your belt for the sake of justice. Timer counting down from 15.") + spawn(150) if(target) if(ismob(target) || isobj(target)) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index b0106cd1f93..7ba74274c59 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -9,7 +9,8 @@ var/deity_name = "Christ" suicide_act(mob/user) - viewers(user) << "[user] stares into [src.name] and attempts to trascend understanding of the universe!" + to_chat(viewers(user), "[user] stares into [src.name] and attempts to trascend understanding of the universe!") + return (user.dust()) @@ -53,15 +54,18 @@ M.LAssailant = user if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") - user << "\red You don't have the dexterity to do this!" + to_chat(user, "\red You don't have the dexterity to do this!") + return if(!chaplain) - user << "\red The book sizzles in your hands." + to_chat(user, "\red The book sizzles in your hands.") + user.take_organ_damage(0,10) return if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The [src] slips out of your hand and hits your head." + to_chat(user, "\red The [src] slips out of your hand and hits your head.") + user.take_organ_damage(10) user.Paralyse(20) return @@ -71,19 +75,23 @@ if (M.stat !=2) /*if((M.mind in ticker.mode.cult) && (prob(20))) - M << "\red The power of [src.deity_name] clears your mind of heresy!" - user << "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!" + to_chat(M, "\red The power of [src.deity_name] clears your mind of heresy!") + + to_chat(user, "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!") + ticker.mode.remove_cultist(M.mind)*/ if ((istype(M, /mob/living/carbon/human) && prob(60))) bless(M) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] heals [] with the power of [src.deity_name]!", user, M), 1) - M << "\red May the power of [src.deity_name] compel you to be healed!" + to_chat(M, "\red May the power of [src.deity_name] compel you to be healed!") + playsound(src.loc, "punch", 25, 1, -1) else if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet)) M.adjustBrainLoss(10) - M << "\red You feel dumber." + to_chat(M, "\red You feel dumber.") + for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] beats [] over the head with []!", user, M, src), 1) playsound(src.loc, "punch", 25, 1, -1) @@ -97,17 +105,20 @@ if(!proximity) return if (istype(A, /turf/simulated/floor)) - user << "You hit the floor with the bible." + to_chat(user, "You hit the floor with the bible.") + if(user.mind && (user.mind.assigned_role == "Chaplain")) call(/obj/effect/rune/proc/revealrunes)(src) if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder - user << "You bless [A]." + to_chat(user, "You bless [A].") + var/water2holy = A.reagents.get_reagent_amount("water") A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) if(A.reagents && A.reagents.has_reagent("unholywater")) //yeah yeah, copy pasted code - sue me - user << "You purify [A]." + to_chat(user, "You purify [A].") + var/unholy2clean = A.reagents.get_reagent_amount("unholywater") A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index f460aaa1b47..a1cada9b549 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -29,11 +29,14 @@ return if(contents.len <= 0) - user << "There are no [src.icon_type]s left in the box." + to_chat(user, "There are no [src.icon_type]s left in the box.") + else if(contents.len == 1) - user << "There is one [src.icon_type] left in the box." + to_chat(user, "There is one [src.icon_type] left in the box.") + else - user << "There are [src.contents.len] [src.icon_type]s in the box." + to_chat(user, "There are [src.contents.len] [src.icon_type]s in the box.") + @@ -142,10 +145,12 @@ if(istype(W,/obj/item/toy/crayon)) switch(W:colourName) if("mime") - usr << "This crayon is too sad to be contained in this box." + to_chat(usr, "This crayon is too sad to be contained in this box.") + return if("rainbow") - usr << "This crayon is too powerful to be contained in this box." + to_chat(usr, "This crayon is too powerful to be contained in this box.") + return ..() @@ -217,12 +222,14 @@ var/obj/item/clothing/mask/cigarette/C = I lace_cigarette(C) user.equip_to_slot_if_possible(C, slot_wear_mask) - user << "You take \a [C.name] out of the pack." + to_chat(user, "You take \a [C.name] out of the pack.") + update_icon() got_cig = 1 break if(!got_cig) - user << "There are no smokables in the pack!" + to_chat(user, "There are no smokables in the pack!") + else ..() @@ -231,13 +238,15 @@ var/obj/item/weapon/match/M = W if(M.lit == 1) if(!stop_messages) - usr << "Putting a lit [W] in [src] probably isn't a good idea." + to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.") + return 0 if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W if(L.lit == 1) if(!stop_messages) - usr << "Putting [W] in [src] while lit probably isn't a good idea." + to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") + return 0 //if we get this far, handle the insertion checks as normal .=..() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index b751481bfe0..c87af060e4f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -248,9 +248,11 @@ if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text)) if(length(tmp_label) > MAX_NAME_LEN) - user << "The label can be at most [MAX_NAME_LEN] characters long." + to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.") + else - user << "You set the label to \"[tmp_label]\"." + to_chat(user, "You set the label to \"[tmp_label]\".") + label_text = tmp_label update_name_label() else diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 608f111060f..9ce695a7012 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -20,34 +20,40 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + to_chat(user, "\red It appears to be broken.") + return if(src.allowed(user)) src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked - user << "\red You lock the [src.name]!" + to_chat(user, "\red You lock the [src.name]!") + return else src.icon_state = src.icon_closed - user << "\red You unlock the [src.name]!" + to_chat(user, "\red You unlock the [src.name]!") + origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) return if(!locked) ..() else - user << "\red Its locked!" + to_chat(user, "\red Its locked!") + return show_to(mob/user as mob) if(locked) - user << "\red Its locked!" + to_chat(user, "\red Its locked!") + else ..() return @@ -56,7 +62,8 @@ if(!locked) return ..() if(!stop_messages) - usr << "[src] is locked!" + to_chat(usr, "[src] is locked!") + return 0 /obj/item/weapon/storage/lockbox/emag_act(user as mob) @@ -65,7 +72,8 @@ locked = 0 desc = "It appears to be broken." icon_state = src.icon_broken - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") + origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index d33f6e2ba7b..1a68163cbd7 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -29,7 +29,8 @@ examine(mob/user) if(..(user, 1)) - user << text("The service panel is [src.open ? "open" : "closed"].") + to_chat(user, text("The service panel is [src.open ? "open" : "closed"].")) + attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(locked) @@ -78,9 +79,11 @@ spark_system.start() playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) - user << "You slice through the lock on [src]." + to_chat(user, "You slice through the lock on [src].") + else - user << "You short out the lock on [src]." + to_chat(user, "You short out the lock on [src].") + return @@ -144,7 +147,8 @@ if(!locked) return ..() if(!stop_messages) - usr << "[src] is locked!" + to_chat(usr, "[src] is locked!") + return 0 /obj/item/weapon/storage/secure/hear_talk(mob/living/M as mob, msg) @@ -172,7 +176,8 @@ attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) - usr << "\red [src] is locked and cannot be opened!" + to_chat(usr, "\red [src] is locked and cannot be opened!") + else if ((src.loc == user) && (!src.locked)) playsound(src.loc, "rustle", 50, 1, -5) if (user.s_active) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 1440aa8dcf0..8eeeadea09c 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -235,7 +235,8 @@ return 0 //Means the item is already in the storage item if(contents.len >= storage_slots) if(!stop_messages) - usr << "[W] won't fit in [src], make some space!" + to_chat(usr, "[W] won't fit in [src], make some space!") + return 0 //Storage item is full if(can_hold.len) @@ -248,18 +249,21 @@ if(!stop_messages) if (istype(W, /obj/item/weapon/hand_labeler)) return 0 - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") + return 0 for(var/A in cant_hold) //Check for specific items which this container can't hold. if(istype(W, text2path(A) )) if(!stop_messages) - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") + return 0 if (W.w_class > max_w_class) if(!stop_messages) - usr << "[W] is too big for this [src]." + to_chat(usr, "[W] is too big for this [src].") + return 0 var/sum_w_class = W.w_class @@ -268,17 +272,20 @@ if(sum_w_class > max_combined_w_class) if(!stop_messages) - usr << "[src] is full, make some space." + to_chat(usr, "[src] is full, make some space.") + return 0 if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage))) if(!istype(src, /obj/item/weapon/storage/backpack/holding)) //bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm. if(!stop_messages) - usr << "[src] cannot hold [W] as it's a storage item of the same size." + to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") + return 0 //To prevent the stacking of same sized storage items. if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. - usr << "\the [W] is stuck to your hand, you can't put it in \the [src]" + to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]") + return 0 return 1 @@ -306,7 +313,8 @@ if(!prevent_warning && !istype(W, /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow)) for(var/mob/M in viewers(usr, null)) if (M == usr) - usr << "You put the [W] into [src]." + to_chat(usr, "You put the [W] into [src].") + else if (M in range(1)) //If someone is standing close enough, they can tell what it is... M.show_message("[usr] puts [W] into [src].") else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... @@ -359,7 +367,8 @@ ..() if(isrobot(user)) - user << "\blue You're a robot. No." + to_chat(user, "\blue You're a robot. No.") + return 1//Robots can't interact with storage items. if(!can_be_inserted(W)) @@ -406,9 +415,11 @@ collection_mode = !collection_mode switch (collection_mode) if(1) - usr << "[src] now picks up all items in a tile at once." + to_chat(usr, "[src] now picks up all items in a tile at once.") + if(0) - usr << "[src] now picks up one item at a time." + to_chat(usr, "[src] now picks up one item at a time.") + /obj/item/weapon/storage/verb/quick_empty() @@ -497,7 +508,8 @@ if ( !found ) // User is too far away return // Now make the cardboard - user << "You fold [src] flat." + to_chat(user, "You fold [src] flat.") + new src.foldable(get_turf(src)) qdel(src) //BubbleWrap END diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index b1efb1168ff..a760475b9de 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -18,7 +18,8 @@ New() ..() if (src.type == /obj/item/weapon/storage/toolbox) - world << "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]" + to_chat(world, "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]") + qdel(src) /obj/item/weapon/storage/toolbox/emergency diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 04c15fe1d97..d180686998a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -55,24 +55,29 @@ /obj/item/weapon/melee/baton/examine(mob/user) ..(user) if(bcell) - user <<"The baton is [round(bcell.percent())]% charged." + to_chat(user, "The baton is [round(bcell.percent())]% charged.") + if(!bcell) - user <<"The baton does not have a power source installed." + to_chat(user, "The baton does not have a power source installed.") + /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W if(bcell) - user << "[src] already has a cell." + to_chat(user, "[src] already has a cell.") + else if(C.maxcharge < hitcost) - user << "[src] requires a higher capacity cell." + to_chat(user, "[src] requires a higher capacity cell.") + return if(!user.unEquip(W)) return W.loc = src bcell = W - user << "You install a cell in [src]." + to_chat(user, "You install a cell in [src].") + update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) @@ -80,7 +85,8 @@ bcell.updateicon() bcell.loc = get_turf(src.loc) bcell = null - user << "You remove the cell from the [src]." + to_chat(user, "You remove the cell from the [src].") + status = 0 update_icon() return @@ -90,14 +96,17 @@ /obj/item/weapon/melee/baton/attack_self(mob/user) if(bcell && bcell.charge > hitcost) status = !status - user << "[src] is now [status ? "on" : "off"]." + to_chat(user, "[src] is now [status ? "on" : "off"].") + playsound(loc, "sparks", 75, 1, -1) else status = 0 if(!bcell) - user << "[src] does not have a power source!" + to_chat(user, "[src] does not have a power source!") + else - user << "[src] is out of charge." + to_chat(user, "[src] is out of charge.") + update_icon() add_fingerprint(user) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index edf0c77e131..ae942d0df41 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -10,8 +10,10 @@ * Banhammer */ /obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob) - M << " You have been banned FOR NO REISIN by [user]" - user << " You have BANNED [M]" + to_chat(M, " You have been banned FOR NO REISIN by [user]") + + to_chat(user, " You have BANNED [M]") + /* * Classic Baton @@ -33,7 +35,8 @@ if(on) add_fingerprint(user) if((CLUMSY in user.mutations) && prob(50)) - user << "You club yourself over the head." + to_chat(user, "You club yourself over the head.") + user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -84,14 +87,16 @@ /obj/item/weapon/melee/classic_baton/telescopic/attack_self(mob/user as mob) on = !on if(on) - user << "You extend the baton." + to_chat(user, "You extend the baton.") + icon_state = "telebaton_1" item_state = "nullrod" w_class = 4 //doesnt fit in backpack when its on for balance force = 10 //stunbaton damage attack_verb = list("smacked", "struck", "cracked", "beaten") else - user << "You collapse the baton." + to_chat(user, "You collapse the baton.") + icon_state = "telebaton_0" item_state = null //no sprite for concealment even when in hand slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index d66945d1b75..6a1d65af07d 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -57,11 +57,13 @@ if (istype(W, /obj/item/stack/rods)) if (W:amount >= 4) new /obj/item/weapon/table_parts/reinforced( user.loc ) - user << "\blue You reinforce the [name]." + to_chat(user, "\blue You reinforce the [name].") + W:use(4) qdel(src) else if (W:amount < 4) - user << "\red You need at least four rods to do this." + to_chat(user, "\red You need at least four rods to do this.") + /obj/item/weapon/table_parts/attack_self(mob/user as mob) new /obj/structure/table( user.loc ) diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index edbe4be2cd1..4d4e13324b1 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -29,7 +29,8 @@ return if(air_contents.oxygen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -37,7 +38,8 @@ set name = "Toggle Jetpack Stabilization" set category = "Object" src.stabilization_on = !( src.stabilization_on ) - usr << "You toggle the stabilization [stabilization_on? "on":"off"]." + to_chat(usr, "You toggle the stabilization [stabilization_on? "on":"off"].") + return @@ -133,7 +135,8 @@ return if(air_contents.carbon_dioxide < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -142,7 +145,8 @@ var/obj/item/weapon/rig/holder /obj/item/weapon/tank/jetpack/rig/examine() - usr << "It's a jetpack. If you can see this, report it on the bug tracker." + to_chat(usr, "It's a jetpack. If you can see this, report it on the bug tracker.") + return 0 /obj/item/weapon/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index dc5425616ac..18de0bc0e7f 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -26,7 +26,8 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) @@ -71,8 +72,10 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 1 && loc==usr) - user << "\red The meter on the [src.name] indicates you are almost out of air!" - user << sound('sound/effects/alert.ogg') + to_chat(user, "\red The meter on the [src.name] indicates you are almost out of air!") + + to_chat(user, sound('sound/effects/alert.ogg')) + /obj/item/weapon/tank/air/New() ..() @@ -123,8 +126,10 @@ /obj/item/weapon/tank/plasma/plasmaman/examine(mob/user) if(..(user, 0)) if(air_contents.toxins < 0.2 && loc==usr) - user << text("\red The meter on the [src.name] indicates you are almost out of plasma!") - user << sound('sound/effects/alert.ogg') + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of plasma!")) + + to_chat(user, sound('sound/effects/alert.ogg')) + /* * Emergency Oxygen @@ -150,8 +155,10 @@ examine(mob/user) if(..(user, 0)) if(air_contents.oxygen < 0.2 && loc==usr) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") - user << sound('sound/effects/alert.ogg') + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + + to_chat(user, sound('sound/effects/alert.ogg')) + /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" @@ -191,7 +198,8 @@ /obj/item/weapon/tank/nitrogen/examine(mob/user) if(..(user, 0)) if(air_contents.nitrogen < 10) - user << text("\red The meter on the [src.name] indicates you are almost out of air!") + to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) + //playsound(usr, 'sound/effects/alert.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index cee2996904f..9565cb736ab 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -44,7 +44,9 @@ if (istype(src.loc, /obj/item/assembly)) icon = src.loc if (!in_range(src, user)) - if (icon == src) user << "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer." + if (icon == src) + to_chat(user, "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer.") + return var/celsius_temperature = src.air_contents.temperature-T0C @@ -63,7 +65,8 @@ else descriptive = "furiously hot" - user << "\blue \The \icon[icon][src] feels [descriptive]" + to_chat(user, "\blue \The \icon[icon][src] feels [descriptive]") + return @@ -166,7 +169,8 @@ if(location.internal == src) location.internal = null location.internals.icon_state = "internal0" - usr << "\blue You close the tank release valve." + to_chat(usr, "\blue You close the tank release valve.") + if (location.internals) location.internals.icon_state = "internal0" else @@ -181,11 +185,13 @@ if(can_open_valve) location.internal = src - usr << "\blue You open \the [src] valve." + to_chat(usr, "\blue You open \the [src] valve.") + if (location.internals) location.internals.icon_state = "internal1" else - usr << "\blue You need something to connect to \the [src]." + to_chat(usr, "\blue You need something to connect to \the [src].") + src.add_fingerprint(usr) return 1 @@ -232,7 +238,8 @@ if(!istype(src.loc,/obj/item/device/transfer_valve)) message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] (JMP)") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] at [x], [y], [z]") - //world << "\blue[x],[y] tank is exploding: [pressure] kPa" +// to_chat(world, "\blue[x],[y] tank is exploding: [pressure] kPa") + //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -241,7 +248,8 @@ var/range = (pressure-TANK_FRAGMENT_PRESSURE)/TANK_FRAGMENT_SCALE var/turf/epicenter = get_turf(loc) - //world << "\blue Exploding Pressure: [pressure] kPa, intensity: [range]" +// to_chat(world, "\blue Exploding Pressure: [pressure] kPa, intensity: [range]") + explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5)) if(istype(src.loc,/obj/item/device/transfer_valve)) @@ -250,7 +258,8 @@ qdel(src) else if(pressure > TANK_RUPTURE_PRESSURE) - //world << "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]" +// to_chat(world, "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") + if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -262,7 +271,8 @@ integrity-- else if(pressure > TANK_LEAK_PRESSURE) - //world << "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]" +// to_chat(world, "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") + if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 328debd11fc..4d15aba974c 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -26,7 +26,8 @@ set name = "Toggle Mister" set category = "Object" if (usr.get_item_by_slot(slot_back) != src) - usr << "The watertank needs to be on your back to use." + to_chat(usr, "The watertank needs to be on your back to use.") + return if(usr.incapacitated()) return @@ -40,7 +41,8 @@ //Detach the nozzle into the user's hands if(!user.put_in_hands(noz)) on = 0 - user << "You need a free hand to hold the mister." + to_chat(user, "You need a free hand to hold the mister.") + return noz.loc = user else @@ -125,7 +127,8 @@ return /obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user as mob) - user << "The mister snaps back onto the watertank." + to_chat(user, "The mister snaps back onto the watertank.") + tank.on = 0 loc = tank @@ -175,7 +178,8 @@ /obj/item/weapon/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - 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, "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 @@ -240,22 +244,26 @@ if(EXTINGUISHER) nozzle_mode = NANOFROST tank.icon_state = "waterbackpackatmos_1" - user << "Swapped to nanofrost launcher" + to_chat(user, "Swapped to nanofrost launcher") + return if(NANOFROST) nozzle_mode = METAL_FOAM tank.icon_state = "waterbackpackatmos_2" - user << "Swapped to metal foam synthesizer" + to_chat(user, "Swapped to metal foam synthesizer") + return if(METAL_FOAM) nozzle_mode = EXTINGUISHER tank.icon_state = "waterbackpackatmos_0" - user << "Swapped to water extinguisher" + to_chat(user, "Swapped to water extinguisher") + return return /obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) - user << "The nozzle snaps back onto the tank!" + to_chat(user, "The nozzle snaps back onto the tank!") + tank.on = 0 loc = tank @@ -271,10 +279,12 @@ return //Safety check so you don't blast yourself trying to refill your tank var/datum/reagents/R = reagents if(R.total_volume < 100) - user << "You need at least 100 units of water to use the nanofrost launcher!" + to_chat(user, "You need at least 100 units of water to use the nanofrost launcher!") + return if(nanofrost_cooldown) - user << "Nanofrost launcher is still recharging" + to_chat(user, "Nanofrost launcher is still recharging") + return nanofrost_cooldown = 1 R.remove_any(100) @@ -300,7 +310,8 @@ if(src) metal_synthesis_cooldown-- else - user << "Metal foam mix is still being synthesized." + to_chat(user, "Metal foam mix is still being synthesized.") + return /obj/effect/nanofrost_container diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 1f648ec2b3b..2eed4d02cef 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -14,7 +14,8 @@ /* -- Disabled for now until it has a use -- /obj/item/stack/tape_roll/attack_self(mob/user as mob) - user << "You remove a length of tape from [src]." + to_chat(user, "You remove a length of tape from [src].") + var/obj/item/weapon/ducttape/tape = new() user.put_in_hands(tape) @@ -71,7 +72,8 @@ if(!stuck) return - user << "You remove \the [initial(name)] from [stuck]." + to_chat(user, "You remove \the [initial(name)] from [stuck].") + user.unEquip(src) stuck.forceMove(get_turf(src)) @@ -91,8 +93,8 @@ if(target_turf != source_turf) dir_offset = get_dir(source_turf, target_turf) if(!(dir_offset in cardinal)) - user << "You cannot reach that from here." // can only place stuck papers in cardinal directions, to - return // reduce papers around corners issue. + to_chat(user, "You cannot reach that from here.")// can only place stuck papers in cardinal directions, to + return // reduce papers around corners issue. user.unEquip(src) forceMove(source_turf) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index 61663a82fb4..f0ecceabfe8 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -49,7 +49,8 @@ Frequency: var/turf/current_location = get_turf(usr)//What turf is the user on? if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2. - usr << "\The [src] is malfunctioning." + to_chat(usr, "\The [src] is malfunctioning.") + return 1 if (href_list["refresh"]) @@ -108,7 +109,8 @@ Frequency: /obj/item/weapon/hand_tele/attack_self(mob/user as mob) var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist. - user << "\The [src] is malfunctioning." + to_chat(user, "\The [src] is malfunctioning.") + return var/list/L = list( ) for(var/obj/machinery/computer/teleporter/com in world) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index d01cc125918..8b5c0e3be2f 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -50,8 +50,8 @@ hitsound = 'sound/weapons/bladeslice.ogg' suicide_act(mob/user) - viewers(user) << pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ - "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.") + to_chat(viewers(user), pick("[user] is stabbing the [src.name] into \his temple! It looks like \he's trying to commit suicide.", \ + "[user] is stabbing the [src.name] into \his heart! It looks like \he's trying to commit suicide.")) return(BRUTELOSS) /obj/item/weapon/screwdriver/New() @@ -173,7 +173,8 @@ /obj/item/weapon/weldingtool/examine(mob/user) if(..(user, 0)) - user << "It contains [get_fuel()] unit\s of fuel out of [max_fuel]." + to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") + /obj/item/weapon/weldingtool/suicide_act(mob/user) user.visible_message("[user] welds \his every orifice closed! It looks like \he's trying to commit suicide..") @@ -248,13 +249,16 @@ S.heal_damage(15,0,0,1) user.visible_message("\The [user] patches some dents on \the [M]'s [S.name] with \the [src].") else if(S.open != 2) - user << "Need more welding fuel!" + to_chat(user, "Need more welding fuel!") + return 1 else - user << "The damage is far too severe to patch over externally." + to_chat(user, "The damage is far too severe to patch over externally.") + return 1 else if(S.open != 2) - user << "Nothing to fix!" + to_chat(user, "Nothing to fix!") + else return ..() @@ -263,14 +267,16 @@ if(istype(O, /obj/structure/reagent_dispensers/fueltank) && in_range(src, O)) if(!welding) O.reagents.trans_to(src, max_fuel) - user << "[src] refueled." + to_chat(user, "[src] refueled.") + playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) update_icon() return else message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") - user << "That was stupid of you." + to_chat(user, "That was stupid of you.") + O.ex_act() return @@ -303,7 +309,8 @@ return 1 else if(M) - M << "\blue You need more welding fuel to complete this task." + to_chat(M, "\blue You need more welding fuel to complete this task.") + return 0 //Returns whether or not the welding tool is currently on. @@ -327,25 +334,30 @@ //Toggles the welder off and on /obj/item/weapon/weldingtool/proc/toggle(mob/user, message = 0) if(!status) - user << "[src] can't be turned on while unsecured!" + to_chat(user, "[src] can't be turned on while unsecured!") + return welding = !welding if(welding) if(get_fuel() >= 1) - user << "You switch [src] on." + to_chat(user, "You switch [src] on.") + force = 15 damtype = "fire" hitsound = 'sound/items/welder.ogg' update_icon() processing_objects |= src else - user << "You need more fuel!" + to_chat(user, "You need more fuel!") + welding = 0 else if(!message) - user << "You switch [src] off." + to_chat(user, "You switch [src] off.") + else - user << "[src] shuts off!" + to_chat(user, "[src] shuts off!") + force = 3 damtype = "brute" hitsound = "swing_hit" @@ -353,13 +365,16 @@ /obj/item/weapon/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) if(welding) - user << "Turn it off first!" + to_chat(user, "Turn it off first!") + return status = !status if(status) - user << "You resecure [src]." + to_chat(user, "You resecure [src].") + else - user << "[src] can now be attached and modified." + to_chat(user, "[src] can now be attached and modified.") + add_fingerprint(user) /obj/item/weapon/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) @@ -372,10 +387,12 @@ loc = F F.weldtool = src add_fingerprint(user) - user << "You add a rod to a welder, starting to build a flamethrower." + to_chat(user, "You add a rod to a welder, starting to build a flamethrower.") + user.put_in_hands(F) else - user << "You need one rod to start building a flamethrower!" + to_chat(user, "You need one rod to start building a flamethrower!") + return /obj/item/weapon/weldingtool/largetank @@ -492,5 +509,6 @@ attack_self(mob/user as mob) open = !open - user << "\blue You [open?"open" : "close"] the conversion kit." + to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.") + update_icon() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 61164a45298..26444e0cef2 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -43,9 +43,11 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - user << "You free up your module." + to_chat(user, "You free up your module.") + else - user << "You are now carrying the [name] with one hand." + to_chat(user, "You are now carrying the [name] with one hand.") + if(unwieldsound) playsound(loc, unwieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = user.get_inactive_hand() @@ -58,10 +60,12 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.species.is_small) - user << "It's too heavy for you to wield fully." + to_chat(user, "It's too heavy for you to wield fully.") + return if(user.get_inactive_hand()) - user << "You need your other hand to be empty!" + to_chat(user, "You need your other hand to be empty!") + return wielded = 1 force = force_wielded @@ -71,9 +75,11 @@ user.update_inv_r_hand() user.update_inv_l_hand() if(isrobot(user)) - user << "You dedicate your module to [name]." + to_chat(user, "You dedicate your module to [name].") + else - user << "You grab the [name] with both hands." + to_chat(user, "You grab the [name] with both hands.") + if (wieldsound) playsound(loc, wieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ @@ -85,7 +91,8 @@ /obj/item/weapon/twohanded/mob_can_equip(mob/M, slot) //Cannot equip wielded items. if(wielded) - M << "Unwield the [name] first!" + to_chat(M, "Unwield the [name] first!") + return 0 return ..() @@ -138,7 +145,8 @@ /obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) if(wielded) - M << "[src.name] is too cumbersome to carry with anything but your hands!" + to_chat(M, "[src.name] is too cumbersome to carry with anything but your hands!") + return 0 return ..() @@ -224,7 +232,8 @@ /obj/item/weapon/twohanded/dualsaber/attack(target as mob, mob/living/user as mob) ..() if((CLUMSY in user.mutations) && (wielded) &&prob(40)) - user << "\red You twirl around a bit before losing your balance and impaling yourself on the [src]." + to_chat(user, "\red You twirl around a bit before losing your balance and impaling yourself on the [src].") + user.take_organ_damage(20,25) return if((wielded) && prob(50)) @@ -268,11 +277,13 @@ if(istype(W, /obj/item/device/multitool)) if(hacked == 0) hacked = 1 - user << "2XRNBW_ENGAGE" + to_chat(user, "2XRNBW_ENGAGE") + blade_color = "rainbow" update_icon() else - user << "It's starting to look like a triple rainbow - no, nevermind." + to_chat(user, "It's starting to look like a triple rainbow - no, nevermind.") + //spears /obj/item/weapon/twohanded/spear @@ -301,7 +312,8 @@ //Putting heads on spears /obj/item/weapon/organ/head/attackby(var/obj/item/weapon/W, var/mob/living/user, params) if(istype(W, /obj/item/weapon/twohanded/spear)) - user << "You stick the head onto the spear and stand it upright on the ground." + to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") + var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() src.transform = M @@ -316,7 +328,8 @@ /obj/item/weapon/twohanded/spear/attackby(var/obj/item/I, var/mob/living/user) if(istype(I, /obj/item/weapon/organ/head)) - user << "You stick the head onto the spear and stand it upright on the ground." + to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") + var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() I.transform = M diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 517ec5ce2cb..13a1d15860e 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -23,9 +23,11 @@ /obj/item/weapon/vending_refill/examine(mob/user) ..(user) if(charges) - user << "It can restock [charges] item(s)." + to_chat(user, "It can restock [charges] item(s).") + else - user << "It's empty!" + to_chat(user, "It's empty!") + //NOTE I decided to go for about 1/3 of a machine's capacity diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index c77015ca0d1..f3453803635 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -12,7 +12,8 @@ /obj/item/weapon/banhammer/suicide_act(mob/user) - viewers(user) << "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life." + to_chat(viewers(user), "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.") + return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /obj/item/weapon/nullrod @@ -31,7 +32,8 @@ var/transform_via = list(/obj/item/clothing/suit/armor/riot/knight/templar, /obj/item/clothing/suit/chaplain_hoodie/fluff/chronx) suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") + return (BRUTELOSS|FIRELOSS) /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. @@ -47,7 +49,8 @@ msg_admin_attack("[key_name_admin(user)] attacked [key_name_admin(M)] with [src.name] (INTENT: [uppertext(user.a_intent)])") if ((CLUMSY in user.mutations) && prob(50)) - user << "\red The rod slips out of your hand and hits your head." + to_chat(user, "\red The rod slips out of your hand and hits your head.") + user.take_organ_damage(10) user.Paralyse(20) return @@ -56,7 +59,8 @@ if(M.mind.vampire) if(ishuman(M)) if(!M.mind.vampire.get_ability(/datum/vampire_passive/full)) - M << "The nullrod's power interferes with your own!" + to_chat(M, "The nullrod's power interferes with your own!") + M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) ..() @@ -67,7 +71,8 @@ if(istype(I, T)) //Only the Chaplain's holy armor is capable fo performing this feat. if(!transformed) // can't turn a sword into a sword. var/obj/item/S = new transform_into() - user << "You sheath the [src] into the [I]'s scabbard, transforming it into \a [S]." + to_chat(user, "You sheath the [src] into the [I]'s scabbard, transforming it into \a [S].") + user.unEquip(src) qdel(src) user.put_in_hands(S) @@ -98,7 +103,8 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") + return(BRUTELOSS) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -124,7 +130,8 @@ return 1 suicide_act(mob/user) - viewers(user) << "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") + return(BRUTELOSS) /obj/item/weapon/claymore/ceremonial @@ -147,7 +154,8 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") suicide_act(mob/user) - viewers(user) << "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku." + to_chat(viewers(user), "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") + return(BRUTELOSS) /obj/item/weapon/katana/IsShield() @@ -192,7 +200,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.unEquip(I) user.put_in_hands(S) - user << "You fasten the glass shard to the top of the rod with the cable." + to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") + qdel(I) qdel(src) @@ -204,7 +213,8 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.unEquip(I) user.put_in_hands(P) - user << "You fasten the wirecutters to the top of the rod with the cable, prongs outward." + to_chat(user, "You fasten the wirecutters to the top of the rod with the cable, prongs outward.") + qdel(I) qdel(src) diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm index bc9fae1a118..009262c39ce 100644 --- a/code/game/objects/items/weapons/whetstone.dm +++ b/code/game/objects/items/weapons/whetstone.dm @@ -13,28 +13,35 @@ /obj/item/weapon/whetstone/attackby(obj/item/I, mob/user, params) if(used) - user << "The whetstone is too worn to use again." + to_chat(user, "The whetstone is too worn to use again.") + return if(I.force >= max || I.throwforce >= max)//no esword sharpening - user << "[I] is much too powerful to sharpen further." + to_chat(user, "[I] is much too powerful to sharpen further.") + return if(requires_sharpness && !I.edge) - user << "You can only sharpen items that are already sharp, such as knives." + to_chat(user, "You can only sharpen items that are already sharp, such as knives.") + return if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff var/obj/item/weapon/twohanded/TH = I if(TH.force_wielded >= max) - user << "[TH] is much too powerful to sharpen further." + to_chat(user, "[TH] is much too powerful to sharpen further.") + return if(TH.wielded) - user << "[TH] must be unwielded before it can be sharpened." + to_chat(user, "[TH] must be unwielded before it can be sharpened.") + return if(TH.force_wielded > initial(TH.force_wielded)) - user << "[TH] has already been refined before. It cannot be sharpened further." + to_chat(user, "[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)) - user << "[I] has already been refined before. It cannot be sharpened further." + to_chat(user, "[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.") if(!requires_sharpness) diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index e1b943f7897..98c2565cf72 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -12,7 +12,8 @@ attack_verb = list("whipped", "lashed", "disciplined", "tickled") suicide_act(mob/user) - viewers(user) << "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") + return (OXYLOSS) @@ -28,9 +29,11 @@ /obj/item/weapon/wire/attack_self(mob/user as mob) if (src.laying) src.laying = 0 - user << "\blue You're done laying wire!" + to_chat(user, "\blue You're done laying wire!") + else - user << "\blue You are not using this to lay wire..." + to_chat(user, "\blue You are not using this to lay wire...") + return diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index ec288220060..f9883fa1c9c 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -68,11 +68,13 @@ for(var/obj/O in range(0, src)) if(O.density == 1 && O != src && !istype(O, /obj/machinery/door/window)) //Ignores windoors, as those already block climbing, otherwise a windoor on the opposite side of a table would prevent climbing. - user << "\red You cannot climb [src], as it is blocked by \a [O]!" + to_chat(user, "\red You cannot climb [src], as it is blocked by \a [O]!") + return for(var/turf/T in range(0, src)) if(T.density == 1) - user << "\red You cannot climb [src], as it is blocked by \a [T]!" + to_chat(user, "\red You cannot climb [src], as it is blocked by \a [T]!") + return var/turf/T = src.loc if(!T || !istype(T)) return @@ -108,14 +110,16 @@ if(M.lying) return //No spamming this on people. M.Weaken(5) - M << "\red You topple as \the [src] moves under you!" + to_chat(M, "\red You topple as \the [src] moves under you!") + if(prob(25)) var/damage = rand(15,30) var/mob/living/carbon/human/H = M if(!istype(H)) - H << "\red You land heavily!" + to_chat(H, "\red You land heavily!") + M.adjustBruteLoss(damage) return @@ -134,12 +138,14 @@ affecting = H.get_organ("head") if(affecting) - M << "\red You land heavily on your [affecting.name]!" + to_chat(M, "\red You land heavily on your [affecting.name]!") + affecting.take_damage(damage, 0) if(affecting.parent) affecting.parent.add_autopsy_data("Misadventure", damage) else - H << "\red You land heavily!" + to_chat(H, "\red You land heavily!") + H.adjustBruteLoss(damage) H.UpdateDamageIcon() @@ -152,12 +158,14 @@ if(!Adjacent(user)) return 0 if (user.restrained() || user.buckled) - user << "You need your hands and legs free for this." + to_chat(user, "You need your hands and legs free for this.") + return 0 if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened) return 0 if (issilicon(user)) - user << "You need hands for this." + to_chat(user, "You need hands for this.") + return 0 return 1 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 6604649ad4c..060da01f5e5 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -139,15 +139,18 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] ..(user) if(in_range(user, src) && get_turf(src) && user.client && ishuman(user)) //Let only humans be the robust zoominators. I'm too spooked other mobs trying to use it may get broken huds. if(src.loc == user || get_turf(src) == get_turf(user)) - user << "[src] has to be on the ground to focus on it!" + to_chat(user, "[src] has to be on the ground to focus on it!") + return - user << "You focus on \the [src]." + to_chat(user, "You focus on \the [src].") + user.client.screen = list() //This is because screen objects go way past the view bounds we set, therefore not allowing stretch to fit to zoom in properly. user.client.reset_stretch = winget(user.client, "mapwindow.map", "icon-size") //Remember previous icon-size user.client.view = 3 //Decrease view winset(user.client, "mapwindow.map", "icon-size=0") //Enable stretch-to-fit user.client.viewingCanvas = 1 //Reset everything we just changed as soon as client tries to move else - user << "It is too far away." + to_chat(user, "It is too far away.") + #undef AMT_OF_CANVASES \ No newline at end of file diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 8957329c4a1..e70050d348a 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -50,10 +50,12 @@ /obj/structure/sign/barsign/attack_hand(mob/user as mob) if (!src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return if (broken) - user << "The controls seem unresponsive." + to_chat(user, "The controls seem unresponsive.") + return pick_sign() @@ -62,15 +64,18 @@ /obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) if(!allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return if( istype(I, /obj/item/weapon/screwdriver)) if(!panel_open) - user << "You open the maintenance panel." + to_chat(user, "You open the maintenance panel.") + set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = 1 else - user << "You close the maintenance panel." + to_chat(user, "You close the maintenance panel.") + if(!broken && !emagged) set_sign(pick(barsigns)) else if(emagged) @@ -82,17 +87,21 @@ if(istype(I, /obj/item/stack/cable_coil) && panel_open) var/obj/item/stack/cable_coil/C = I if(emagged) //Emagged, not broken by EMP - user << "Sign has been damaged beyond repair!" + to_chat(user, "Sign has been damaged beyond repair!") + return else if(!broken) - user << "This sign is functioning properly!" + to_chat(user, "This sign is functioning properly!") + return if(C.use(2)) - user << "You replace the burnt wiring." + to_chat(user, "You replace the burnt wiring.") + broken = 0 else - user << "You need at least two lengths of cable!" + to_chat(user, "You need at least two lengths of cable!") + @@ -105,9 +114,11 @@ /obj/structure/sign/barsign/emag_act(mob/user) if(broken || emagged) - user << "Nothing interesting happens!" + to_chat(user, "Nothing interesting happens!") + return - user << "You emag the barsign. Takeover in progress..." + to_chat(user, "You emag the barsign. Takeover in progress...") + sleep(100) //10 seconds set_sign(new /datum/barsign/hiddensigns/syndibarsign) emagged = 1 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index af608addbf8..1a247e06f88 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -169,12 +169,15 @@ LINEN BINS /obj/structure/bedsheetbin/examine(mob/user) ..(user) if(amount < 1) - user << "There are no bed sheets in the bin." + to_chat(user, "There are no bed sheets in the bin.") + return if(amount == 1) - user << "There is one bed sheet in the bin." + to_chat(user, "There is one bed sheet in the bin.") + return - user << "There are [amount] bed sheets in the bin." + to_chat(user, "There are [amount] bed sheets in the bin.") + /obj/structure/bedsheetbin/update_icon() @@ -190,12 +193,14 @@ LINEN BINS I.loc = src sheets.Add(I) amount++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") + else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. user.drop_item() I.loc = src hidden = I - user << "You hide [I] among the sheets." + to_chat(user, "You hide [I] among the sheets.") + @@ -213,11 +218,13 @@ LINEN BINS B.loc = user.loc user.put_in_hands(B) - user << "You take [B] out of [src]." + to_chat(user, "You take [B] out of [src].") + if(hidden) hidden.loc = user.loc - user << "[hidden] falls out of [B]!" + to_chat(user, "[hidden] falls out of [B]!") + hidden = null @@ -237,7 +244,8 @@ LINEN BINS B = new /obj/item/weapon/bedsheet(loc) B.loc = loc - user << "You telekinetically remove [B] from [src]." + to_chat(user, "You telekinetically remove [B] from [src].") + update_icon() if(hidden) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 13136868954..5fb9bfa63e9 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -25,7 +25,8 @@ coat.loc = src update_icon() else - user << "You cannot hang [W] on [src]" + to_chat(user, "You cannot hang [W] on [src]") + return ..() /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index b395e55fc0e..a7c2238976f 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -135,7 +135,8 @@ /obj/structure/closet/proc/toggle(mob/user as mob) if(!(src.opened ? src.close() : src.open())) - user << "It won't budge!" + to_chat(user, "It won't budge!") + return // this should probably use dump_contents() @@ -193,7 +194,8 @@ var/obj/item/weapon/rcs/E = W if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.contact_levels)) - user << "The rapid-crate-sender can't locate any telepads!" + to_chat(user, "The rapid-crate-sender can't locate any telepads!") + return if(E.mode == 0) if(!E.teleporting) @@ -211,14 +213,16 @@ var/desc = input("Please select a telepad.", "RCS") in L E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") + E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 return E.teleporting = 0 if(user in contents) - user << "Error: User located in container--aborting for safety." + to_chat(user, "Error: User located in container--aborting for safety.") + playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -226,21 +230,24 @@ s.start() do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") + return else E.rand_x = rand(50,200) E.rand_y = rand(50,200) var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") + E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 return E.teleporting = 0 if(user in contents) - user << "Error: User located in container--aborting for safety." + to_chat(user, "Error: User located in container--aborting for safety.") + playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -248,10 +255,12 @@ s.start() do_teleport(src, L) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") + return else - user << "Out of charges." + to_chat(user, "Out of charges.") + return if(src.opened) @@ -262,7 +271,8 @@ if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return new /obj/item/stack/sheet/metal(src.loc) for(var/mob/M in viewers(src)) @@ -280,10 +290,12 @@ else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(src == user.loc) - user << "You can not [welded?"unweld":"weld"] the locker from inside." + to_chat(user, "You can not [welded?"unweld":"weld"] the locker from inside.") + return if(!WT.remove_fuel(0,user)) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return src.welded = !src.welded src.update_icon() @@ -326,11 +338,13 @@ return if(!src.open()) - user << "It won't budge!" + to_chat(user, "It won't budge!") + if(!lastbang) lastbang = 1 for (var/mob/M in hearers(src, null)) - M << text("BANG, bang!", max(0, 5 - get_dist(src, M))) + to_chat(M, text("BANG, bang!", max(0, 5 - get_dist(src, M)))) + spawn(30) lastbang = 0 @@ -342,7 +356,8 @@ /obj/structure/closet/attack_self_tk(mob/user as mob) src.add_fingerprint(user) if(!src.toggle()) - usr << "It won't budge!" + to_chat(usr, "It won't budge!") + /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) @@ -356,7 +371,8 @@ src.add_fingerprint(usr) src.toggle(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") + /obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() @@ -389,7 +405,8 @@ //okay, so the closet is either welded or locked... resist!!! L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT - L << "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)" + to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") + for(var/mob/O in viewers(usr.loc)) O.show_message("The [src] begins to shake violently!", 1) @@ -406,7 +423,8 @@ //Well then break it! welded = 0 update_icon() - usr << "You successfully break out!" + to_chat(usr, "You successfully break out!") + for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index bfc9e385353..756fd860361 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -34,7 +34,8 @@ if(!L.stat) L.do_alert_animation(L) egged = 1 - alerted << sound('sound/machines/chime.ogg') + to_chat(alerted, sound('sound/machines/chime.ogg')) + ..() /mob/living/proc/do_alert_animation(atom/A) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index 82897dfe61a..c67b4e7f60d 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -23,11 +23,13 @@ if (isrobot(user) || src.locked) if(istype(O, /obj/item/device/multitool)) - user << "\red Resetting circuitry..." + to_chat(user, "\red Resetting circuitry...") + playsound(user, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20, target = src)) src.locked = 0 - user << " You disable the locking modules." + to_chat(user, " You disable the locking modules.") + update_icon() return else if(istype(O, /obj/item/weapon)) @@ -43,7 +45,8 @@ user.do_attack_animation(src) playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) - user << "\blue The cabinet's protective glass glances off the hit." + to_chat(user, "\blue The cabinet's protective glass glances off the hit.") + else src.hitstaken++ if(src.hitstaken == 4) @@ -56,12 +59,14 @@ if (istype(O, /obj/item/weapon/twohanded/fireaxe) && src.localopened) if(!fireaxe) if(O:wielded) - user << "\red Unwield the axe first." + to_chat(user, "\red Unwield the axe first.") + return fireaxe = O user.drop_item(O) src.contents += O - user << "\blue You place the fire axe back in the [src.name]." + to_chat(user, "\blue You place the fire axe back in the [src.name].") + update_icon() else if(src.smashed) @@ -84,14 +89,17 @@ spawn(10) update_icon() return else - user << "\red Resetting circuitry..." + to_chat(user, "\red Resetting circuitry...") + sleep(50) src.locked = 1 - user << "\blue You re-enable the locking modules." + to_chat(user, "\blue You re-enable the locking modules.") + playsound(user, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20, target = src)) src.locked = 1 - user << " You re-enable the locking modules." + to_chat(user, " You re-enable the locking modules.") + return else localopened = !localopened @@ -112,13 +120,15 @@ hasaxe = 1 if(src.locked) - user <<"\red The cabinet won't budge!" + to_chat(user, "\red The cabinet won't budge!") + return if(localopened) if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null - user << "\blue You take the fire axe from the [name]." + to_chat(user, "\blue You take the fire axe from the [name].") + src.add_fingerprint(user) update_icon() else @@ -145,7 +155,8 @@ attack_tk(mob/user as mob) if(localopened && fireaxe) fireaxe.forceMove(loc) - user << "\blue You telekinetically remove the fire axe." + to_chat(user, "\blue You telekinetically remove the fire axe.") + fireaxe = null update_icon() return @@ -157,9 +168,11 @@ if (isrobot(usr) || src.locked || src.smashed) if(src.locked) - usr << "\red The cabinet won't budge!" + to_chat(usr, "\red The cabinet won't budge!") + else if(src.smashed) - usr << "\blue The protective glass is broken!" + to_chat(usr, "\blue The protective glass is broken!") + return localopened = !localopened @@ -176,23 +189,29 @@ if(fireaxe) usr.put_in_hands(fireaxe) fireaxe = null - usr << "\blue You take the Fire axe from the [name]." + to_chat(usr, "\blue You take the Fire axe from the [name].") + else - usr << "\blue The [src.name] is empty." + to_chat(usr, "\blue The [src.name] is empty.") + else - usr << "\blue The [src.name] is closed." + to_chat(usr, "\blue The [src.name] is closed.") + update_icon() attack_ai(mob/user as mob) if(src.smashed) - user << "\red The security of the cabinet is compromised." + to_chat(user, "\red The security of the cabinet is compromised.") + return else locked = !locked if(locked) - user << "\red Cabinet locked." + to_chat(user, "\red Cabinet locked.") + else - user << "\blue Cabinet unlocked." + to_chat(user, "\blue Cabinet unlocked.") + return update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers 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 70a8d5bd9d2..be590c3028e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -66,12 +66,14 @@ if (W) W.forceMove(loc) else if(istype(W, /obj/item/weapon/card/id)) if(src.broken) - user << "\red It appears to be broken." + to_chat(user, "\red It appears to be broken.") + return var/obj/item/weapon/card/id/I = W if(!I || !I.registered_name) return if(src == user.loc) - user << "You can't reach the lock from inside." + to_chat(user, "You can't reach the lock from inside.") + else if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name))) //they can open all lockers, or nobody owns this, or they own this locker src.locked = !( src.locked ) @@ -86,9 +88,11 @@ src.registered_name = I.registered_name src.desc = "Owned by [I.registered_name]." else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) else - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index 1c2a34c719d..e756a8961c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -48,22 +48,27 @@ /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob) if(src.opened) - user << "Close the locker first." + to_chat(user, "Close the locker first.") + return if(src.broken) - user << "The locker appears to be broken." + to_chat(user, "The locker appears to be broken.") + return if(user.loc == src) - user << "You can't reach the lock from inside." + to_chat(user, "You can't reach the lock from inside.") + return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) - O << "The locker has been [locked ? null : "un"]locked by [user]." + to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].") + update_icon() else - user << "Access Denied" + to_chat(user, "Access Denied") + /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/rcs)) @@ -74,7 +79,8 @@ if(src.large) src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet else - user << "The locker is too small to stuff [W:affecting] into!" + to_chat(user, "The locker is too small to stuff [W:affecting] into!") + if(isrobot(user)) return user.drop_item() @@ -94,7 +100,8 @@ desc = "It appears to be broken." icon_state = icon_off flick(icon_broken, src) - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") + /obj/structure/closet/secure_closet/attack_hand(mob/user as mob) src.add_fingerprint(user) @@ -115,7 +122,8 @@ src.add_fingerprint(usr) src.togglelock(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") + /obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() @@ -141,7 +149,8 @@ //okay, so the closet is either welded or locked... resist!!! L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT - L << "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)" + to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") + for(var/mob/O in viewers(src)) O.show_message("The [src] begins to shake violently!", 1) @@ -166,7 +175,8 @@ locked = 0 welded = 0 update_icon() - usr << "\red You successfully break out!" + to_chat(usr, "\red You successfully break out!") + for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 6a5bf87680e..a96ce0b2ba8 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -67,7 +67,8 @@ if(S.mind) for(var/mob/M in contents) S.mind.transfer_to(M) - M << "As the animating magic wears off you feel yourself coming back to your senses. You are yourself again!" + to_chat(M, "As the animating magic wears off you feel yourself coming back to your senses. You are yourself again!") + break qdel(S) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index df48bf96d7c..749ede4270c 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -85,7 +85,8 @@ var/obj/item/weapon/rcs/E = W if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.player_levels)) - user << "The rapid-crate-sender can't locate any telepads!" + to_chat(user, "The rapid-crate-sender can't locate any telepads!") + return if(E.mode == 0) if(!E.teleporting) @@ -103,7 +104,8 @@ var/desc = input("Please select a telepad.", "RCS") in L E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") + E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -114,14 +116,16 @@ s.start() do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") + return else E.rand_x = rand(50,200) E.rand_y = rand(50,200) var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) - user << "\blue Teleporting [src.name]..." + to_chat(user, "\blue Teleporting [src.name]...") + E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -132,17 +136,20 @@ s.start() do_teleport(src, L) E.rcell.use(E.chargecost) - user << "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left." + to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") + return else - user << "Out of charges." + to_chat(user, "Out of charges.") + return if(opened) if(isrobot(user)) return if(!user.drop_item()) //couldn't drop the item - user << "\The [W] is stuck to your hand, you cannot put it in \the [src]!" + to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") + return if(W) W.forceMove(loc) @@ -150,22 +157,26 @@ return else if(istype(W, /obj/item/stack/cable_coil)) if(rigged) - user << "[src] is already rigged!" + to_chat(user, "[src] is already rigged!") + return - user << "You rig [src]." + to_chat(user, "You rig [src].") + user.drop_item() qdel(W) rigged = 1 return else if(istype(W, /obj/item/device/radio/electropack)) if(rigged) - user << "You attach [W] to [src]." + to_chat(user, "You attach [W] to [src].") + user.drop_item() W.forceMove(src) return else if(istype(W, /obj/item/weapon/wirecutters)) if(rigged) - user << "You cut away the wiring." + to_chat(user, "You cut away the wiring.") + playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) rigged = 0 return @@ -193,7 +204,8 @@ /obj/structure/closet/crate/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") + playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -253,19 +265,23 @@ /obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) if(src.opened) - user << "Close the crate first." + to_chat(user, "Close the crate first.") + return if(src.broken) - user << "The crate appears to be broken." + to_chat(user, "The crate appears to be broken.") + return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) - O << "The crate has been [locked ? null : "un"]locked by [user]." + to_chat(O, "The crate has been [locked ? null : "un"]locked by [user].") + update_icon() else - user << "Access Denied" + to_chat(user, "Access Denied") + /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance @@ -279,11 +295,13 @@ src.add_fingerprint(usr) src.togglelock(usr) else - usr << "This mob type can't use this verb." + to_chat(usr, "This mob type can't use this verb.") + /obj/structure/closet/crate/secure/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") + playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -316,7 +334,8 @@ src.locked = 0 src.broken = 1 update_icon() - user << "You unlock \the [src]." + to_chat(user, "You unlock \the [src].") + return /obj/structure/closet/crate/secure/emp_act(severity) diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index b3f9dac3d04..5b432a63f00 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -35,7 +35,8 @@ src.add_fingerprint(user) if(src.loc == user.loc) - user << "It won't budge!" + to_chat(user, "It won't budge!") + toggle() else toggle() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index 3166c61eb31..e413a558a9e 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -18,7 +18,8 @@ /obj/structure/largecrate/attack_hand(mob/user as mob) if(manifest) - user << "You tear the manifest off of the crate." + to_chat(user, "You tear the manifest off of the crate.") + playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -27,7 +28,8 @@ update_icon() return else - user << "You need a crowbar to pry this open!" + to_chat(user, "You need a crowbar to pry this open!") + return /obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index 03a81a7ca5b..f61584bc6af 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -30,10 +30,12 @@ if (istype(user, /mob/living/silicon/ai)) //Added by Strumpetplaya - AI shouldn't be able to return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc) if(!amount) - usr << "It's empty." + to_chat(usr, "It's empty.") + return if(amount) - usr << "You take out some items from \the [src]." + to_chat(usr, "You take out some items from \the [src].") + for(var/path in spawnitems) new path(src.loc) amount-- diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 938fcc2ccf3..c1b3f9c6ca9 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -32,14 +32,16 @@ var/global/list/captain_display_cases = list() circuit = W circuit.forceMove(src) state++ - user << "You add the airlock electronics to the frame." + to_chat(user, "You add the airlock electronics to the frame.") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(istype(W, /obj/item/weapon/crowbar)) new /obj/machinery/constructable_frame/machine_frame(T) var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(T) G.amount = 5 qdel(src) - user << "You pry the glass out of the frame." + to_chat(user, "You pry the glass out of the frame.") + playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) return @@ -64,13 +66,15 @@ var/global/list/captain_display_cases = list() sensor.forceMove(T) sensor = null state-- - user << "You pry the electronics out of the frame." + to_chat(user, "You pry the electronics out of the frame.") + playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(isprox(W) && !isprox(sensor)) user.drop_item() sensor = W sensor.forceMove(src) - user << "You add the proximity sensor to the frame." + to_chat(user, "You add the proximity sensor to the frame.") + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(pstate != state) @@ -126,11 +130,14 @@ var/global/list/captain_display_cases = list() /obj/structure/displaycase/examine(mob/user) ..(user) - user << "Peering through the glass, you see that it contains:" + to_chat(user, "Peering through the glass, you see that it contains:") + if(occupant) - user << "\icon[occupant] \A [occupant]." + to_chat(user, "\icon[occupant] \A [occupant].") + else - user << "Nothing." + to_chat(user, "Nothing.") + /obj/structure/displaycase/proc/dump() if(occupant) @@ -213,13 +220,16 @@ var/global/list/captain_display_cases = list() if(istype(W, /obj/item/weapon/card)) var/obj/item/weapon/card/id/I = W if(!check_access(I)) - user << "Access denied." + to_chat(user, "Access denied.") + return locked = !locked if(!locked) - user << "\icon[src] \The [src] clicks as locks release, and it slowly opens for you." + to_chat(user, "\icon[src] \The [src] clicks as locks release, and it slowly opens for you.") + else - user << "\icon[src] You close \the [src] and swipe your card, locking it." + to_chat(user, "\icon[src] You close \the [src] and swipe your card, locking it.") + update_icon() return if(istype(W,/obj/item/weapon/crowbar) && (!locked || destroyed)) @@ -259,14 +269,17 @@ var/global/list/captain_display_cases = list() ..() else if(!locked) dump() - user << "You smash \the [W] into the delicate electronics at the bottom of the case, and deactivate the hover field." + to_chat(user, "You smash \the [W] into the delicate electronics at the bottom of the case, and deactivate the hover field.") + update_icon() else if(locked) - user << "It's locked, you can't put anything into it." + to_chat(user, "It's locked, you can't put anything into it.") + return if(!occupant) - user << "You insert \the [W] into \the [src], and it floats as the hoverfield activates." + to_chat(user, "You insert \the [W] into \the [src], and it floats as the hoverfield activates.") + user.drop_item() W.forceMove(src) occupant=W @@ -276,7 +289,8 @@ var/global/list/captain_display_cases = list() if (destroyed || (!locked && user.a_intent == I_HARM)) if(occupant) dump() - user << "You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field." + to_chat(user, "You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field.") + src.add_fingerprint(user) update_icon() else @@ -293,19 +307,23 @@ var/global/list/captain_display_cases = list() var/mob/living/carbon/human/H = user var/print = H.get_full_print() if(!ue) - user << "Your press your thumb against the fingerprint scanner, registering your identity with the case." + to_chat(user, "Your press your thumb against the fingerprint scanner, registering your identity with the case.") + ue = print return if(ue != print) - user << "Access denied." + to_chat(user, "Access denied.") + return if(occupant) - user << "Your press your thumb against the fingerprint scanner, and deactivate the hover field built into the case." + to_chat(user, "Your press your thumb against the fingerprint scanner, and deactivate the hover field built into the case.") + dump() update_icon() else - src << "\icon[src] \The [src] is empty!" + to_chat(src, "\icon[src] \The [src] is empty!") + else user.visible_message("[user.name] gently runs his hands over \the [src] in appreciation of its contents.", \ "You gently run your hands over \the [src] in appreciation of its contents.", \ diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 998f6520361..9042147343a 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -157,7 +157,8 @@ obj/structure/door_assembly/multi_tile/Move() user.visible_message("[user] welds the [glass] plating off the airlock assembly.", "You start to weld the [glass] plating off the airlock assembly.") if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return - user << "\blue You welded the [glass] plating off!" + to_chat(user, "\blue You welded the [glass] plating off!") + var/M = text2path("/obj/item/stack/sheet/mineral/[glass]") new M(src.loc, 2) glass = 0 @@ -165,18 +166,21 @@ obj/structure/door_assembly/multi_tile/Move() 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(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return - user << "\blue You welded the glass panel out!" + to_chat(user, "\blue You welded the glass panel out!") + new /obj/item/stack/sheet/rglass(src.loc) glass = 0 else if(!anchored) user.visible_message("[user] dissassembles the airlock assembly.", "You start to dissassemble the airlock assembly.") if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return - user << "\blue You dissasembled the airlock assembly!" + to_chat(user, "\blue You dissasembled the airlock assembly!") + new /obj/item/stack/sheet/metal(src.loc, 4) qdel(src) else - user << "\blue You need more welding fuel." + to_chat(user, "\blue You need more welding fuel.") + return else if(istype(W, /obj/item/weapon/wrench) && state == 0) @@ -188,7 +192,8 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You [anchored? "un" : ""]secured the airlock assembly!" + to_chat(user, "\blue You [anchored? "un" : ""]secured the airlock assembly!") + anchored = !anchored else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored ) @@ -198,7 +203,8 @@ obj/structure/door_assembly/multi_tile/Move() if(!src) return coil.use(1) src.state = 1 - user << "\blue You wire the Airlock!" + to_chat(user, "\blue You wire the Airlock!") + else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 ) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) @@ -206,7 +212,8 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You cut the airlock wires.!" + to_chat(user, "\blue You cut the airlock wires.!") + new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 @@ -218,7 +225,8 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You installed the airlock electronics!" + to_chat(user, "\blue You installed the airlock electronics!") + src.state = 2 src.name = "Near finished Airlock Assembly" src.electronics = W @@ -231,7 +239,8 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You removed the airlock electronics!" + to_chat(user, "\blue You removed the airlock electronics!") + src.state = 1 src.name = "Wired Airlock Assembly" var/obj/item/weapon/airlock_electronics/ae @@ -250,7 +259,8 @@ obj/structure/door_assembly/multi_tile/Move() playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40, target = src)) - user << "\blue You installed reinforced glass windows into the airlock assembly!" + to_chat(user, "\blue You installed reinforced glass windows into the airlock assembly!") + S.use(1) glass = 1 else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) @@ -259,17 +269,20 @@ obj/structure/door_assembly/multi_tile/Move() playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40, target = src)) - user << "\blue You installed [M] plating into the airlock assembly!" + to_chat(user, "\blue You installed [M] plating into the airlock assembly!") + S.use(2) glass = "[M]" else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 ) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\blue Now finishing the airlock." + to_chat(user, "\blue Now finishing the airlock.") + if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You finish the airlock!" + to_chat(user, "\blue You finish the airlock!") + var/path if(istext(glass)) path = text2path("/obj/machinery/door/airlock/[glass]") diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 0486ad2358a..7361fb20831 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -40,9 +40,11 @@ if(usr.stat || !usr.canmove || usr.restrained()) return if(last_time + delay_time > world.time) - usr << "\The [src] is not ready yet!" + to_chat(usr, "\The [src] is not ready yet!") + return - usr << "You activate \the [src]." + to_chat(usr, "You activate \the [src].") + shock() return @@ -78,7 +80,8 @@ visible_message("The electric chair went off!", "You hear a deep sharp shock!") if(buckled_mob) buckled_mob.burn_skin(90) - buckled_mob << "You feel a deep shock course through your body!" + to_chat(buckled_mob, "You feel a deep shock course through your body!") + sleep(1) buckled_mob.burn_skin(90) sleep(5) diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index 85fee295e38..fd3140f857a 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -18,7 +18,8 @@ user.drop_item() I.loc = src updateUsrDialog() - user << "You put [I] into [src]." + to_chat(user, "You put [I] into [src].") + return /obj/structure/engineeringcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." @@ -29,56 +30,64 @@ myglass=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/stack/sheet/metal)) if(!mymetal) put_in_cart(I, user) mymetal=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/stack/sheet/plasteel)) if(!myplasteel) put_in_cart(I, user) myplasteel=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/device/flashlight)) if(!myflashlight) put_in_cart(I, user) myflashlight=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/storage/toolbox/mechanical)) if(!mybluetoolbox) put_in_cart(I, user) mybluetoolbox=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/storage/toolbox/electrical)) if(!myyellowtoolbox) put_in_cart(I, user) myyellowtoolbox=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/storage/toolbox)) if(!myredtoolbox) put_in_cart(I, user) myredtoolbox=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/taperoll/engineering/)) if(!myengitape) put_in_cart(I, user) myengitape=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -95,7 +104,8 @@ "You hear ratchet.") anchored = 0 else - usr << "You cannot interface your modules [src]!" + to_chat(usr, "You cannot interface your modules [src]!") + /obj/structure/engineeringcart/attack_hand(mob/user) user.set_machine(src) @@ -128,42 +138,50 @@ if(href_list["glass"]) if(myglass) user.put_in_hands(myglass) - user << "You take [myglass] from [src]." + to_chat(user, "You take [myglass] from [src].") + myglass = null if(href_list["metal"]) if(mymetal) user.put_in_hands(mymetal) - user << "You take [mymetal] from [src]." + to_chat(user, "You take [mymetal] from [src].") + mymetal = null if(href_list["plasteel"]) if(myplasteel) user.put_in_hands(myplasteel) - user << "You take [myplasteel] from [src]." + to_chat(user, "You take [myplasteel] from [src].") + myplasteel = null if(href_list["flashlight"]) if(myflashlight) user.put_in_hands(myflashlight) - user << "You take [myflashlight] from [src]." + to_chat(user, "You take [myflashlight] from [src].") + myflashlight = null if(href_list["bluetoolbox"]) if(mybluetoolbox) user.put_in_hands(mybluetoolbox) - user << "You take [mybluetoolbox] from [src]." + to_chat(user, "You take [mybluetoolbox] from [src].") + mybluetoolbox = null if(href_list["redtoolbox"]) if(myredtoolbox) user.put_in_hands(myredtoolbox) - user << "You take [myredtoolbox] from [src]." + to_chat(user, "You take [myredtoolbox] from [src].") + myredtoolbox = null if(href_list["yellowtoolbox"]) if(myyellowtoolbox) user.put_in_hands(myyellowtoolbox) - user << "You take [myyellowtoolbox] from [src]." + to_chat(user, "You take [myyellowtoolbox] from [src].") + myyellowtoolbox = null if(href_list["engitape"]) if(myengitape) user.put_in_hands(myengitape) - user << "You take [myengitape] from [src]." + to_chat(user, "You take [myengitape] from [src].") + myengitape = null update_icon() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index f8b3317253a..4f448aa4c7a 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -17,7 +17,8 @@ user.drop_item(O) contents += O has_extinguisher = O - user << "You place [O] in [src]." + to_chat(user, "You place [O] in [src].") + else opened = !opened else @@ -34,11 +35,13 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") + return if(has_extinguisher) user.put_in_hands(has_extinguisher) - user << "You take [has_extinguisher] from [src]." + to_chat(user, "You take [has_extinguisher] from [src].") + has_extinguisher = null opened = 1 else @@ -48,7 +51,8 @@ /obj/structure/extinguisher_cabinet/attack_tk(mob/user) if(has_extinguisher) has_extinguisher.loc = loc - user << "You telekinetically remove [has_extinguisher] from [src]." + to_chat(user, "You telekinetically remove [has_extinguisher] from [src].") + has_extinguisher = null opened = 1 else diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 668ddc029e5..ceb6604db60 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -77,17 +77,20 @@ /obj/structure/falsewall/attackby(obj/item/weapon/W, mob/user, params) if(opening) - user << "You must wait until the door has stopped moving." + to_chat(user, "You must wait until the door has stopped moving.") + return if(density) var/turf/T = get_turf(src) if(T.density) - user << "[src] is blocked!" + to_chat(user, "[src] is blocked!") + return if(istype(W, /obj/item/weapon/screwdriver)) if (!istype(T, /turf/simulated/floor)) - user << "[src] bolts must be tightened on the floor!" + to_chat(user, "[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.") ChangeToWall() @@ -96,7 +99,8 @@ if(WT.remove_fuel(0,user)) dismantle(user) else - user << "You can't reach, close it first!" + to_chat(user, "You can't reach, close it first!") + if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade)) dismantle(user) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 80964a3b108..3d62fcbc902 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -287,12 +287,14 @@ if(istype(I, /obj/item/weapon/hatchet) && !stump) if(indestructable) //this bush marks the edge of the map, you can't destroy it - user << "\red You flail away at the undergrowth, but it's too thick here." + to_chat(user, "\red You flail away at the undergrowth, but it's too thick here.") + else user.visible_message("\red [user] begins clearing away [src].","\red You begin clearing away [src].") spawn(rand(15,30)) if(get_dist(user,src) < 2) - user << "\blue You clear away [src]." + to_chat(user, "\blue You clear away [src].") + var/obj/item/stack/sheet/wood/W = new(src.loc) W.amount = rand(3,15) if(prob(50)) diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index c1a3a388d48..0bb65409cf1 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -26,7 +26,8 @@ user.drop_item() I.loc = src updateUsrDialog() - user << "You put [I] into [src]." + to_chat(user, "You put [I] into [src].") + return /obj/structure/foodcart/attackby(obj/item/I, mob/user, params) @@ -42,7 +43,8 @@ success = 1 break; if(!success) - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/reagent_containers/food/drinks)) var/success = 0 for(var/s=1,s<=6,s++) @@ -53,7 +55,8 @@ success = 1 break; if(!success) - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -70,7 +73,8 @@ "You hear ratchet.") anchored = 0 else - usr << "You cannot interface your modules [src]!" + to_chat(usr, "You cannot interface your modules [src]!") + /obj/structure/foodcart/attack_hand(mob/user) user.set_machine(src) @@ -112,62 +116,74 @@ if(href_list["f1"]) if(food_slots[1]) user.put_in_hands(food_slots[1]) - user << "You take [food_slots[1]] from [src]." + to_chat(user, "You take [food_slots[1]] from [src].") + food_slots[1] = null if(href_list["f2"]) if(food_slots[2]) user.put_in_hands(food_slots[2]) - user << "You take [food_slots[2]] from [src]." + to_chat(user, "You take [food_slots[2]] from [src].") + food_slots[2] = null if(href_list["f3"]) if(food_slots[3]) user.put_in_hands(food_slots[3]) - user << "You take [food_slots[3]] from [src]." + to_chat(user, "You take [food_slots[3]] from [src].") + food_slots[3] = null if(href_list["f4"]) if(food_slots[4]) user.put_in_hands(food_slots[4]) - user << "You take [food_slots[4]] from [src]." + to_chat(user, "You take [food_slots[4]] from [src].") + food_slots[4] = null if(href_list["f5"]) if(food_slots[5]) user.put_in_hands(food_slots[5]) - user << "You take [food_slots[5]] from [src]." + to_chat(user, "You take [food_slots[5]] from [src].") + food_slots[5] = null if(href_list["f6"]) if(food_slots[6]) user.put_in_hands(food_slots[6]) - user << "You take [food_slots[6]] from [src]." + to_chat(user, "You take [food_slots[6]] from [src].") + food_slots[6] = null if(href_list["d1"]) if(drink_slots[1]) user.put_in_hands(drink_slots[1]) - user << "You take [drink_slots[1]] from [src]." + to_chat(user, "You take [drink_slots[1]] from [src].") + drink_slots[1] = null if(href_list["d2"]) if(drink_slots[2]) user.put_in_hands(drink_slots[2]) - user << "You take [drink_slots[2]] from [src]." + to_chat(user, "You take [drink_slots[2]] from [src].") + drink_slots[2] = null if(href_list["d3"]) if(drink_slots[3]) user.put_in_hands(drink_slots[3]) - user << "You take [drink_slots[3]] from [src]." + to_chat(user, "You take [drink_slots[3]] from [src].") + drink_slots[3] = null if(href_list["d4"]) if(drink_slots[4]) user.put_in_hands(drink_slots[4]) - user << "You take [drink_slots[4]] from [src]." + to_chat(user, "You take [drink_slots[4]] from [src].") + drink_slots[4] = null if(href_list["d5"]) if(drink_slots[5]) user.put_in_hands(drink_slots[5]) - user << "You take [drink_slots[5]] from [src]." + to_chat(user, "You take [drink_slots[5]] from [src].") + drink_slots[5] = null if(href_list["d6"]) if(drink_slots[6]) user.put_in_hands(drink_slots[6]) - user << "You take [drink_slots[6]] from [src]." + to_chat(user, "You take [drink_slots[6]] from [src].") + drink_slots[6] = null update_icon() //Not really needed without overlays, but keeping just in case diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index af20468279e..a295300fb03 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -32,62 +32,76 @@ if(istype(W, /obj/item/weapon/wrench) && state == 0) if(anchored && !istype(src,/obj/structure/girder/displaced)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue Now disassembling the girder" + to_chat(user, "\blue Now disassembling the girder") + if(do_after(user,40, target = src)) if(!src) return - user << "\blue You dissasembled the girder!" + to_chat(user, "\blue You dissasembled the girder!") + refundMetal(metalUsed) qdel(src) else if(!anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue Now securing the girder" + to_chat(user, "\blue Now securing the girder") + if(get_turf(user, 40)) - user << "\blue You secured the girder!" + to_chat(user, "\blue You secured the girder!") + new/obj/structure/girder( src.loc ) qdel(src) else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) - user << "\blue Now slicing apart the girder" + to_chat(user, "\blue Now slicing apart the girder") + if(do_after(user,30, target = src)) if(!src) return - user << "\blue You slice apart the girder!" + to_chat(user, "\blue You slice apart the girder!") + refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) - user << "\blue You drill through the girder!" + to_chat(user, "\blue You drill through the girder!") + refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1) - user << "You Disintegrate the girder!" + to_chat(user, "You Disintegrate the girder!") + refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "\blue Now unsecuring support struts" + to_chat(user, "\blue Now unsecuring support struts") + if(do_after(user,40, target = src)) if(!src) return - user << "\blue You unsecured the support struts!" + to_chat(user, "\blue You unsecured the support struts!") + state = 1 else if(istype(W, /obj/item/weapon/wirecutters) && istype(src,/obj/structure/girder/reinforced) && state == 1) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user << "\blue Now removing support struts" + to_chat(user, "\blue Now removing support struts") + if(do_after(user,40, target = src)) if(!src) return - user << "\blue You removed the support struts!" + to_chat(user, "\blue You removed the support struts!") + new/obj/structure/girder( src.loc ) qdel(src) else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) - user << "\blue Now dislodging the girder" + to_chat(user, "\blue Now dislodging the girder") + if(do_after(user, 40, target = src)) if(!src) return - user << "\blue You dislodged the girder!" + to_chat(user, "\blue You dislodged the girder!") + new/obj/structure/girder/displaced( src.loc ) qdel(src) @@ -100,16 +114,19 @@ if(!anchored) if(S.amount < 2) return S.use(2) - user << "\blue You create a false wall! Push on it to open or close the passage." + to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") + new /obj/structure/falsewall (src.loc) qdel(src) else if(S.amount < 2) return ..() - user << "\blue Now adding plating..." + to_chat(user, "\blue Now adding plating...") + if (do_after(user,40, target = src)) if(!src || !S || S.amount < 2) return S.use(2) - user << "\blue You added the plating!" + to_chat(user, "\blue You added the plating!") + var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(/turf/simulated/wall) for(var/turf/simulated/wall/X in Tsrc.loc) @@ -121,17 +138,20 @@ if(!anchored) if(S.amount < 2) return S.use(2) - user << "\blue You create a false wall! Push on it to open or close the passage." + to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") + new /obj/structure/falsewall/reinforced (src.loc) qdel(src) else if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code... if(S.amount < 1) return ..() - user << "\blue Now finalising reinforced wall." + to_chat(user, "\blue Now finalising reinforced wall.") + if(do_after(user, 50, target = src)) if(!src || !S || S.amount < 1) return S.use(1) - user << "\blue Wall fully reinforced!" + to_chat(user, "\blue Wall fully reinforced!") + var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(/turf/simulated/wall/r_wall) for(var/turf/simulated/wall/r_wall/X in Tsrc.loc) @@ -140,11 +160,13 @@ return else if(S.amount < 1) return ..() - user << "\blue Now reinforcing girders" + to_chat(user, "\blue Now reinforcing girders") + if (do_after(user,60, target = src)) if(!src || !S || S.amount < 1) return S.use(1) - user << "\blue Girders reinforced!" + to_chat(user, "\blue Girders reinforced!") + new/obj/structure/girder/reinforced( src.loc ) qdel(src) return @@ -154,17 +176,20 @@ if(!anchored) if(S.amount < 2) return S.use(2) - user << "\blue You create a false wall! Push on it to open or close the passage." + to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") + var/F = text2path("/obj/structure/falsewall/[M]") new F (src.loc) qdel(src) else if(S.amount < 2) return ..() - user << "\blue Now adding plating..." + to_chat(user, "\blue Now adding plating...") + if (do_after(user,40, target = src)) if(!src || !S || S.amount < 2) return S.use(2) - user << "\blue You added the plating!" + to_chat(user, "\blue You added the plating!") + var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]")) for(var/turf/simulated/wall/mineral/X in Tsrc.loc) @@ -179,7 +204,8 @@ if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds. user.drop_item() P.loc = src.loc - user << "\blue You fit the pipe into the [src]!" + to_chat(user, "\blue You fit the pipe into the [src]!") + else ..() @@ -241,19 +267,24 @@ /obj/structure/cultgirder/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) - user << "\blue Now disassembling the girder" + to_chat(user, "\blue Now disassembling the girder") + if(do_after(user,40, target = src)) - user << "\blue You dissasembled the girder!" + to_chat(user, "\blue You dissasembled the girder!") + dismantle() else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) - user << "\blue Now slicing apart the girder" + to_chat(user, "\blue Now slicing apart the girder") + if(do_after(user,30, target = src)) - user << "\blue You slice apart the girder!" + to_chat(user, "\blue You slice apart the girder!") + dismantle() else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) - user << "\blue You drill through the girder!" + to_chat(user, "\blue You drill through the girder!") + dismantle() /obj/structure/cultgirder/proc/dismantle() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 12bdb0c42d9..17d6d1b0262 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -170,18 +170,22 @@ else dir_to_set = 4 else - user << "You can't reach." + to_chat(user, "You can't reach.") + return //Only works for cardinal direcitons, diagonals aren't supposed to work like this. for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set) - user << "There is already a window facing this way there." + to_chat(user, "There is already a window facing this way there.") + return - user << "You start placing the window." + to_chat(user, "You start placing the window.") + if(do_after(user,20, target = src)) if(!src) return //Grille destroyed while waiting for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting. - user << "There is already a window facing this way there." + to_chat(user, "There is already a window facing this way there.") + return var/obj/structure/window/WD if(istype(W,/obj/item/stack/sheet/rglass)) @@ -198,7 +202,8 @@ WD.state = 0 var/obj/item/stack/ST = W ST.use(1) - user << "You place the [WD] on [src]." + to_chat(user, "You place the [WD] on [src].") + WD.update_icon() return //window placing end diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index d422d25dfd2..d6a73d7f07c 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -7,7 +7,8 @@ /obj/item/inflatable/attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) - user << "\blue You inflate [src]." + to_chat(user, "\blue You inflate [src].") + var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -150,7 +151,8 @@ /obj/item/inflatable/door/attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) - user << "\blue You inflate [src]." + to_chat(user, "\blue You inflate [src].") + var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -262,7 +264,8 @@ icon_state = "folded_wall_torn" /obj/item/inflatable/torn/attack_self(mob/user) - user << "The inflatable wall is too torn to be inflated!" + to_chat(user, "The inflatable wall is too torn to be inflated!") + add_fingerprint(user) /obj/item/inflatable/door/torn @@ -272,7 +275,8 @@ icon_state = "folded_door_torn" /obj/item/inflatable/door/torn/attack_self(mob/user) - user << "The inflatable door is too torn to be inflated!" + to_chat(user, "The inflatable door is too torn to be inflated!") + add_fingerprint(user) /obj/item/weapon/storage/briefcase/inflatable diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 6e2f0763369..30a4080b3b4 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -32,24 +32,28 @@ /obj/structure/stool/bed/chair/janicart/examine(mob/user) ..() if(floorbuffer) - user << "It has been upgraded with a floor buffer." + to_chat(user, "It has been upgraded with a floor buffer.") + /obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user, params) if(istype(I, keytype)) - user << "Hold [I] in one of your hands while you drive this [callme]." + to_chat(user, "Hold [I] in one of your hands while you drive this [callme].") + else if(istype(I, /obj/item/weapon/storage/bag/trash)) if(keytype == /obj/item/key/janitor) if(!user.drop_item()) return - user << "You hook the trashbag onto the [callme]." + to_chat(user, "You hook the trashbag onto the [callme].") + I.loc = src mybag = I else if(istype(I, /obj/item/janiupgrade)) if(keytype == /obj/item/key/janitor) floorbuffer = 1 qdel(I) - user << "You upgrade the [callme] with the floor buffer." + to_chat(user, "You upgrade the [callme] with the floor buffer.") + update_icon() /obj/structure/stool/bed/chair/janicart/update_icon() @@ -90,7 +94,8 @@ spawn(2) move_delay = 0 else - user << "You'll need the keys in one of your hands to drive this [callme]." + to_chat(user, "You'll need the keys in one of your hands to drive this [callme].") + /obj/structure/stool/bed/chair/janicart/Bump(atom/A) if(buckled_mob && istype(A, /obj/machinery/door)) @@ -245,17 +250,20 @@ /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user) if(reagents.total_volume < 1) - user << "[src] is out of water!" + to_chat(user, "[src] is out of water!") + else reagents.trans_to(mop, 5) // - user << "You wet [mop] in [src]." + to_chat(user, "You wet [mop] in [src].") + playsound(loc, 'sound/effects/slosh.ogg', 25, 1) /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user) user.drop_item() I.loc = src updateUsrDialog() - user << "You put [I] into [src]." + to_chat(user, "You put [I] into [src].") + return @@ -271,38 +279,44 @@ if(!mymop) m.janicart_insert(user, src) else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/storage/bag/trash)) if(!mybag) var/obj/item/weapon/storage/bag/trash/t=I t.janicart_insert(user, src) else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner)) if(!myspray) put_in_cart(I, user) myspray=I update_icon() else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/device/lightreplacer)) if(!myreplacer) var/obj/item/device/lightreplacer/l=I l.janicart_insert(user,src) else - user << fail_msg + to_chat(user, fail_msg) + else if(istype(I, /obj/item/weapon/caution)) if(signs < max_signs) put_in_cart(I, user) signs++ update_icon() else - user << "[src] can't hold any more signs." + to_chat(user, "[src] can't hold any more signs.") + else if(istype(I, /obj/item/weapon/crowbar)) user.visible_message("[user] begins to empty the contents of [src].") if(do_after(user, 30, target = src)) - usr << "You empty the contents of [src]'s bucket onto the floor." + to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.") + reagents.reaction(src.loc) src.reagents.clear_reagents() else if(istype(I, /obj/item/weapon/wrench)) @@ -323,7 +337,8 @@ else if(mybag) mybag.attackby(I, user, params) else - usr << "You cannot interface your modules [src]!" + to_chat(usr, "You cannot interface your modules [src]!") + /obj/structure/janitorialcart/attack_hand(mob/user) user.set_machine(src) @@ -352,29 +367,34 @@ if(href_list["garbage"]) if(mybag) user.put_in_hands(mybag) - user << "You take [mybag] from [src]." + to_chat(user, "You take [mybag] from [src].") + mybag = null if(href_list["mop"]) if(mymop) user.put_in_hands(mymop) - user << "You take [mymop] from [src]." + to_chat(user, "You take [mymop] from [src].") + mymop = null if(href_list["spray"]) if(myspray) user.put_in_hands(myspray) - user << "You take [myspray] from [src]." + to_chat(user, "You take [myspray] from [src].") + myspray = null if(href_list["replacer"]) if(myreplacer) user.put_in_hands(myreplacer) - user << "You take [myreplacer] from [src]." + to_chat(user, "You take [myreplacer] from [src].") + myreplacer = null if(href_list["sign"]) if(signs) var/obj/item/weapon/caution/Sign = locate() in src if(Sign) user.put_in_hands(Sign) - user << "You take \a [Sign] from [src]." + to_chat(user, "You take \a [Sign] from [src].") + signs-- else WARNING("Signs ([signs]) didn't match contents") diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 297c63a333c..7e61e34ccb4 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -13,16 +13,19 @@ add_fingerprint(user) if(istype(I, /obj/item/weapon/wrench)) if(anchored) - user << "You unwrench [src] from the floor." + to_chat(user, "You unwrench [src] from the floor.") + anchored = 0 else - user << "You wrench [src] into place." + to_chat(user, "You wrench [src] into place.") + anchored = 1 else if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if(R.get_amount() >= 4) R.use(4) - user << "You add spikes to the frame." + to_chat(user, "You add spikes to the frame.") + new /obj/structure/kitchenspike(loc) add_fingerprint(user) qdel(src) @@ -45,18 +48,21 @@ if(!buckled_mob) playsound(loc, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 20, target = src)) - user << "You pry the spikes out of the frame." + to_chat(user, "You pry the spikes out of the frame.") + new /obj/item/stack/rods(loc, 4) new /obj/structure/kitchenspike_frame(loc) add_fingerprint(user) qdel(src) else - user << "You can't do that while something's on the spike!" + to_chat(user, "You can't do that while something's on the spike!") + return if(!istype(G, /obj/item/weapon/grab) || !G.affecting) return if(buckled_mob) - user << "The spike already has something on it, finish collecting its meat first!" + to_chat(user, "The spike already has something on it, finish collecting its meat first!") + else if(isliving(G.affecting)) if(!buckled_mob) @@ -65,7 +71,8 @@ G.affecting.visible_message("[user] slams [G.affecting] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.") qdel(G) return - user << "You can't use that on the spike!" + to_chat(user, "You can't use that on the spike!") + return /obj/structure/kitchenspike/proc/spike(var/mob/living/victim) @@ -123,7 +130,8 @@ M.adjustBruteLoss(30) if(!do_after(M, 1200, target = src)) if(M && M.buckled) - M << "You fail to free yourself!" + to_chat(M, "You fail to free yourself!") + return if(!M.buckled) return diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 1be4d60dea0..66a3d9cbcb0 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -69,10 +69,12 @@ if (src.destroyed) return else - usr << text("\blue You kick the lab cage.") + to_chat(usr, text("\blue You kick the lab cage.")) + for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << text("\red [] kicks the lab cage.", usr) + to_chat(O, text("\red [] kicks the lab cage.", usr)) + src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 6b27e8104d2..55f25ed49cb 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -58,7 +58,8 @@ if (istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) - user << "\blue Slicing lattice joints ..." + to_chat(user, "\blue Slicing lattice joints ...") + new /obj/item/stack/rods(src.loc) qdel(src) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 78f67ab8847..95c22d434f8 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -111,13 +111,16 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/pickaxe)) var/obj/item/weapon/pickaxe/digTool = W - user << "You start digging the [name]." + to_chat(user, "You start digging the [name].") + if(do_after(user,digTool.digspeed*hardness, target = src) && src) - user << "You finished digging." + to_chat(user, "You finished digging.") + Dismantle() else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc? hardness -= W.force/100 - user << "You hit the [name] with your [W.name]!" + to_chat(user, "You hit the [name] with your [W.name]!") + CheckHardness() else attack_hand(user) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index fc9a0d4584c..77c5268ba7b 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -15,7 +15,8 @@ return attack_hand(user) attack_hand(mob/user as mob) - user << "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!" + to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!") + /obj/structure/ninjatele @@ -48,12 +49,15 @@ playsound(user.loc, 'sound/effects/sparks2.ogg', 50, 1) anim(user.loc,user,'icons/mob/mob.dmi',,"phasein",,user.dir) - user <<"\blue VOID-Shift translocation successful" + to_chat(user, "\blue VOID-Shift translocation successful") + if("No") - user <<"\red Process aborted!" + to_chat(user, "\red Process aborted!") + return else - user<< "\red FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." \ No newline at end of file + to_chat(user, "\red FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") + diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 4988e7d465e..2bb20afb82d 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -23,16 +23,19 @@ /obj/structure/mopbucket/examine(mob/user) if(..(user, 1)) - usr << text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume) + to_chat(usr, text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)) + /obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/mop)) if (src.reagents.total_volume >= 2) src.reagents.trans_to(W, 2) - user << "\blue You wet the mop" + to_chat(user, "\blue You wet the mop") + playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1) if (src.reagents.total_volume < 1) - user << "\blue Out of water!" + to_chat(user, "\blue Out of water!") + return /obj/structure/mopbucket/ex_act(severity) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 4e255976e18..7b0ba512971 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -150,7 +150,8 @@ if (CM.stat || CM.restrained()) return - CM << "You attempt to slide yourself out of \the [src]..." + to_chat(CM, "You attempt to slide yourself out of \the [src]...") + src.attack_hand(CM) @@ -192,7 +193,8 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + to_chat(B, text("\red [] stuffs [] into []!", user, O, src)) + return /obj/structure/m_tray/Destroy() @@ -274,7 +276,8 @@ /obj/structure/crematorium/attack_hand(mob/user as mob) if (cremating) - usr << "\red It's locked." + to_chat(usr, "\red It's locked.") + return if ((connected) && (locked == 0)) for(var/atom/movable/A as mob|obj in connected.loc) @@ -388,7 +391,8 @@ if (CM.stat || CM.restrained()) return - CM << "You attempt to slide yourself out of \the [src]..." + to_chat(CM, "You attempt to slide yourself out of \the [src]...") + src.attack_hand(CM) /* @@ -429,7 +433,8 @@ if (user != O) for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) - B << text("\red [] stuffs [] into []!", user, O, src) + to_chat(B, text("\red [] stuffs [] into []!", user, O, src)) + //Foreach goto(99) return @@ -446,7 +451,8 @@ if (!C.cremating) C.cremate(user) else - usr << "\red Access denied." + to_chat(usr, "\red Access denied.") + return /hook/Login/proc/update_morgue(var/client/client, var/mob/L) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 8a5f144aac2..81d36be51d9 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -79,18 +79,22 @@ cur_acc[i] = "n" for(var/line in lines) - //world << line +// to_chat(world, line) + for(var/beat in splittext(lowertext(line), ",")) - //world << "beat: [beat]" +// to_chat(world, "beat: [beat]") + var/list/notes = splittext(beat, "/") for(var/note in splittext(notes[1], "-")) - //world << "note: [note]" +// to_chat(world, "note: [note]") + if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case playing = 0 return if(lentext(note) == 0) continue - //world << "Parse: [copytext(note,1,2)]" +// to_chat(world, "Parse: [copytext(note,1,2)]") + var/cur_note = text2ascii(note) - 96 if(cur_note < 1 || cur_note > 7) continue @@ -172,12 +176,14 @@ else tempo = sanitize_tempo(5) // default 120 BPM if(lines.len > 50) - usr << "Too many lines!" + to_chat(usr, "Too many lines!") + lines.Cut(51) var/linenum = 1 for(var/l in lines) if(lentext(l) > 50) - usr << "Line [linenum] too long!" + to_chat(usr, "Line [linenum] too long!") + lines.Remove(l) else linenum++ @@ -301,7 +307,8 @@ if (istype(O, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << " You begin to tighten \the [src] to the floor..." + to_chat(user, " You begin to tighten \the [src] to the floor...") + if (do_after(user, 20, target = src)) user.visible_message( \ "[user] tightens \the [src]'s casters.", \ @@ -310,7 +317,8 @@ anchored = 1 else if(anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - user << " You begin to loosen \the [src]'s casters..." + to_chat(user, " You begin to loosen \the [src]'s casters...") + if (do_after(user, 40, target = src)) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index d5997adfda9..12893155709 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -25,9 +25,11 @@ O.loc = src notices++ icon_state = "nboard0[notices]" //update sprite - user << "You pin the paper to the noticeboard." + to_chat(user, "You pin the paper to the noticeboard.") + else - user << "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached." + to_chat(user, "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.") + /obj/structure/noticeboard/attack_hand(user as mob) var/dat = "Noticeboard
" @@ -65,7 +67,8 @@ add_fingerprint(usr) P.attackby(usr.l_hand, usr) else - usr << "You'll need something to write with!" + to_chat(usr, "You'll need something to write with!") + if(href_list["read"]) var/obj/item/weapon/paper/P = locate(href_list["read"]) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index c95f3aa2b09..c34e36404cd 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -42,9 +42,11 @@ FLOOR SAFES /obj/structure/safe/proc/check_unlocked(mob/user, canhear) if(user && canhear) if(tumbler_1_pos == tumbler_1_open) - user << "You hear a [pick("tonk", "krunk", "plunk")] from [src]." + to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from [src].") + if(tumbler_2_pos == tumbler_2_open) - user << "You hear a [pick("tink", "krink", "plink")] from [src]." + to_chat(user, "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")]!") return 1 @@ -95,13 +97,15 @@ FLOOR SAFES if(href_list["open"]) if(check_unlocked()) - user << "You [open ? "close" : "open"] [src]." + to_chat(user, "You [open ? "close" : "open"] [src].") + open = !open update_icon() updateUsrDialog() return else - user << "You can't [open ? "close" : "open"] [src], the lock is engaged!" + to_chat(user, "You can't [open ? "close" : "open"] [src], the lock is engaged!") + return if(href_list["decrement"]) @@ -109,11 +113,13 @@ FLOOR SAFES if(dial == tumbler_1_pos + 1 || dial == tumbler_1_pos - 71) tumbler_1_pos = decrement(tumbler_1_pos) if(canhear) - user << "You hear a [pick("clack", "scrape", "clank")] from [src]." + to_chat(user, "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) - user << "You hear a [pick("click", "chink", "clink")] from [src]." + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") + check_unlocked(user, canhear) updateUsrDialog() return @@ -123,11 +129,13 @@ FLOOR SAFES if(dial == tumbler_1_pos - 1 || dial == tumbler_1_pos + 71) tumbler_1_pos = increment(tumbler_1_pos) if(canhear) - user << "You hear a [pick("clack", "scrape", "clank")] from [src]." + to_chat(user, "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) - user << "You hear a [pick("click", "chink", "clink")] from [src]." + to_chat(user, "You hear a [pick("click", "chink", "clink")] from [src].") + check_unlocked(user, canhear) updateUsrDialog() return @@ -147,18 +155,22 @@ FLOOR SAFES if(I.w_class + space <= maxspace) space += I.w_class if(!user.drop_item()) - user << "\The [I] is stuck to your hand, you cannot put it in the safe!" + to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") + return I.loc = src - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") + updateUsrDialog() return else - user << "[I] won't fit in [src]." + to_chat(user, "[I] won't fit in [src].") + return else if(istype(I, /obj/item/clothing/accessory/stethoscope)) - user << "Hold [I] in one of your hands while you manipulate the dial!" + to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") + return diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 7e35851f693..82c8ed08829 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -25,7 +25,8 @@ /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) - user << "You unfasten the sign with your [tool]." + to_chat(user, "You unfasten the sign with your [tool].") + var/obj/item/sign/S = new(src.loc) S.name = name S.desc = desc @@ -61,7 +62,8 @@ S.name = name S.desc = desc S.icon_state = sign_state - user << "You fasten \the [S] with your [tool]." + to_chat(user, "You fasten \the [S] with your [tool].") + qdel(src) else ..() diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index f4ba32b3286..cb26f8ca054 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -15,11 +15,13 @@ if(O.client) var/area/A = get_area(src) if(A) - O << "\blue Someone has begun playing with a [src.name] in [A.name]!. (Teleport)" + to_chat(O, "\blue Someone has begun playing with a [src.name] in [A.name]!. (Teleport)") + /obj/structure/spirit_board/examine(mob/user) ..(user) - user << "[initial(desc)] The planchette is sitting at \"[planchette]\"." + to_chat(user, "[initial(desc)] The planchette is sitting at \"[planchette]\".") + /obj/structure/spirit_board/attack_hand(mob/user as mob) if(..()) @@ -69,7 +71,8 @@ light_amount = 10 if(light_amount > 2) - M << "It's too bright here to use [src.name]!" + to_chat(M, "It's too bright here to use [src.name]!") + return 0 //mobs in range check @@ -77,12 +80,14 @@ 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. - M << "[L] doesn't seem to be paying attention..." + to_chat(M, "[L] doesn't seem to be paying attention...") + else users_in_range++ if(users_in_range < 2) - M << "There aren't enough people to use the [src.name]!" + to_chat(M, "There aren't enough people to use the [src.name]!") + return 0 return 1 \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 2c81fd09af3..859b4ba0186 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -34,7 +34,8 @@ "You hear squelching...") if(!do_after(M, 1200, target = src)) if(M && M.buckled) - M << "You fail to escape \the [src]!" + to_chat(M, "You fail to escape \the [src]!") + return if(!M.buckled) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 671381f952d..d61c34e48bc 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -118,10 +118,12 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) - user << " The rack is empty." + to_chat(user, " The rack is empty.") + return - user << "You deploy the roller bed." + to_chat(user, "You deploy the roller bed.") + var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) R.add_fingerprint(user) qdel(held) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index 2b5b1bd3ecb..b41ed314674 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -21,7 +21,8 @@ if(istype(W, /obj/item/assembly/shock_kit)) var/obj/item/assembly/shock_kit/SK = W if(!SK.status) - user << "[SK] is not ready to be attached!" + to_chat(user, "[SK] is not ready to be attached!") + return user.drop_item() var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a915ebcdd32..90d8b578b83 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -199,10 +199,12 @@ if(get_dist(src, user) < 2) var/obj/item/weapon/grab/G = I if(G.affecting.buckled) - user << "[G.affecting] is buckled to [G.affecting.buckled]!" + to_chat(user, "[G.affecting] is buckled to [G.affecting.buckled]!") + return 0 if(G.state < GRAB_AGGRESSIVE) - user << "You need a better grip to do that!" + to_chat(user, "You need a better grip to do that!") + return 0 if(!G.confirm()) return 0 @@ -221,7 +223,8 @@ return if (istype(W, /obj/item/weapon/wrench)) - user << "\blue Now disassembling table" + to_chat(user, "\blue Now disassembling table") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) destroy() @@ -279,7 +282,8 @@ return if(!flip(get_cardinal_dir(usr,src))) - usr << "It won't budge." + to_chat(usr, "It won't budge.") + return usr.visible_message("[usr] flips \the [src]!") @@ -296,7 +300,8 @@ set src in oview(1) if (!unflip()) - usr << "It won't budge." + to_chat(usr, "It won't budge.") + return @@ -383,7 +388,8 @@ return if (istype(I, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the wooden table" + to_chat(user, "\blue Now disassembling the wooden table") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -434,7 +440,8 @@ return if (istype(W, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the wooden table" + to_chat(user, "\blue Now disassembling the wooden table") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -482,23 +489,28 @@ if(istype(I, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = I if(G.amount >= 2) - user << "You start to add the glass to \the [src]." + to_chat(user, "You start to add the glass to \the [src].") + if(do_after(user, 10, target = src)) G.use(2) - user << "You add the glass to \the [src]." + to_chat(user, "You add the glass to \the [src].") + playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/table/glass(loc) qdel(src) else - user << "You don't have enough glass! You need at least 2 sheets." + to_chat(user, "You don't have enough glass! You need at least 2 sheets.") + return if(iswrench(I)) - user << "You start to deconstruct \the [src]." + to_chat(user, "You start to deconstruct \the [src].") + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) if(do_after(user, 10, target = src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) - user << "You dismantle \the [src]." + to_chat(user, "You dismantle \the [src].") + new /obj/item/stack/sheet/metal(loc) new /obj/item/stack/sheet/metal(loc) qdel(src) @@ -533,7 +545,8 @@ return if (istype(I, /obj/item/weapon/wrench)) - user << "\blue Now disassembling the glass table" + to_chat(user, "\blue Now disassembling the glass table") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/glass( src.loc ) @@ -595,18 +608,22 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) if(src.status == 2) - user << "\blue Now weakening the reinforced table" + to_chat(user, "\blue Now weakening the reinforced table") + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return - user << "\blue Table weakened" + to_chat(user, "\blue Table weakened") + src.status = 1 else - user << "\blue Now strengthening the reinforced table" + to_chat(user, "\blue Now strengthening the reinforced table") + playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return - user << "\blue Table strengthened" + to_chat(user, "\blue Table strengthened") + src.status = 2 return return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index 3d8b13ff08b..fcfa8161a75 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -49,9 +49,11 @@ I.loc = src oxytanks.Add(I) oxygentanks++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") + else - user << "[src] is full." + to_chat(user, "[src] is full.") + updateUsrDialog() return if(istype(I, /obj/item/weapon/tank/plasma)) @@ -60,17 +62,21 @@ I.loc = src platanks.Add(I) plasmatanks++ - user << "You put [I] in [src]." + to_chat(user, "You put [I] in [src].") + else - user << "[src] is full." + to_chat(user, "[src] is full.") + updateUsrDialog() return if(istype(I, /obj/item/weapon/wrench)) if(anchored) - user << "You lean down and unwrench [src]." + to_chat(user, "You lean down and unwrench [src].") + anchored = 0 else - user << "You wrench [src] into place." + to_chat(user, "You wrench [src] into place.") + anchored = 1 return @@ -88,7 +94,8 @@ else O = new /obj/item/weapon/tank/oxygen(loc) O.loc = loc - usr << "You take [O] out of [src]." + to_chat(usr, "You take [O] out of [src].") + oxygentanks-- update_icon() if(href_list["plasma"]) @@ -100,7 +107,8 @@ else P = new /obj/item/weapon/tank/plasma(loc) P.loc = loc - usr << "You take [P] out of [src]." + to_chat(usr, "You take [P] out of [src].") + plasmatanks-- update_icon() add_fingerprint(usr) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index bb7ab804d9c..b3bbcce9c2b 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -30,7 +30,8 @@ W.loc = loc W.layer = 3.1 pinned_target = W - user << "You slide the target into the stake." + to_chat(user, "You slide the target into the stake.") + return attack_hand(mob/user as mob) @@ -44,9 +45,11 @@ if(ishuman(user)) if(!user.get_active_hand()) user.put_in_hands(pinned_target) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") + else pinned_target.loc = get_turf(user) - user << "You take the target out of the stake." + to_chat(user, "You take the target out of the stake.") + pinned_target = null \ No newline at end of file diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index 48cc9feccf7..c8efd45a075 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -36,7 +36,8 @@ if(!pod_moving && icon_state == "open" && istype(AM, /mob/living) && !is_type_in_list(AM, disallowed_mobs)) for(var/obj/structure/transit_tube_pod/pod in loc) if(pod.contents.len) - AM << "" + to_chat(AM, "") + return else if(!pod.moving && pod.dir in directions()) AM.forceMove(pod) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index b322a84de5b..42dfe596d1d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -28,7 +28,8 @@ if(cistern && !open) if(!contents.len) - user << "The cistern is empty." + to_chat(user, "The cistern is empty.") + return else var/obj/item/I = pick(contents) @@ -36,7 +37,8 @@ user.put_in_hands(I) else I.loc = get_turf(src) - user << "You find [I] in the cistern." + to_chat(user, "You find [I] in the cistern.") + w_items -= I.w_class return @@ -50,7 +52,8 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/crowbar)) - user << "You start to [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]..." + to_chat(user, "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(do_after(user, 30, target = src)) 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.") @@ -64,7 +67,8 @@ var/obj/item/weapon/reagent_containers/RG = I if(RG.is_open_container()) RG.reagents.add_reagent("toiletwater", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) - user << "You fill [RG] from [src]. Gross." + to_chat(user, "You fill [RG] from [src]. Gross.") + return if(istype(I, /obj/item/weapon/grab)) @@ -76,7 +80,8 @@ var/mob/living/GM = G.affecting if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - user << "[GM] needs to be on [src]!" + to_chat(user, "[GM] needs to be on [src]!") + return if(!swirlie) if(open) @@ -96,21 +101,26 @@ GM.visible_message("[user] slams [GM.name] into [src]!", "[user] slams [GM.name] into [src]!") GM.adjustBruteLoss(5) else - user << "You need a tighter grip!" + to_chat(user, "You need a tighter grip!") + if(cistern) if(I.w_class > 3) - user << "[I] does not fit!" + to_chat(user, "[I] does not fit!") + return if(w_items + I.w_class > 5) - user << "The cistern is full!" + to_chat(user, "The cistern is full!") + return if(!user.drop_item()) - user << "\The [I] is stuck to your hand, you cannot put it in the cistern!" + to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the cistern!") + return I.loc = src w_items += I.w_class - user << "You carefully place [I] into the cistern." + to_chat(user, "You carefully place [I] into the cistern.") + return @@ -133,14 +143,16 @@ var/mob/living/GM = G.affecting if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) - user << "[GM.name] needs to be on [src]." + to_chat(user, "[GM.name] needs to be on [src].") + return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) user.visible_message("[user] slams [GM] into [src]!", "You slam [GM] into [src]!") GM.adjustBruteLoss(8) else - user << "You need a tighter grip!" + to_chat(user, "You need a tighter grip!") + /obj/machinery/shower @@ -181,9 +193,11 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) if(I.type == /obj/item/device/analyzer) - user << "The water temperature seems to be [watertemp]." + to_chat(user, "The water temperature seems to be [watertemp].") + if(istype(I, /obj/item/weapon/wrench)) - user << "You begin to adjust the temperature valve with the [I]." + to_chat(user, "You begin to adjust the temperature valve with the [I].") + if(do_after(user, 50, target = src)) switch(watertemp) if("normal") @@ -252,7 +266,8 @@ var/mob/living/L = O L.ExtinguishMob() L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily - L << "You've been drenched in water!" + to_chat(L, "You've been drenched in water!") + if(iscarbon(O)) var/mob/living/carbon/M = O if(M.r_hand) @@ -343,12 +358,14 @@ if(watertemp == "freezing") //C.bodytemperature = max(80, C.bodytemperature - 80) - C << "The water is freezing!" + to_chat(C, "The water is freezing!") + return if(watertemp == "boiling") //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) - C << "The water is searing!" + to_chat(C, "The water is searing!") + return @@ -385,11 +402,13 @@ if (user.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - user << "You try to move your [temp.name], but cannot!" + to_chat(user, "You try to move your [temp.name], but cannot!") + return if(busy) - user << "Someone's already washing here." + to_chat(user, "Someone's already washing here.") + return var/selected_area = parse_zone(user.zone_sel.selecting) var/washing_face = 0 @@ -421,7 +440,8 @@ /obj/structure/sink/attackby(obj/item/O, mob/user, params) if(busy) - user << "Someone's already washing here!" + to_chat(user, "Someone's already washing here!") + return if(!(istype(O))) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index e8ad95cbe3b..99bd41d7040 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -82,7 +82,8 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return - user << "You dissasembled the windoor assembly!" + to_chat(user, "You dissasembled the windoor assembly!") + var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5) RG.add_fingerprint(user) if(secure) @@ -96,7 +97,8 @@ obj/structure/windoor_assembly/Destroy() if(istype(W, /obj/item/weapon/wrench) && !anchored) for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") + return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") @@ -106,9 +108,11 @@ obj/structure/windoor_assembly/Destroy() return for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) - user << "There is already a windoor in that location." + to_chat(user, "There is already a windoor in that location.") + return - user << "You've secured the windoor assembly!" + to_chat(user, "You've secured the windoor assembly!") + src.anchored = 1 if(src.secure) src.name = "secure anchored windoor assembly" @@ -123,7 +127,8 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !src.anchored) return - user << "You've unsecured the windoor assembly!" + to_chat(user, "You've unsecured the windoor assembly!") + src.anchored = 0 if(src.secure) src.name = "secure windoor assembly" @@ -134,16 +139,19 @@ obj/structure/windoor_assembly/Destroy() else if(istype(W, /obj/item/stack/sheet/plasteel) && !secure) var/obj/item/stack/sheet/plasteel/P = W if(P.amount < 2) - user << "You need more plasteel to do this." + to_chat(user, "You need more plasteel to do this.") + return - user << "You start to reinforce the windoor with plasteel." + to_chat(user, "You start to reinforce the windoor with plasteel.") + if(do_after(user,40, target = src)) if(!src || secure) return P.use(2) - user << "You reinforce the windoor." + to_chat(user, "You reinforce the windoor.") + src.secure = 1 if(src.anchored) src.name = "secure anchored windoor assembly" @@ -159,7 +167,8 @@ obj/structure/windoor_assembly/Destroy() return var/obj/item/stack/cable_coil/CC = W CC.use(1) - user << "You wire the windoor!" + to_chat(user, "You wire the windoor!") + src.state = "02" if(src.secure) src.name = "secure wired windoor assembly" @@ -179,7 +188,8 @@ obj/structure/windoor_assembly/Destroy() if(!src || src.state != "02") return - user << "You cut the windoor wires!" + to_chat(user, "You cut the windoor wires!") + new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) @@ -198,7 +208,8 @@ obj/structure/windoor_assembly/Destroy() if(!src || src.electronics) W.loc = src.loc return - user << "You've installed the airlock electronics!" + to_chat(user, "You've installed the airlock electronics!") + src.name = "near finished windoor assembly" src.electronics = W else @@ -215,7 +226,8 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !electronics) return - user << "You've removed the airlock electronics!" + to_chat(user, "You've removed the airlock electronics!") + src.name = "wired windoor assembly" var/obj/item/weapon/airlock_electronics/ae ae = electronics @@ -236,7 +248,8 @@ obj/structure/windoor_assembly/Destroy() //Crowbar to complete the assembly, Step 7 complete. else if(istype(W, /obj/item/weapon/crowbar)) if(!src.electronics) - usr << "The assembly is missing electronics." + to_chat(usr, "The assembly is missing electronics.") + return usr << browse(null, "window=windoor_access") playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) @@ -247,7 +260,8 @@ obj/structure/windoor_assembly/Destroy() if(src.loc && src.electronics) density = 1 //Shouldn't matter but just incase - user << "You finish the windoor!" + to_chat(user, "You finish the windoor!") + if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc) @@ -308,7 +322,8 @@ obj/structure/windoor_assembly/Destroy() if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor; therefore, you can't rotate it!" + to_chat(usr, "It is fastened to the floor; therefore, you can't rotate it!") + return 0 //if(src.state != "01") //update_nearby_tiles(need_rebuild=1) //Compel updates before @@ -331,11 +346,13 @@ obj/structure/windoor_assembly/Destroy() return if(src.facing == "l") - usr << "The windoor will now slide to the right." + to_chat(usr, "The windoor will now slide to the right.") + src.facing = "r" else src.facing = "l" - usr << "The windoor will now slide to the left." + to_chat(usr, "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 fbfc694432e..a0a3e91cdaa 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -210,21 +210,25 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(reinf && state >= 1) state = 3 - state playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.") + to_chat(user, (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.")) + else if(reinf && state == 0) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.") + to_chat(user, (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")) + else if(!reinf) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) - user << (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.") + to_chat(user, (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")) + else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) state = 1 - state playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) - user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.") + to_chat(user, (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")) + else if(istype(W, /obj/item/weapon/wrench) && !anchored && health > 7) //Disassemble deconstructed window into parts playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) for(var/i=0;iYou have disassembled the window." + to_chat(user, "You have disassembled the window.") + disassembled = 1 density = 0 air_update_turf(1) @@ -288,7 +293,8 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f return if(anchored) - usr << "It is fastened to the floor therefore you can't rotate it!" + to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") + return 0 dir = turn(dir, 90) @@ -307,7 +313,8 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f return if(anchored) - usr << "It is fastened to the floor therefore you can't rotate it!" + to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") + return 0 dir = turn(dir, 270) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 20ed7e6c1ed..9ded0a7102d 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -19,15 +19,18 @@ var/send_emergency_team return if(!ticker) - usr << "\red The game hasn't started yet!" + to_chat(usr, "\red The game hasn't started yet!") + return if(ticker.current_state == 1) - usr << "\red The round hasn't started yet!" + to_chat(usr, "\red The round hasn't started yet!") + return if(send_emergency_team) - usr << "\red Central Command has already dispatched an emergency response team!" + to_chat(usr, "\red Central Command has already dispatched an emergency response team!") + return if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes") @@ -39,7 +42,8 @@ var/send_emergency_team return if(send_emergency_team) - usr << "\red Central Command has already dispatched an emergency response team!" + to_chat(usr, "\red Central Command has already dispatched an emergency response team!") + return var/ert_type = pick_ert_type() @@ -76,28 +80,34 @@ var/send_emergency_team set desc = "Join the Emergency Response Team. Only possible if it has been called by the crew." if(!istype(usr,/mob/dead/observer) && !istype(usr,/mob/new_player)) - usr << "You need to be an observer or new player to use this." + to_chat(usr, "You need to be an observer or new player to use this.") + return if(!send_emergency_team) - usr << "No emergency response team is currently being sent." + to_chat(usr, "No emergency response team is currently being sent.") + return if(jobban_isbanned(usr, "Emergency Response Team")) - usr << "You are jobbanned from the emergency reponse team!" + to_chat(usr, "You are jobbanned from the emergency reponse team!") + return var/player_age_check = check_client_age(usr.client, responseteam_age) if(player_age_check && config.use_age_restriction_for_antags) - usr << "This role is not yet available to you. You need to wait another [player_age_check] days." + to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.") + return if(src.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - usr << "\blue Upon using the antagHUD you forfeited the ability to join the round." + to_chat(usr, "\blue Upon using the antagHUD you forfeited the ability to join the round.") + return if(response_team_members.len > 6) - usr << "The emergency response team is already full!" + to_chat(usr, "The emergency response team is already full!") + return for (var/obj/effect/landmark/L in landmarks_list) diff --git a/code/game/sound.dm b/code/game/sound.dm index df40c88dcb0..83422072932 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -93,12 +93,15 @@ var/const/FALLOFF_SOUNDS = 0.5 S.falloff = (falloff ? falloff : FALLOFF_SOUNDS) if(!is_global) S.environment = 2 - src << S + to_chat(src, S) + /client/proc/playtitlemusic() if(!ticker || !ticker.login_music || config.disable_lobby_music) return if(prefs.sound & SOUND_LOBBY) - src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS + to_chat(src, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS + + /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 7e4eef04c26..92f81302629 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -152,15 +152,19 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," if(broken || burnt) broken = 0 burnt = 0 - user << "You remove the broken plating." + to_chat(user, "You remove the broken plating.") + else if(istype(src, /turf/simulated/floor/wood)) - user << "You forcefully pry off the planks, destroying them in the process." + to_chat(user, "You forcefully pry off the planks, destroying them in the process.") + else if(!builtin_tile) - user << "You are unable to pry up \the [src] with a crowbar." + to_chat(user, "You are unable to pry up \the [src] with a crowbar.") + return 1 else - user << "You remove \the [builtin_tile.singular_name]." + to_chat(user, "You remove \the [builtin_tile.singular_name].") + builtin_tile.loc = src builtin_tile = null //deassociate tile, it no longer belongs to this turf make_plating() diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index c1a74d07973..ed15e8a23bf 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -14,7 +14,8 @@ if(istype(C, /obj/item/weapon/screwdriver)) if(broken || burnt) return - user << "You unscrew the planks." + to_chat(user, "You unscrew the planks.") + new floor_tile(src) make_plating() playsound(src, 'sound/items/Screwdriver.ogg', 80, 1) @@ -42,7 +43,8 @@ if(istype(C, /obj/item/weapon/shovel)) new /obj/item/weapon/ore/glass(src) new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass - user << "You shovel the grass." + to_chat(user, "You shovel the grass.") + make_plating() /turf/simulated/floor/carpet diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 8149dae593a..3ee2d78813d 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -68,16 +68,20 @@ qdel(C) state = LIGHTFLOOR_ON update_icon() - user << "You replace the light bulb." + to_chat(user, "You replace the light bulb.") + else - user << "The light bulb seems fine, no need to replace it." + to_chat(user, "The light bulb seems fine, no need to replace it.") + if(istype(C,/obj/item/device/multitool)) if(state != 0) if(state < LIGHTFLOOR_PURPLE) state++ else state = LIGHTFLOOR_ON - user << "You change \the [src]'s light bulb color." + to_chat(user, "You change \the [src]'s light bulb color.") + update_icon() else - user << "\The [src]'s light bulb appears to have burned out." \ No newline at end of file + to_chat(user, "\The [src]'s light bulb appears to have burned out.") + diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 608a5a2f16b..7890b8a180a 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -27,20 +27,24 @@ if(istype(C, /obj/item/stack/rods)) if(broken || burnt) - user << "Repair the plating first!" + to_chat(user, "Repair the plating first!") + return 1 var/obj/item/stack/rods/R = C if (R.get_amount() < 2) - user << "You need two rods to make a reinforced floor!" + to_chat(user, "You need two rods to make a reinforced floor!") + return 1 else - user << "You begin reinforcing the floor..." + to_chat(user, "You begin reinforcing the floor...") + if(do_after(user, 30, target = src)) if (R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/engine)) ChangeTurf(/turf/simulated/floor/engine) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) R.use(2) - user << "You reinforce the floor." + to_chat(user, "You reinforce the floor.") + return 1 else if(istype(C, /obj/item/stack/tile)) @@ -51,14 +55,16 @@ ChangeTurf(W.turf_type) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) else - user << "This section is too damaged to support a tile! Use a welder to fix the damage." + to_chat(user, "This section is too damaged to support a tile! Use a welder to fix the damage.") + return 1 else if(istype(C, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/welder = C if( welder.isOn() && (broken || burnt) ) if(welder.remove_fuel(0,user)) - user << "You fix some dents on the broken plating." + to_chat(user, "You fix some dents on the broken plating.") + playsound(src, 'sound/items/Welder.ogg', 80, 1) icon_state = icon_plating burnt = 0 @@ -104,7 +110,8 @@ if(!C || !user) return if(istype(C, /obj/item/weapon/wrench)) - user << "You begin removing rods..." + to_chat(user, "You begin removing rods...") + playsound(src, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30, target = src)) if(!istype(src, /turf/simulated/floor/engine)) @@ -224,7 +231,8 @@ return if(!broken && isscrewdriver(C)) - user << "You unscrew the catwalk's rods." + to_chat(user, "You unscrew the catwalk's rods.") + new /obj/item/stack/rods(src, 1) ReplaceWithLattice() for(var/direction in cardinal) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index c6534203db3..514da6e3f02 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -47,18 +47,23 @@ . = ..(user) if(!damage) - user << "It looks fully intact." + to_chat(user, "It looks fully intact.") + else var/dam = damage / damage_cap if(dam <= 0.3) - user << "It looks slightly damaged." + to_chat(user, "It looks slightly damaged.") + else if(dam <= 0.6) - user << "It looks moderately damaged." + to_chat(user, "It looks moderately damaged.") + else - user << "It looks heavily damaged." + to_chat(user, "It looks heavily damaged.") + if(rotting) - user << "There is fungus growing on [src]." + to_chat(user, "There is fungus growing on [src].") + /turf/simulated/wall/proc/update_icon() if(!damage_overlays[1]) //list hasn't been populated @@ -232,7 +237,8 @@ var/turf/simulated/floor/F = src F.burn_tile() F.icon_state = "wall_thermite" - user << "The thermite starts melting through the wall." + to_chat(user, "The thermite starts melting through the wall.") + spawn(100) if(O) qdel(O) @@ -247,13 +253,16 @@ if(M.environment_smash >= 2) if(M.environment_smash == 3) dismantle_wall(1) - M << "You smash through the wall." + to_chat(M, "You smash through the wall.") + else - M << text("You smash against the wall.") + to_chat(M, text("You smash against the wall.")) + take_damage(rand(25, 75)) return - M << "\blue You push the wall but nothing happens!" + to_chat(M, "\blue You push the wall but nothing happens!") + return /turf/simulated/wall/attack_hand(mob/user as mob) @@ -261,25 +270,30 @@ if (HULK in user.mutations) if (prob(hardness) || rotting) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) - user << text("You smash through the wall.") + to_chat(user, text("You smash through the wall.")) + user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) return else playsound(src, 'sound/effects/bang.ogg', 50, 1) - user << text("You punch the wall.") + to_chat(user, text("You punch the wall.")) + return if(rotting) if(hardness <= 10) - user << "This wall feels rather unstable." + to_chat(user, "This wall feels rather unstable.") + return else - user << "The wall crumbles under your touch." + to_chat(user, "The wall crumbles under your touch.") + dismantle_wall() return - user << "You push the wall but nothing happens!" + to_chat(user, "You push the wall but nothing happens!") + playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) ..() @@ -288,7 +302,8 @@ /turf/simulated/wall/attackby(obj/item/weapon/W as obj, mob/user as mob, params) user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return //get the user's location @@ -298,14 +313,16 @@ if(istype(W, /obj/item/weapon/weldingtool) ) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) - user << "You burn away the fungi with \the [WT]." + to_chat(user, "You burn away the fungi with \the [WT].") + playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") qdel(E) rotting = 0 return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) - user << "\The [src] crumbles away under the force of your [W.name]." + to_chat(user, "\The [src] crumbles away under the force of your [W.name].") + src.dismantle_wall(1) return @@ -325,7 +342,8 @@ var/obj/item/weapon/melee/energy/blade/EB = W EB.spark_system.start() - user << "You slash \the [src] with \the [EB]; the thermite ignites!" + to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") + playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -343,54 +361,66 @@ if(WT.remove_fuel(0,user)) if(response == "Repair") - user << "You start repairing the damage to [src]." + to_chat(user, "You start repairing the damage to [src].") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, max(5, damage / 5), target = src) && WT && WT.isOn()) - user << "You finish repairing the damage to [src]." + to_chat(user, "You finish repairing the damage to [src].") + take_damage(-damage) else if(response == "Dismantle") - user << "You begin slicing through the outer plating." + to_chat(user, "You begin slicing through the outer plating.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 100, target = src) && WT && WT.isOn()) - user << "You remove the outer plating." + to_chat(user, "You remove the outer plating.") + dismantle_wall() else - user << "You stop slicing through [src]." + to_chat(user, "You stop slicing through [src].") + return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) - user << "You begin slicing through the outer plating." + to_chat(user, "You begin slicing through the outer plating.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, mineral == "diamond" ? 120 : 60, target = src)) - user << "You remove the outer plating." + to_chat(user, "You remove the outer plating.") + dismantle_wall() visible_message("[user] slices apart \the [src]!","You hear metal being sliced apart.") //DRILLING else if (istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) - user << "You begin to drill though the wall." + to_chat(user, "You begin to drill though the wall.") + if(do_after(user, mineral == "diamond" ? 120 : 60, target = src)) - user << "Your drill tears though the last of the reinforced plating." + to_chat(user, "Your drill tears though the last of the reinforced plating.") + dismantle_wall() visible_message("[user] drills through \the [src]!","You hear the grinding of metal.") else if (istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) - user << "You begin to disintegrates the wall." + to_chat(user, "You begin to disintegrates the wall.") + if(do_after(user, mineral == "diamond" ? 60 : 30, target = src)) - user << "Your jackhammer disintegrate the reinforced plating." + to_chat(user, "Your jackhammer disintegrate the reinforced plating.") + dismantle_wall() visible_message("[user] disintegrates \the [src]!","You hear the grinding of metal.") @@ -398,7 +428,8 @@ var/obj/item/weapon/melee/energy/blade/EB = W EB.spark_system.start() - user << "You stab \the [EB] into the wall and begin to slice it apart." + to_chat(user, "You stab \the [EB] into the wall and begin to slice it apart.") + playsound(src, "sparks", 50, 1) if(do_after(user, mineral == "diamond" ? 140 : 70, target = src)) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 41c5df5656c..882b03f9136 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -16,7 +16,8 @@ /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob, params) user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return //get the user's location @@ -26,14 +27,16 @@ if(istype(W, /obj/item/weapon/weldingtool) ) var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) - user << "You burn away the fungi with \the [WT]." + to_chat(user, "You burn away the fungi with \the [WT].") + playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") qdel(E) rotting = 0 return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) - user << "\The [src] crumbles away under the force of your [W.name]." + to_chat(user, "\The [src] crumbles away under the force of your [W.name].") + src.dismantle_wall() return @@ -53,7 +56,8 @@ var/obj/item/weapon/melee/energy/blade/EB = W EB.spark_system.start() - user << "You slash \the [src] with \the [EB]; the thermite ignites!" + to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") + playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -61,20 +65,24 @@ return else if(istype(W, /obj/item/weapon/melee/energy/blade)) - user << "This wall is too thick to slice through. You will need to find a different path." + to_chat(user, "This wall is too thick to slice through. You will need to find a different path.") + return if(damage && istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) - user << "You start repairing the damage to [src]." + to_chat(user, "You start repairing the damage to [src].") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, max(5, damage / 5), target = src) && WT && WT.isOn()) - user << "You finish repairing the damage to [src]." + to_chat(user, "You finish repairing the damage to [src].") + take_damage(-damage) return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return @@ -86,18 +94,21 @@ d_state = 1 update_icon() new /obj/item/stack/rods(src) - user << "You cut the outer grille." + to_chat(user, "You cut the outer grille.") + return if(1) if (istype(W, /obj/item/weapon/screwdriver)) - user << "You begin removing the support lines." + to_chat(user, "You begin removing the support lines.") + playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 1) d_state = 2 update_icon() - user << "You remove the support lines." + to_chat(user, "You remove the support lines.") + return //REPAIRING (replacing the outer grille for cosmetic damage) @@ -107,92 +118,110 @@ d_state = 0 update_icon() src.icon_state = "r_wall" - user << "You replace the outer grille." + to_chat(user, "You replace the outer grille.") + else - user << "You don't have enough rods for that!" + to_chat(user, "You don't have enough rods for that!") + if(2) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) - user << "You begin slicing through the metal cover." + to_chat(user, "You begin slicing through the metal cover.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 60, target = src) && d_state == 2) d_state = 3 update_icon() - user << "You press firmly on the cover, dislodging it." + to_chat(user, "You press firmly on the cover, dislodging it.") + else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) - user << "You begin slicing through the metal cover." + to_chat(user, "You begin slicing through the metal cover.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 2) d_state = 3 update_icon() - user << "You press firmly on the cover, dislodging it." + to_chat(user, "You press firmly on the cover, dislodging it.") + return if(3) if(istype(W, /obj/item/weapon/crowbar)) - user << "You struggle to pry off the cover." + to_chat(user, "You struggle to pry off the cover.") + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 3) d_state = 4 update_icon() - user << "You pry off the cover." + to_chat(user, "You pry off the cover.") + return if(4) if(istype(W, /obj/item/weapon/wrench)) - user << "You start loosening the anchoring bolts which secure the support rods to their frame." + to_chat(user, "You start loosening the anchoring bolts which secure the support rods to their frame.") + playsound(src, 'sound/items/Ratchet.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 4) d_state = 5 update_icon() - user << "You remove the bolts anchoring the support rods." + to_chat(user, "You remove the bolts anchoring the support rods.") + return if(5) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) - user << "You begin slicing through the support rods." + to_chat(user, "You begin slicing through the support rods.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 5) d_state = 6 update_icon() new /obj/item/stack/rods(src) - user << "The support rods drop out as you cut them loose from the frame." + to_chat(user, "The support rods drop out as you cut them loose from the frame.") + else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) - user << "You begin slicing through the support rods." + to_chat(user, "You begin slicing through the support rods.") + playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 70, target = src) && d_state == 5) d_state = 6 update_icon() new /obj/item/stack/rods( src ) - user << "The support rods drop out as you cut them loose from the frame." + to_chat(user, "The support rods drop out as you cut them loose from the frame.") + return if(6) if(istype(W, /obj/item/weapon/crowbar)) - user << "You struggle to pry off the outer sheath." + to_chat(user, "You struggle to pry off the outer sheath.") + playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 6) - user << "You pry off the outer sheath." + to_chat(user, "You pry off the outer sheath.") + dismantle_wall() return @@ -200,34 +229,41 @@ //DRILLING if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) - user << "You begin to drill though the wall." + to_chat(user, "You begin to drill though the wall.") + if(do_after(user, 200, target = src)) - user << "Your drill tears through the last of the reinforced plating." + to_chat(user, "Your drill tears through the last of the reinforced plating.") + dismantle_wall() if(istype(W,/obj/item/weapon/pickaxe/drill/jackhammer)) - user << "You begin to disintegrate the wall." + to_chat(user, "You begin to disintegrate the wall.") + if(do_after(user, 100, target = src)) - user << "Your sonic jackhammer disintegrates the reinforced plating." + to_chat(user, "Your sonic jackhammer disintegrates the reinforced plating.") + dismantle_wall() //REPAIRING else if(istype(W, /obj/item/stack/sheet/metal) && d_state) var/obj/item/stack/sheet/metal/MS = W - user << "You begin patching-up the wall with \a [MS]." + to_chat(user, "You begin patching-up the wall with \a [MS].") + if(do_after(user, max(20 * d_state, 100), target = src) && d_state) if(!MS.use(1)) - user << "You don't have enough metal for that!" + to_chat(user, "You don't have enough metal for that!") + return d_state = 0 update_icon() smooth_icon_neighbors(src) - user << "You repair the last of the damage." + to_chat(user, "You repair the last of the damage.") + //APC diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index eb4b7671d71..f8da6e361f2 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -38,19 +38,23 @@ var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) if(L) if(R.use(1)) - user << "You begin constructing catwalk..." + to_chat(user, "You begin constructing catwalk...") + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) qdel(L) ChangeTurf(/turf/simulated/floor/plating/airless/catwalk) else - user << "You need two rods to build a catwalk!" + to_chat(user, "You need two rods to build a catwalk!") + return if(R.use(1)) - user << "Constructing support lattice..." + to_chat(user, "Constructing support lattice...") + playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() else - user << "You need one rod to build a lattice." + to_chat(user, "You need one rod to build a lattice.") + return if(istype(C, /obj/item/stack/tile/plasteel)) @@ -60,12 +64,15 @@ if(S.use(1)) qdel(L) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) - user << "You build a floor." + to_chat(user, "You build a floor.") + ChangeTurf(/turf/simulated/floor/plating) else - user << "You need one floor tile to build a floor!" + to_chat(user, "You need one floor tile to build a floor!") + else - user << "The plating is going to need some support! Place metal rods first." + to_chat(user, "The plating is going to need some support! Place metal rods first.") + /turf/space/Entered(atom/movable/A as mob|obj) ..() @@ -107,9 +114,12 @@ target_z = y_arr[cur_y] /* //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Target Z = [target_z]" - world << "Next X = [next_x]" + to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") + + to_chat(world, "Target Z = [target_z]") + + to_chat(world, "Next X = [next_x]") + //debug */ if(target_z) @@ -132,9 +142,12 @@ target_z = y_arr[cur_y] /* //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Target Z = [target_z]" - world << "Next X = [next_x]" + to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") + + to_chat(world, "Target Z = [target_z]") + + to_chat(world, "Next X = [next_x]") + //debug */ if(target_z) @@ -156,9 +169,12 @@ target_z = y_arr[next_y] /* //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Next Y = [next_y]" - world << "Target Z = [target_z]" + to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") + + to_chat(world, "Next Y = [next_y]") + + to_chat(world, "Target Z = [target_z]") + //debug */ if(target_z) @@ -181,9 +197,12 @@ target_z = y_arr[next_y] /* //debug - world << "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]" - world << "Next Y = [next_y]" - world << "Target Z = [target_z]" + to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") + + to_chat(world, "Next Y = [next_y]") + + to_chat(world, "Target Z = [target_z]") + //debug */ if(target_z) diff --git a/code/game/vehicles/spacepods/equipment.dm b/code/game/vehicles/spacepods/equipment.dm index 5053012df1a..f3678e57701 100644 --- a/code/game/vehicles/spacepods/equipment.dm +++ b/code/game/vehicles/spacepods/equipment.dm @@ -1,11 +1,13 @@ /obj/item/device/spacepod_equipment/weaponry/proc/fire_weapons() if(my_atom.next_firetime > world.time) - usr << "Your weapons are recharging." + to_chat(usr, "Your weapons are recharging.") + return var/turf/firstloc var/turf/secondloc if(!my_atom.equipment_system || !my_atom.equipment_system.weapon_system) - usr << "Missing equipment or weapons." + to_chat(usr, "Missing equipment or weapons.") + my_atom.verbs -= text2path("[type]/proc/fire_weapons") return my_atom.battery.use(shot_cost) diff --git a/code/game/vehicles/spacepods/parts.dm b/code/game/vehicles/spacepods/parts.dm index 28ec839b967..a70c203fd3c 100644 --- a/code/game/vehicles/spacepods/parts.dm +++ b/code/game/vehicles/spacepods/parts.dm @@ -59,11 +59,13 @@ var/obj/item/stack/rods/R = O var/list/linkedparts = find_square() if(!linkedparts) - user << "You cannot assemble a pod frame because you do not have the necessary assembly." + to_chat(user, "You cannot assemble a pod frame because you do not have the necessary assembly.") + return var/obj/structure/spacepod_frame/pod = new /obj/structure/spacepod_frame(src.loc) pod.dir = src.dir - user << "You strut the pod frame together." + to_chat(user, "You strut the pod frame together.") + R.use(10) 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 @@ -72,7 +74,8 @@ qdel(F) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(istype(O, /obj/item/weapon/wrench)) - user << "You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]" + to_chat(user, "You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]") + anchored = !anchored density = anchored playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) @@ -82,7 +85,8 @@ set category = "Object" set src in oview(1) if(anchored) - usr << "\The [src] is securely bolted!" + to_chat(usr, "\The [src] is securely bolted!") + return 0 src.dir = turn(src.dir, -90) return 1 diff --git a/code/game/vehicles/spacepods/pod_fabricator.dm b/code/game/vehicles/spacepods/pod_fabricator.dm index a3d9e4911a3..3452c95f851 100644 --- a/code/game/vehicles/spacepods/pod_fabricator.dm +++ b/code/game/vehicles/spacepods/pod_fabricator.dm @@ -499,7 +499,8 @@ default_deconstruction_crowbar(W) return 1 else - user << "You can't load \the [name] while it's opened." + to_chat(user, "You can't load \the [name] while it's opened.") + return 1 if(istype(W, /obj/item/stack)) @@ -525,10 +526,12 @@ return ..() if(being_built) - user << "\The [src] is currently processing. Please wait until completion." + to_chat(user, "\The [src] is currently processing. Please wait until completion.") + return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator - user << "\The [src] [material2name(material)] storage is full." + to_chat(user, "\The [src] [material2name(material)] storage is full.") + return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -538,12 +541,14 @@ var/transfer_amount = min(stack.amount, round((res_max_amount - resources[material])/MINERAL_MATERIAL_AMOUNT,1)) resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) - user << "You insert [transfer_amount] [sname] sheet\s into \the [src]." + to_chat(user, "You insert [transfer_amount] [sname] sheet\s into \the [src].") + sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else - user << "\The [src] cannot hold any more [sname] sheet\s." + to_chat(user, "\The [src] cannot hold any more [sname] sheet\s.") + return /obj/machinery/spod_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index 4463c7b61a3..63ed986856c 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -146,7 +146,8 @@ user.changeNext_move(CLICK_CD_MELEE) deal_damage(15) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) - user << "\red You slash at \the [src]!" + to_chat(user, "\red You slash at \the [src]!") + visible_message("\red The [user] slashes at [src.name]'s armor!") return @@ -160,25 +161,35 @@ S.wait = 0 //No queue S.channel = 0 //Any channel S.volume = 50 - occupant << S + to_chat(occupant, S) + if(occupant2) - occupant2 << S + to_chat(occupant2, S) + if(occupant && oldhealth > health && !health) var/sound/S = sound('sound/effects/engine_alert1.ogg') S.wait = 0 S.channel = 0 S.volume = 50 - occupant << S + to_chat(occupant, S) + if(occupant2) - occupant2 << S + to_chat(occupant2, S) + if(!health) spawn(0) - if(occupant) occupant << "Critical damage to the vessel detected, core explosion imminent!" - if(occupant2) occupant2 << "Critical damage to the vessel detected, core explosion imminent!" + if(occupant) + to_chat(occupant, "Critical damage to the vessel detected, core explosion imminent!") + if(occupant2) + to_chat(occupant2, "Critical damage to the vessel detected, core explosion imminent!") + for(var/i = 10, i >= 0; --i) - if(occupant) occupant << "[i]" - if(occupant2) occupant2 << "[i]" + if(occupant) + to_chat(occupant, "[i]") + if(occupant2) + to_chat(occupant2, "[i]") + if(i == 0) explosion(loc, 2, 4, 8) qdel(src) @@ -201,11 +212,13 @@ if(H) H.forceMove(get_turf(src)) H.ex_act(severity + 1) - H << "You are forcefully thrown from \the [src]!" + to_chat(H, "You are forcefully thrown from \the [src]!") + if(H2) H2.forceMove(get_turf(src)) H2.ex_act(severity + 1) - H2 << "You are forcefully thrown from \the [src]!" + to_chat(H2, "You are forcefully thrown from \the [src]!") + qdel(ion_trail) qdel(src) if(2) @@ -218,8 +231,12 @@ occupant_sanity_check() switch(severity) if(1) - if(src.occupant) src.occupant << "The pod console flashes 'Heavy EMP WAVE DETECTED'." //warn the occupants - if(src.occupant2) src.occupant2 << "The pod console flashes 'Heavy EMP WAVE DETECTED'." //warn the occupants + if(occupant) + to_chat(occupant, "The pod console flashes 'Heavy EMP WAVE DETECTED'.")//warn the occupants + if(occupant2) + to_chat(occupant2, "The pod console flashes 'Heavy EMP WAVE DETECTED'.")//warn the occupants + + if(battery) battery.charge = max(0, battery.charge - 5000) //Cell EMP act is too weak, this pod needs to be sapped. @@ -229,27 +246,33 @@ processing_objects.Add(src) if(2) - if(src.occupant) src.occupant << "The pod console flashes 'EMP WAVE DETECTED'." //warn the occupants - if(src.occupant2) src.occupant2 << "The pod console flashes 'EMP WAVE DETECTED'." //warn the occupants + if(occupant) + to_chat(occupant, "The pod console flashes 'EMP WAVE DETECTED'.")//warn the occupants + if(occupant2) + to_chat(occupant2, "The pod console flashes 'EMP WAVE DETECTED'.")//warn the occupants - src.deal_damage(40) + + deal_damage(40) if(battery) battery.charge = max(0, battery.charge - 2500) //Cell EMP act is too weak, this pod needs to be sapped. - if(src.empcounter < 20) - src.empcounter = 20 //Disable movement for 20 ticks. + if(empcounter < 20) + empcounter = 20 //Disable movement for 20 ticks. processing_objects.Add(src) /obj/spacepod/attackby(obj/item/W as obj, mob/user as mob, params) if(iscrowbar(W)) hatch_open = !hatch_open playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "You [hatch_open ? "open" : "close"] the maintenance hatch." + to_chat(user, "You [hatch_open ? "open" : "close"] the maintenance hatch.") + if(istype(W, /obj/item/weapon/stock_parts/cell)) if(!hatch_open) - user << "\red The maintenance hatch is closed!" + to_chat(user, "\red The maintenance hatch is closed!") + return if(battery) - user << "The pod already has a battery." + to_chat(user, "The pod already has a battery.") + return user.drop_item(W) battery = W @@ -257,17 +280,21 @@ return if(istype(W, /obj/item/device/spacepod_equipment)) if(!hatch_open) - user << "\red The maintenance hatch is closed!" + to_chat(user, "\red The maintenance hatch is closed!") + return if(!equipment_system) - user << "The pod has no equipment datum, yell at pomf" + to_chat(user, "The pod has no equipment datum, yell at pomf") + return if(istype(W, /obj/item/device/spacepod_equipment/weaponry)) if(equipment_system.weapon_system) - user << "The pod already has a weapon system, remove it first." + to_chat(user, "The pod already has a weapon system, remove it first.") + return else - user << "You insert \the [W] into the equipment system." + to_chat(user, "You insert \the [W] into the equipment system.") + user.drop_item(W) W.forceMove(src) equipment_system.weapon_system = W @@ -276,10 +303,12 @@ if(istype(W, /obj/item/device/spacepod_equipment/misc)) if(equipment_system.misc_system) - user << "The pod already has a miscellaneous system, remove it first." + to_chat(user, "The pod already has a miscellaneous system, remove it first.") + return else - user << "You insert \the [W] into the equipment system." + to_chat(user, "You insert \the [W] into the equipment system.") + user.drop_item(W) W.forceMove(src) equipment_system.misc_system = W @@ -287,10 +316,12 @@ return if(istype(W, /obj/item/device/spacepod_equipment/cargo)) if(equipment_system.cargo_system) - user << "The pod already has a cargo system, remove it first." + to_chat(user, "The pod already has a cargo system, remove it first.") + return else - user << "You insert \the [W] into the cargo system." + to_chat(user, "You insert \the [W] into the cargo system.") + user.drop_item(W) W.forceMove(src) equipment_system.cargo_system = W @@ -299,28 +330,34 @@ if(istype(W, /obj/item/weapon/weldingtool)) if(!hatch_open) - user << "\red You must open the maintenance hatch before attempting repairs." + to_chat(user, "\red You must open the maintenance hatch before attempting repairs.") + return var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) - user << "\red The welder must be on for this task." + to_chat(user, "\red The welder must be on for this task.") + return if (health < initial(health)) - user << "\blue You start welding the spacepod..." + to_chat(user, "\blue You start welding the spacepod...") + playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(3, user)) return repair_damage(10) - user << "\blue You mend some [pick("dents","bumps","damage")] with \the [WT]" + to_chat(user, "\blue You mend some [pick("dents","bumps","damage")] with \the [WT]") + else - user << "\blue \The [src] is fully repaired!" + to_chat(user, "\blue \The [src] is fully repaired!") + /obj/spacepod/attack_hand(mob/user as mob) if(!hatch_open) return ..() if(!equipment_system || !istype(equipment_system)) - user << "The pod has no equpment datum, or is the wrong type, yell at pomf." + to_chat(user, "The pod has no equpment datum, or is the wrong type, yell at pomf.") + return var/list/possible = list() if(battery) @@ -341,50 +378,61 @@ switch(input(user, "Remove which equipment?", null, null) as null|anything in possible) if("Energy Cell") if(user.put_in_any_hand_if_possible(battery)) - user << "You remove \the [battery] from the space pod" + to_chat(user, "You remove \the [battery] from the space pod") + battery = null if("Weapon System") SPE = equipment_system.weapon_system if(user.put_in_any_hand_if_possible(SPE)) - user << "You remove \the [SPE] from the equipment system." + to_chat(user, "You remove \the [SPE] from the equipment system.") + SPE.removed(user) SPE.my_atom = null equipment_system.weapon_system = null else - user << "You need an open hand to do that." + to_chat(user, "You need an open hand to do that.") + if("Misc. System") SPE = equipment_system.misc_system if(user.put_in_any_hand_if_possible(SPE)) - user << "You remove \the [SPE] from the equipment system." + to_chat(user, "You remove \the [SPE] from the equipment system.") + SPE.removed(user) SPE.my_atom = null equipment_system.misc_system = null else - user << "You need an open hand to do that." + to_chat(user, "You need an open hand to do that.") + if("Cargo System") SPE = equipment_system.cargo_system if(user.put_in_any_hand_if_possible(SPE)) - user << "You remove \the [SPE] from the equipment system." + to_chat(user, "You remove \the [SPE] from the equipment system.") + SPE.removed(user) SPE.my_atom = null equipment_system.cargo_system = null else - user << "You need an open hand to do that." + to_chat(user, "You need an open hand to do that.") + /* if("engine system") SPE = equipment_system.engine_system if(user.put_in_any_hand_if_possible(SPE)) - user << "You remove \the [SPE] from the equipment system." + to_chat(user, "You remove \the [SPE] from the equipment system.") + equipment_system.engine_system = null else - user << "You need an open hand to do that." + to_chat(user, "You need an open hand to do that.") + if("shield system") SPE = equipment_system.shield_system if(user.put_in_any_hand_if_possible(SPE)) - user << "You remove \the [SPE] from the equipment system." + to_chat(user, "You remove \the [SPE] from the equipment system.") + equipment_system.shield_system = null else - user << "You need an open hand to do that." + to_chat(user, "You need an open hand to do that.") + */ return @@ -442,7 +490,8 @@ if(usr!=src.occupant) return use_internal_tank = !use_internal_tank - src.occupant << "Now taking air from [use_internal_tank?"internal airtank":"environment"]." + to_chat(occupant, "Now taking air from [use_internal_tank?"internal airtank":"environment"].") + return /obj/spacepod/proc/add_cabin() @@ -517,7 +566,8 @@ if(M != user && M.stat == DEAD && allow2enter) if(occupant2 && !occupant) - usr << "You can't put a corpse into the driver's seat!" + to_chat(usr, "You can't put a corpse into the driver's seat!") + return 0 if(!occupant2) visible_message("[user.name] starts loading [M.name] into the pod!") @@ -532,15 +582,19 @@ if(equipment_system.cargo_system && istype(equipment_system.cargo_system,/obj/item/device/spacepod_equipment/cargo/ore)) var/obj/item/device/spacepod_equipment/cargo/ore/C = equipment_system.cargo_system if(!C.box) - user << "You begin loading \the [O] into \the [src]'s [equipment_system.cargo_system]" + to_chat(user, "You begin loading \the [O] into \the [src]'s [equipment_system.cargo_system]") + if(do_after(user, 40, target = src)) C.box = O O.forceMove(C) - user << "You load \the [O] into \the [src]'s [equipment_system.cargo_system]!" + to_chat(user, "You load \the [O] into \the [src]'s [equipment_system.cargo_system]!") + else - user << "You fail to load \the [O] into \the [src]'s [equipment_system.cargo_system]" + to_chat(user, "You fail to load \the [O] into \the [src]'s [equipment_system.cargo_system]") + else - user << "\The [src] already has \an [C.box]" + to_chat(user, "\The [src] already has \an [C.box]") + /obj/spacepod/verb/enter_pod(mob/user = usr) set category = "Object" @@ -551,7 +605,8 @@ return if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) - usr << "They are too far away to put inside" + to_chat(usr, "They are too far away to put inside") + return if(!istype(user)) @@ -565,12 +620,14 @@ return 0 if(fukkendisk) - user << "The nuke-disk is locking the door every time you try to open it. You get the feeling that it doesn't want to go into the spacepod." + to_chat(user, "The nuke-disk is locking the door every time you try to open it. You get the feeling that it doesn't want to go into the spacepod.") + return 0 for(var/mob/living/carbon/slime/S in range(1,usr)) if(S.Victim == user) - user << "You're too busy getting your life sucked out of you." + to_chat(user, "You're too busy getting your life sucked out of you.") + return 0 move_inside(user) @@ -591,9 +648,11 @@ add_fingerprint(user) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) else - user << "[occupant] was faster. Try better next time, loser." + to_chat(user, "[occupant] was faster. Try better next time, loser.") + else - user << "You stop entering \the [src]." + to_chat(user, "You stop entering \the [src].") + else if(!occupant2) visible_message("[user] starts to climb into \the [src].") @@ -605,11 +664,14 @@ add_fingerprint(user) playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) else - user << "[occupant] was faster. Try better next time, loser." + to_chat(user, "[occupant] was faster. Try better next time, loser.") + else - user << "You stop entering \the [src]." + to_chat(user, "You stop entering \the [src].") + else - user << "You can't fit in \the [src], it's full!" + to_chat(user, "You can't fit in \the [src], it's full!") + /obj/spacepod/proc/occupant_sanity_check() if(occupant) @@ -651,15 +713,21 @@ switch(spos) if(0) return if(1) - if(occupant2) occupant2 << "[occupant.name] climbs out of the pod!" + if(occupant2) + to_chat(occupant2, "[occupant.name] climbs out of the pod!") + occupant.forceMove(src.loc) occupant = null - user << "You climb out of \the [src]." + to_chat(user, "You climb out of \the [src].") + if(2) - if(occupant) occupant << "[occupant2.name] climbs out of the pod!" + if(occupant) + to_chat(occupant, "[occupant2.name] climbs out of the pod!") + occupant2.forceMove(src.loc) occupant2 = null - user << "You climb out of \the [src]." + to_chat(user, "You climb out of \the [src].") + /obj/spacepod/verb/exit_pod2() set name = "Eject Secondary Seat" @@ -669,16 +737,20 @@ occupant_sanity_check() if(!occupant2) - usr << "There is no one in the second seat." + to_chat(usr, "There is no one in the second seat.") + return if(usr == occupant2) - usr << "How do you plan to do that? The eject button is out of reach." + to_chat(usr, "How do you plan to do that? The eject button is out of reach.") + return if(usr == occupant) - usr << "You eject [occupant2.name]." - occupant2 << "\The [src] ejects you forcefully!" + to_chat(usr, "You eject [occupant2.name].") + + to_chat(occupant2, "\The [src] ejects you forcefully!") + inertia_dir = 0 occupant2.forceMove(src.loc) occupant2 = null @@ -690,11 +762,13 @@ if(CheckIfOccupant2(usr)) if(!allow2enter) - usr << "You can't [allow2enter ? "lock" : "unlock"] the doors from your seat." + to_chat(usr, "You can't [allow2enter ? "lock" : "unlock"] the doors from your seat.") + return allow2enter = !allow2enter - usr << "You [allow2enter ? "unlock" : "lock"] the doors." + to_chat(usr, "You [allow2enter ? "unlock" : "lock"] the doors.") + /obj/spacepod/verb/toggleDoors() @@ -717,10 +791,12 @@ else P.close() return 1 - usr << "Access denied." + to_chat(usr, "Access denied.") + return - usr << "You are not close to any pod doors." + to_chat(usr, "You are not close to any pod doors.") + return @@ -731,7 +807,8 @@ set category = "Spacepod" set src = usr.loc if(!equipment_system.weapon_system) - usr << "\The [src] has no weapons!" + to_chat(usr, "\The [src] has no weapons!") + return equipment_system.weapon_system.fire_weapons() @@ -742,7 +819,8 @@ set category = "Spacepod" set src = usr.loc if(!equipment_system.cargo_system) - usr << "\The [src] has no cargo system!" + to_chat(usr, "\The [src] has no cargo system!") + return equipment_system.cargo_system.unload() @@ -759,7 +837,8 @@ set_light(lights_power) else set_light(0) - occupant << "Toggled lights [lights ? "on" : "off"]." + to_chat(occupant, "Toggled lights [lights ? "on" : "off"].") + return /obj/spacepod/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5) @@ -852,15 +931,20 @@ else if(!battery) - user << "No energy cell detected." + to_chat(user, "No energy cell detected.") + else if(battery.charge < 1) - user << "Not enough charge left." + to_chat(user, "Not enough charge left.") + else if(!health) - user << "She's dead, Jim" + to_chat(user, "She's dead, Jim") + else if(empcounter != 0) - user << "The pod control interface isn't responding. The console indicates [empcounter] seconds before reboot." + to_chat(user, "The pod control interface isn't responding. The console indicates [empcounter] seconds before reboot.") + else - user << "Unknown error has occurred, yell at the coders." + to_chat(user, "Unknown error has occurred, yell at the coders.") + return 0 battery.charge = max(0, battery.charge - 1) next_move = world.time + move_delay diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index d4f90164e2c..69fc81e195b 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -5,43 +5,49 @@ var/global/moderator_ooc_colour = "#184880" var/global/admin_ooc_colour = "#b82e00" /client/verb/ooc(msg as text) - set name = "OOC" + set name = "OOC" set category = "OOC" - if(!mob) + if(!mob) return if(IsGuestKey(key)) - src << "Guests may not use OOC." + to_chat(src, "Guests may not use OOC.") + return msg = trim(sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))) - if(!msg) + if(!msg) return if(!(prefs.toggles & CHAT_OOC)) - src << "You have OOC muted." + to_chat(src, "You have OOC muted.") + return if(!check_rights(R_ADMIN|R_MOD,0)) if(!config.ooc_allowed) - src << "OOC is globally muted." + to_chat(src, "OOC is globally muted.") + return if(!config.dooc_allowed && (mob.stat == DEAD)) - usr << "OOC for dead mobs has been turned off." + to_chat(usr, "OOC for dead mobs has been turned off.") + return if(prefs.muted & MUTE_OOC) - src << "You cannot use OOC (muted)." + to_chat(src, "You cannot use OOC (muted).") + return if(handle_spam_prevention(msg, MUTE_OOC)) return if(findtext(msg, "byond://")) - src << "Advertising other servers is not allowed." + to_chat(src, "Advertising other servers is not allowed.") + log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return log_ooc("[mob.name]/[key] : [msg]") - + var/display_colour = normal_ooc_colour if(holder && !holder.fakekey) display_colour = mentor_ooc_colour @@ -52,12 +58,12 @@ var/global/admin_ooc_colour = "#b82e00" display_colour = src.prefs.ooccolor else display_colour = admin_ooc_colour - + if(prefs.unlock_content) if(display_colour == normal_ooc_colour) if((prefs.toggles & MEMBER_PUBLIC)) display_colour = member_ooc_colour - + for(var/client/C in clients) if(C.prefs.toggles & CHAT_OOC) var/display_name = src.key @@ -70,15 +76,18 @@ var/global/admin_ooc_colour = "#b82e00" display_name = "[holder.fakekey]/([src.key])" else display_name = holder.fakekey - C << "OOC: [display_name]: [msg]" + to_chat(C, "OOC: [display_name]: [msg]") + /proc/toggle_ooc() config.ooc_allowed = ( !config.ooc_allowed ) if (config.ooc_allowed) - world << "The OOC channel has been globally enabled!" + to_chat(world, "The OOC channel has been globally enabled!") + else - world << "The OOC channel has been globally disabled!" - + to_chat(world, "The OOC channel has been globally disabled!") + + /proc/auto_toggle_ooc(var/on) if(config.auto_toggle_ooc_during_round && config.ooc_allowed != on) toggle_ooc() @@ -87,29 +96,29 @@ var/global/admin_ooc_colour = "#b82e00" set name = "Set Player OOC Colour" set desc = "Modifies the default player OOC color." set category = "Server" - + if(!check_rights(R_SERVER)) return - + normal_ooc_colour = newColor message_admins("[key_name_admin(usr)] has set the default player OOC color to [newColor]") log_admin("[key_name(usr)] has set the default player OOC color to [newColor]") feedback_add_details("admin_verb","SOOC") - + /client/proc/reset_ooc() set name = "Reset Player OOC Color" set desc = "Returns the default player OOC color to default." set category = "Server" - + if(!check_rights(R_SERVER)) return - + normal_ooc_colour = initial(normal_ooc_colour) message_admins("[key_name_admin(usr)] has reset the default player OOC color") log_admin("[key_name(usr)] has reset the default player OOC color") - + feedback_add_details("admin_verb","ROOC") - + /client/proc/colorooc() set name = "Set Your OOC Color" set desc = "Allows you to pick a custom OOC color." @@ -121,8 +130,9 @@ var/global/admin_ooc_colour = "#b82e00" if(new_ooccolor) prefs.ooccolor = new_ooccolor prefs.save_preferences(src) - usr << "Your OOC color has been set to [new_ooccolor]." - + to_chat(usr, "Your OOC color has been set to [new_ooccolor].") + + feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/resetcolorooc() @@ -134,50 +144,57 @@ var/global/admin_ooc_colour = "#b82e00" prefs.ooccolor = initial(prefs.ooccolor) prefs.save_preferences(src) - usr << "Your OOC color has been reset." - + to_chat(usr, "Your OOC color has been reset.") + + feedback_add_details("admin_verb","ROC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/looc(msg as text) - set name = "LOOC" + set name = "LOOC" set desc = "Local OOC, seen only by those in view." set category = "OOC" - if(!mob) + if(!mob) return if(IsGuestKey(key)) - src << "Guests may not use OOC." + to_chat(src, "Guests may not use OOC.") + return msg = trim(sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))) - if(!msg) + if(!msg) return if(!(prefs.toggles & CHAT_LOOC)) - src << "You have LOOC muted." + to_chat(src, "You have LOOC muted.") + return if(!check_rights(R_ADMIN|R_MOD,0)) if(!config.looc_allowed) - src << "LOOC is globally muted." + to_chat(src, "LOOC is globally muted.") + return if(!config.dooc_allowed && (mob.stat == DEAD)) - usr << "LOOC for dead mobs has been turned off." + to_chat(usr, "LOOC for dead mobs has been turned off.") + return if(prefs.muted & MUTE_OOC) - src << "You cannot use LOOC (muted)." + to_chat(src, "You cannot use LOOC (muted).") + return if(handle_spam_prevention(msg,MUTE_OOC)) return if(findtext(msg, "byond://")) - src << "Advertising other servers is not allowed." + to_chat(src, "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 log_ooc("(LOCAL) [mob.name]/[key] : [msg]") - - var/mob/source = mob.get_looc_source() + + var/mob/source = mob.get_looc_source() var/list/heard = get_mobs_in_view(7, source) var/display_name = key @@ -186,7 +203,7 @@ var/global/admin_ooc_colour = "#b82e00" if(mob.stat != DEAD) display_name = mob.name - for(var/client/target in clients) + for(var/client/target in clients) if(target.prefs.toggles & CHAT_LOOC) var/prefix = "" var/admin_stuff = "" @@ -215,8 +232,9 @@ var/global/admin_ooc_colour = "#b82e00" prefix = "(R)" if(send) - target << "LOOC[prefix]: [display_name][admin_stuff]: [msg]" - + to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]") + + /mob/proc/get_looc_source() return src @@ -224,4 +242,3 @@ var/global/admin_ooc_colour = "#b82e00" if(eyeobj) return eyeobj return src - \ No newline at end of file diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index dab208d415f..78da8e2169f 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -53,20 +53,24 @@ set hidden = 1 if (stat == DEAD) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (!ticker) - src << "You can't commit suicide before the game starts!" + to_chat(src, "You can't commit suicide before the game starts!") + return // No more borergrief, one way or the other if(has_brain_worms()) - src << "You try to bring yourself to commit suicide, but - something prevents you!" + to_chat(src, "You try to bring yourself to commit suicide, but - something prevents you!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -80,7 +84,8 @@ do_suicide(damagetype, held_item) return - viewers(src) << "[src] [pick(species.suicide_messages)] It looks like they're trying to commit suicide." + to_chat(viewers(src), "[src] [pick(species.suicide_messages)] It looks like they're trying to commit suicide.") + do_suicide(0) updatehealth() @@ -89,22 +94,26 @@ set hidden = 1 if (stat == 2) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (!ticker) - src << "You can't commit suicide before the game starts!" + to_chat(src, "You can't commit suicide before the game starts!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") suiciding = 1 - viewers(loc) << "\red [src]'s brain is growing dull and lifeless. It looks like it's lost the will to live." + to_chat(viewers(loc), "\red [src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") + spawn(50) death(0) suiciding = 0 @@ -114,18 +123,21 @@ set hidden = 1 if (stat == 2) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + to_chat(viewers(src), "\red [src] is powering down. It looks like \he's trying to commit suicide.") + //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -134,18 +146,21 @@ set hidden = 1 if (stat == 2) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is powering down. It looks like \he's trying to commit suicide." + to_chat(viewers(src), "\red [src] is powering down. It looks like \he's trying to commit suicide.") + //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -165,24 +180,28 @@ M.show_message("\blue [src] flashes a message across its screen, \"Wiping core files. Please acquire a new personality to continue using pAI device functions.\"", 3, "\blue [src] bleeps electronically.", 2) death(0) else - src << "Aborting suicide attempt." + to_chat(src, "Aborting suicide attempt.") + /mob/living/carbon/alien/humanoid/verb/suicide() set hidden = 1 if (stat == 2) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") if(confirm == "Yes") suiciding = 1 - viewers(src) << "\red [src] is thrashing wildly! It looks like \he's trying to commit suicide." + to_chat(viewers(src), "\red [src] is thrashing wildly! It looks like \he's trying to commit suicide.") + //put em at -175 adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -191,11 +210,13 @@ /mob/living/carbon/slime/verb/suicide() set hidden = 1 if (stat == 2) - src << "You're already dead!" + to_chat(src, "You're already dead!") + return if (suiciding) - src << "You're already committing suicide! Be patient!" + to_chat(src, "You're already committing suicide! Be patient!") + return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 87e8231e272..5e4a871b4bb 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -63,7 +63,8 @@ msg += "[line]\n" msg += "Total Players: [length(Lines)]" - src << msg + to_chat(src, msg) + /client/verb/adminwho() set category = "Admin" @@ -127,4 +128,5 @@ num_mods_online++ msg = "Current Admins ([num_admins_online]):\n" + msg + "\nCurrent Mods/Mentors ([num_mods_online]):\n" + modmsg - src << msg + to_chat(src, msg) + diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index 72cee4a7b4c..b638a6f8a9c 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -93,7 +93,8 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = if(blockselfban) if(a_ckey == ckey) - usr << "You cannot apply this ban type on yourself." + to_chat(usr, "You cannot apply this ban type on yourself.") + return var/who @@ -118,13 +119,15 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = if(adm_query.NextRow()) var/adm_bans = text2num(adm_query.item[1]) if(adm_bans >= MAX_ADMIN_BANS_PER_ADMIN) - usr << "You already logged [MAX_ADMIN_BANS_PER_ADMIN] admin ban(s) or more. Do not abuse this function!" + to_chat(usr, "You already logged [MAX_ADMIN_BANS_PER_ADMIN] admin ban(s) or more. Do not abuse this function!") + return var/sql = "INSERT INTO [format_table_name("ban")] (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)" var/DBQuery/query_insert = dbcon.NewQuery(sql) query_insert.Execute() - usr << "\blue Ban saved to database." + to_chat(usr, "\blue Ban saved to database.") + message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1) if(announceinirc) @@ -192,17 +195,20 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") ban_number++; if(ban_number == 0) - usr << "\red Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin." + to_chat(usr, "\red Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin.") + return if(ban_number > 1) - usr << "\red Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin." + to_chat(usr, "\red Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin.") + return if(istext(ban_id)) ban_id = text2num(ban_id) if(!isnum(ban_id)) - usr << "\red Database update failed due to a ban ID mismatch. Contact the database admin." + to_chat(usr, "\red Database update failed due to a ban ID mismatch. Contact the database admin.") + return DB_ban_unban_by_id(ban_id) @@ -212,7 +218,8 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) if(!check_rights(R_BAN)) return if(!isnum(banid) || !istext(param)) - usr << "Cancelled" + to_chat(usr, "Cancelled") + return var/DBQuery/query = dbcon.NewQuery("SELECT ckey, duration, reason FROM [format_table_name("ban")] WHERE id = [banid]") @@ -228,7 +235,8 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) duration = query.item[2] reason = query.item[3] else - usr << "Invalid ban id. Contact the database admin" + to_chat(usr, "Invalid ban id. Contact the database admin") + return reason = sql_sanitize_text(reason) @@ -240,7 +248,8 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) value = input("Insert the new reason for [pckey]'s ban", "New Reason", "[reason]", null) as null|text value = sql_sanitize_text(value) if(!value) - usr << "Cancelled" + to_chat(usr, "Cancelled") + return var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET reason = '[value]', edits = CONCAT(edits,'- [eckey] changed ban reason from \\\"[reason]\\\" to \\\"[value]\\\"
') WHERE id = [banid]") @@ -250,7 +259,8 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) if(!value) value = input("Insert the new duration (in minutes) for [pckey]'s ban", "New Duration", "[duration]", null) as null|num if(!isnum(value) || !value) - usr << "Cancelled" + to_chat(usr, "Cancelled") + return var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]
'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]") @@ -261,10 +271,12 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) DB_ban_unban_by_id(banid) return else - usr << "Cancelled" + to_chat(usr, "Cancelled") + return else - usr << "Cancelled" + to_chat(usr, "Cancelled") + return datum/admins/proc/DB_ban_unban_by_id(var/id) @@ -287,11 +299,13 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) ban_number++; if(ban_number == 0) - usr << "\red Database update failed due to a ban id not being present in the database." + to_chat(usr, "\red Database update failed due to a ban id not being present in the database.") + return if(ban_number > 1) - usr << "\red Database update failed due to multiple bans having the same ID. Contact the database admin." + to_chat(usr, "\red Database update failed due to multiple bans having the same ID. Contact the database admin.") + return if(!src.owner || !istype(src.owner, /client)) @@ -328,7 +342,8 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + to_chat(usr, "\red Failed to establish database connection") + return var/output = "
" diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index b871ada026d..9421c1e8102 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -106,19 +106,27 @@ var/savefile/Banlist Banlist.cd = "/base" if ( Banlist.dir.Find("[ckey][computerid]") ) - usr << text("\red Ban already exists.") + to_chat(usr, text("\red Ban already exists.")) + return 0 else Banlist.dir.Add("[ckey][computerid]") Banlist.cd = "/base/[ckey][computerid]" - Banlist["key"] << ckey - Banlist["id"] << computerid - Banlist["ip"] << address - Banlist["reason"] << reason - Banlist["bannedby"] << bannedby - Banlist["temp"] << temp + to_chat(Banlist["key"], ckey) + + to_chat(Banlist["id"], computerid) + + to_chat(Banlist["ip"], address) + + to_chat(Banlist["reason"], reason) + + to_chat(Banlist["bannedby"], bannedby) + + to_chat(Banlist["temp"], temp) + if (temp) - Banlist["minutes"] << bantimestamp + to_chat(Banlist["minutes"], bantimestamp) + if(!temp) add_note(ckey, "Permanently banned - [reason]", null, bannedby, 0) else @@ -211,17 +219,24 @@ var/savefile/Banlist Banlist.cd = "/base" Banlist.dir.Add("trash[i]trashid[i]") Banlist.cd = "/base/trash[i]trashid[i]" - Banlist["key"] << "trash[i]" + to_chat(Banlist["key"], "trash[i]") + else Banlist.cd = "/base" Banlist.dir.Add("[last]trashid[i]") Banlist.cd = "/base/[last]trashid[i]" - Banlist["key"] << last - Banlist["id"] << "trashid[i]" - Banlist["reason"] << "Trashban[i]." - Banlist["temp"] << a - Banlist["minutes"] << CMinutes + rand(1,2000) - Banlist["bannedby"] << "trashmin" + to_chat(Banlist["key"], last) + + to_chat(Banlist["id"], "trashid[i]") + + to_chat(Banlist["reason"], "Trashban[i].") + + to_chat(Banlist["temp"], a) + + to_chat(Banlist["minutes"], CMinutes + rand(1,2000)) + + to_chat(Banlist["bannedby"], "trashmin") + last = "trash[i]" Banlist.cd = "/base" diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm index ea70d023758..9f0cb711547 100644 --- a/code/modules/admin/ToRban.dm +++ b/code/modules/admin/ToRban.dm @@ -35,9 +35,12 @@ var/cleaned = copytext(line,13,length(line)-19) if(!cleaned) continue F[cleaned] << 1 - F["last_update"] << world.realtime + to_chat(F["last_update"], world.realtime) + diary << "ToR data updated!" - if(usr) usr << "ToRban updated." + if(usr) + to_chat(usr, "ToRban updated.") + return 1 diary << "ToR data update aborted: no data." return 0 @@ -72,16 +75,20 @@ var/choice = input(src,"Please select an IP address to remove from the ToR banlist:","Remove ToR ban",null) as null|anything in F.dir if(choice) F.dir.Remove(choice) - src << "Address removed" + to_chat(src, "Address removed") + if("remove all") - src << "[TORFILE] was [fdel(TORFILE)?"":"not "]removed." + to_chat(src, "[TORFILE] was [fdel(TORFILE)?"":"not "]removed.") + if("find") var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text if(input) if(ToRban_isbanned(input)) - src << "Address is a known ToR address" + to_chat(src, "Address is a known ToR address") + else - src << "Address is not a known ToR address" + to_chat(src, "Address is not a known ToR address") + return #undef TORFILE diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 67a141f74ba..ae25bc50c72 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -9,7 +9,8 @@ var/global/nologevent = 0 log_adminwarn(msg) for(var/client/C in admins) if(R_SERVER & C.holder.rights) - C << msg + to_chat(C, msg) + /proc/msg_admin_attack(var/text) //Toggleable Attack Messages log_attack(text) @@ -20,7 +21,8 @@ var/global/nologevent = 0 if(C.prefs.toggles & CHAT_ATTACKLOGS) if(!istype(C, /mob/living)) var/msg = rendered - C << msg + to_chat(C, msg) + ///////////////////////////////////////////////////////////////////////////////////////////////Panels @@ -31,7 +33,8 @@ var/global/nologevent = 0 set desc="Edit player (respawn, ban, heal, etc)" if(!M) - usr << "You seem to be selecting a mob that doesn't exist anymore." + to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.") + return if(!check_rights(R_ADMIN|R_MOD)) @@ -470,8 +473,10 @@ var/global/nologevent = 0 else dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" - //world << "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]" - //world << "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]" +// to_chat(world, "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]") + +// to_chat(world, "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]") + usr << browse(dat, "window=admincaster_main;size=400x600") onclose(usr, "admincaster_main") @@ -546,7 +551,8 @@ var/global/nologevent = 0 if(!check_rights(R_SERVER,0)) message = adminscrub(message,500) message = replacetext(message, "\n", "
") // required since we're putting it in a

tag - world << "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

" + to_chat(world, "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

") + log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -572,9 +578,11 @@ var/global/nologevent = 0 config.looc_allowed = !(config.looc_allowed) if (config.looc_allowed) - world << "The LOOC channel has been globally enabled!" + to_chat(world, "The LOOC channel has been globally enabled!") + else - world << "The LOOC channel has been globally disabled!" + to_chat(world, "The LOOC channel has been globally disabled!") + log_and_message_admins("toggled LOOC.") feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -588,9 +596,11 @@ var/global/nologevent = 0 config.dsay_allowed = !(config.dsay_allowed) if (config.dsay_allowed) - world << "Deadchat has been globally enabled!" + to_chat(world, "Deadchat has been globally enabled!") + else - world << "Deadchat has been globally disabled!" + to_chat(world, "Deadchat has been globally disabled!") + log_admin("[key_name(usr)] toggled deadchat.") message_admins("[key_name_admin(usr)] toggled deadchat.", 1) feedback_add_details("admin_verb","TDSAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc @@ -626,7 +636,8 @@ var/global/nologevent = 0 feedback_add_details("admin_verb","SN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return 1 else - usr << "Error: Start Now: Game has already started." + to_chat(usr, "Error: Start Now: Game has already started.") + return 0 /datum/admins/proc/toggleenter() @@ -639,9 +650,11 @@ var/global/nologevent = 0 enter_allowed = !( enter_allowed ) if (!( enter_allowed )) - world << "New players may no longer enter the game." + to_chat(world, "New players may no longer enter the game.") + else - world << "New players may now enter the game." + to_chat(world, "New players may now enter the game.") + log_admin("[key_name(usr)] toggled new player game entering.") message_admins("[key_name_admin(usr)] toggled new player game entering.", 1) world.update_status() @@ -657,9 +670,11 @@ var/global/nologevent = 0 config.allow_ai = !( config.allow_ai ) if (!( config.allow_ai )) - world << "The AI job is no longer chooseable." + to_chat(world, "The AI job is no longer chooseable.") + else - world << "The AI job is chooseable now." + to_chat(world, "The AI job is chooseable now.") + message_admins("[key_name_admin(usr)] toggled AI allowed.") log_admin("[key_name(usr)] toggled AI allowed.") world.update_status() @@ -675,9 +690,11 @@ var/global/nologevent = 0 abandon_allowed = !( abandon_allowed ) if (abandon_allowed) - world << "You may now respawn." + to_chat(world, "You may now respawn.") + else - world << "You may no longer respawn :(" + to_chat(world, "You may no longer respawn :(") + message_admins("[key_name_admin(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].", 1) log_admin("[key_name(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].") world.update_status() @@ -711,10 +728,12 @@ var/global/nologevent = 0 return //alert("Round end delayed", null, null, null, null, null) going = !( going ) if (!( going )) - world << "The game start has been delayed." + to_chat(world, "The game start has been delayed.") + log_admin("[key_name(usr)] delayed the game.") else - world << "The game will start soon." + to_chat(world, "The game will start soon.") + log_admin("[key_name(usr)] removed the delay.") feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -802,10 +821,12 @@ var/global/nologevent = 0 return if(!istype(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(!M.mind) - usr << "This mob has no mind!" + to_chat(usr, "This mob has no mind!") + return M.mind.edit_memory() @@ -821,9 +842,11 @@ var/global/nologevent = 0 guests_allowed = !( guests_allowed ) if (!( guests_allowed )) - world << "Guests may no longer enter the game." + to_chat(world, "Guests may no longer enter the game.") + else - world << "Guests may now enter the game." + to_chat(world, "Guests may now enter the game.") + log_admin("[key_name(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.") message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1) feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -833,25 +856,33 @@ var/global/nologevent = 0 for(var/mob/living/silicon/S in mob_list) ai_number++ if(isAI(S)) - usr << "AI [key_name(S, usr)]'s laws:" + to_chat(usr, "AI [key_name(S, usr)]'s laws:") + else if(isrobot(S)) var/mob/living/silicon/robot/R = S - usr << "CYBORG [key_name(S, usr)]'s [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"] laws:" + to_chat(usr, "CYBORG [key_name(S, usr)]'s [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"] laws:") + else if (ispAI(S)) var/mob/living/silicon/pai/P = S - usr << "pAI [key_name(S, usr)]'s laws:" - usr << "[P.pai_law0]" - if(P.pai_laws) usr << "[P.pai_laws]" + to_chat(usr, "pAI [key_name(S, usr)]'s laws:") + to_chat(usr, "[P.pai_law0]") + if(P.pai_laws) + to_chat(usr, "[P.pai_laws]") + continue // Skip showing normal silicon laws for pAIs - they don't have any else - usr << "SILICON [key_name(S, usr)]'s laws:" + to_chat(usr, "SILICON [key_name(S, usr)]'s laws:") + if (S.laws == null) - usr << "[key_name(S, usr)]'s laws are null. Contact a coder." + to_chat(usr, "[key_name(S, usr)]'s laws are null. Contact a coder.") + else S.laws.show_laws(usr) if(!ai_number) - usr << "No AI's located." //Just so you know the thing is actually working and not just ignoring you. + to_chat(usr, "No AI's located.")//Just so you know the thing is actually working and not just ignoring you. + + log_admin("[key_name(usr)] checked the AI laws") message_admins("[key_name_admin(usr)] checked the AI laws") @@ -932,7 +963,8 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space if(kick_only_afk && !C.is_afk()) //Ignore clients who are not afk continue if(message) - C << message + to_chat(C, message) + kicked_client_names.Add("[C.ckey]") del(C) return kicked_client_names diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 89b02c12d8c..8b7125608d7 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -23,7 +23,8 @@ if(!message) return var/F = investigate_subject2file(subject) if(!F) return - F << "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
" + to_chat(F, "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
") + //ADMINVERBS /client/proc/investigate_show( subject in list("hrefs","notes","pda","singulo","atmos","watchlist","ntsl","gold core","cult", "experimentor", "wires") ) @@ -34,7 +35,8 @@ if("singulo") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") @@ -43,51 +45,59 @@ if(href_logfile) src << browse(href_logfile,"window=investigate[subject];size=800x300") else - src << "Error: admin_investigate: No href logfile found." + to_chat(src, "Error: admin_investigate: No href logfile found.") + return else - src << "Error: admin_investigate: Href Logging is not on." + to_chat(src, "Error: admin_investigate: Href Logging is not on.") + return if("pda") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") if("cult") var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") if("atmos") var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") if("ntsl") var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") if("experimentor") var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") if("wires") var/F = investigate_subject2file(subject) if(!F) - src << "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed." + to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") + return src << browse(F,"window=investigate[subject];size=800x300") diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 355a82aa697..5c6abd131c7 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -4,7 +4,8 @@ if(!check_rights(R_SERVER)) return if(!dbcon.IsConnected()) - src << "Failed to establish database connection." + to_chat(src, "Failed to establish database connection.") + return var/memotask = input(usr,"Choose task.","Memo") in list("Show","Write","Edit","Remove") if(!memotask) @@ -17,7 +18,8 @@ if(!task) return if(!dbcon.IsConnected()) - src << "Failed to establish database connection." + to_chat(src, "Failed to establish database connection.") + return var/sql_ckey = sanitizeSQL(src.ckey) switch(task) @@ -28,7 +30,8 @@ log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n") return if(query_memocheck.NextRow()) - src << "You already have set a memo." + to_chat(src, "You already have set a memo.") + return var/memotext = input(src,"Write your Memo","Memo") as message if(!memotext) @@ -53,7 +56,8 @@ var/lkey = query_memolist.item[1] memolist += "[lkey]" if(!memolist.len) - src << "No memos found in database." + to_chat(src, "No memos found in database.") + return var/target_ckey = input(src, "Select whose memo to edit", "Select memo") as null|anything in memolist if(!target_ckey) @@ -100,7 +104,8 @@ output += "
Last edit by [last_editor] (Click here to see edit log)" output += "
[memotext]
" if(!output && !silent) - src << "No memos found in database." + to_chat(src, "No memos found in database.") + return src << output if("Remove") @@ -114,7 +119,8 @@ var/ckey = query_memodellist.item[1] memolist += "[ckey]" if(!memolist.len) - src << "No memos found in database." + to_chat(src, "No memos found in database.") + return var/target_ckey = input(src, "Select whose memo to delete", "Select memo") as null|anything in memolist if(!target_ckey) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 500fa010700..d3f0cd336bc 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -258,7 +258,8 @@ var/list/admin_verbs_proccall = list ( remove_admin_verbs() verbs += /client/proc/show_verbs - src << "Almost all of your adminverbs have been hidden." + to_chat(src, "Almost all of your adminverbs have been hidden.") + feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -272,7 +273,8 @@ var/list/admin_verbs_proccall = list ( verbs -= /client/proc/show_verbs add_admin_verbs() - src << "All of your adminverbs are now visible." + to_chat(src, "All of your adminverbs are now visible.") + feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_ghost() @@ -290,7 +292,8 @@ var/list/admin_verbs_proccall = list ( log_admin("[key_name(usr)] re-entered their body") feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(istype(mob,/mob/new_player)) - src << "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or observe first." + to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or observe first.") + else //ghostize var/mob/body = mob @@ -311,11 +314,13 @@ var/list/admin_verbs_proccall = list ( if(mob) if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) - mob << "Invisimin off. Invisibility reset." + to_chat(mob, "Invisimin off. Invisibility reset.") + //TODO: Make some kind of indication for the badmin that they are currently invisible else mob.invisibility = INVISIBILITY_OBSERVER - mob << "Invisimin on. You are now as invisible as a ghost." + to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") + /client/proc/player_panel() set name = "Player Panel" @@ -474,7 +479,8 @@ var/list/admin_verbs_proccall = list ( if(!warned_ckey || !istext(warned_ckey)) return if(warned_ckey in admin_datums) - usr << "Error: warn(): You can't warn admins." + to_chat(usr, "Error: warn(): You can't warn admins.") + return var/datum/preferences/D @@ -483,7 +489,8 @@ var/list/admin_verbs_proccall = list ( else D = preferences_datums[warned_ckey] if(!D) - src << "Error: warn(): No such ckey found." + to_chat(src, "Error: warn(): No such ckey found.") + return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) @@ -491,7 +498,8 @@ var/list/admin_verbs_proccall = list ( if(C) message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban") log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban") - C << "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes." + to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") + del(C) else message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban") @@ -500,7 +508,8 @@ var/list/admin_verbs_proccall = list ( feedback_inc("ban_warn",1) else if(C) - C << "You have been formally warned by an administrator.
Further warnings will result in an autoban." + to_chat(C, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") + message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") log_admin("[key_name(src)] has warned [key_name(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") else @@ -643,10 +652,12 @@ var/list/admin_verbs_proccall = list ( if(air_processing_killed) air_processing_killed = 0 - usr << "Enabled air processing." + to_chat(usr, "Enabled air processing.") + else air_processing_killed = 1 - usr << "Disabled air processing." + to_chat(usr, "Disabled air processing.") + feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] used 'kill air'.") message_admins("\blue [key_name_admin(usr)] used 'kill air'.", 1) @@ -663,7 +674,8 @@ var/list/admin_verbs_proccall = list ( deadmin() verbs += /client/proc/readmin deadmins += ckey - src << "You are now a normal player." + to_chat(src, "You are now a normal player.") + feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/readmin() @@ -686,7 +698,8 @@ var/list/admin_verbs_proccall = list ( else if(!dbcon.IsConnected()) message_admins("Warning, MySQL database is not connected.") - src << "Warning, MYSQL database is not connected." + to_chat(src, "Warning, MYSQL database is not connected.") + return var/sql_ckey = sanitizeSQL(ckey) var/DBQuery/query = dbcon.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'") @@ -697,7 +710,8 @@ var/list/admin_verbs_proccall = list ( if(config.admin_legacy_system) if(admin_ranks[rank] == null) error("Error while re-adminning [src], admin rank ([rank]) does not exist.") - src << "Error while re-adminning, admin rank ([rank]) does not exist." + to_chat(src, "Error while re-adminning, admin rank ([rank]) does not exist.") + return D = new(rank, admin_ranks[rank], ckey) @@ -710,10 +724,12 @@ var/list/admin_verbs_proccall = list ( var/admin_rank = query.item[2] var/flags = query.item[3] if(!admin_ckey) - src << "Error while re-adminning, ckey [admin_ckey] was not found in the admin database." + to_chat(src, "Error while re-adminning, ckey [admin_ckey] was not found in the admin database.") + return if(admin_rank == "Removed") //This person was de-adminned. They are only in the admin list for archive purposes. - src << "Error while re-adminning, ckey [admin_ckey] is not an admin." + to_chat(src, "Error while re-adminning, ckey [admin_ckey] is not an admin.") + return if(istext(flags)) @@ -728,7 +744,8 @@ var/list/admin_verbs_proccall = list ( feedback_add_details("admin_verb","RAS") return else - src << "You are already an admin." + to_chat(src, "You are already an admin.") + verbs -= /client/proc/readmin deadmins -= ckey return @@ -743,10 +760,12 @@ var/list/admin_verbs_proccall = list ( if(config) if(config.log_hrefs) config.log_hrefs = 0 - src << "Stopped logging hrefs" + to_chat(src, "Stopped logging hrefs") + else config.log_hrefs = 1 - src << "Started logging hrefs" + to_chat(src, "Started logging hrefs") + /client/proc/check_ai_laws() set name = "Check AI Laws" @@ -820,7 +839,8 @@ var/list/admin_verbs_proccall = list ( return if(!H.client) - usr << "Only mobs with clients can alter their own appearance." + to_chat(usr, "Only mobs with clients can alter their own appearance.") + return switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) @@ -844,7 +864,8 @@ var/list/admin_verbs_proccall = list ( if (J.current_positions >= J.total_positions && J.total_positions != -1) jobs += J.title if (!jobs.len) - usr << "There are no fully staffed jobs." + to_chat(usr, "There are no fully staffed jobs.") + return var/job = input("Please select job slot to free", "Free Job Slot") as null|anything in jobs if (job) @@ -862,9 +883,11 @@ var/list/admin_verbs_proccall = list ( prefs.toggles ^= CHAT_ATTACKLOGS prefs.save_preferences(src) if (prefs.toggles & CHAT_ATTACKLOGS) - usr << "You now will get attack log messages" + to_chat(usr, "You now will get attack log messages") + else - usr << "You now won't get attack log messages" + to_chat(usr, "You now won't get attack log messages") + /client/proc/toggledrones() set name = "Toggle Maintenance Drones" @@ -887,9 +910,11 @@ var/list/admin_verbs_proccall = list ( prefs.toggles ^= CHAT_DEBUGLOGS prefs.save_preferences(src) if (prefs.toggles & CHAT_DEBUGLOGS) - usr << "You now will get debug log messages" + to_chat(usr, "You now will get debug log messages") + else - usr << "You now won't get debug log messages" + to_chat(usr, "You now won't get debug log messages") + /client/proc/man_up(mob/T as mob in mob_list) set category = "Admin" @@ -899,8 +924,10 @@ var/list/admin_verbs_proccall = list ( if(!check_rights(R_ADMIN)) return - T << "Man up and deal with it." - T << "Move on." + to_chat(T, "Man up and deal with it.") + + to_chat(T, "Move on.") + log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.") @@ -917,8 +944,10 @@ var/list/admin_verbs_proccall = list ( if(confirm == "Yes") for (var/mob/T as mob in mob_list) - T << "
Man up.
Deal with it.
Move on.

" - T << 'sound/voice/ManUp1.ogg' + to_chat(T, "
Man up.
Deal with it.
Move on.

") + + to_chat(T, 'sound/voice/ManUp1.ogg') + log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.") diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm index 7ecbde4c3fb..80cc4839956 100644 --- a/code/modules/admin/banappearance.dm +++ b/code/modules/admin/banappearance.dm @@ -32,7 +32,8 @@ DEBUG set name = "list all appearances" for(var/s in appearance_keylist) - world << s + to_chat(world, s) + /mob/verb/reload_appearances() set name = "reload appearances" @@ -69,7 +70,8 @@ DEBUG /proc/appearance_savebanfile() var/savefile/S=new("data/appearance_full.ban") - S["keys[0]"] << appearance_keylist + to_chat(S["keys[0]"], appearance_keylist) + /proc/appearance_unban(mob/M) appearance_remove("[M.ckey]") diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index a28de25ee39..c2123489299 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -40,7 +40,8 @@ DEBUG set name = "list all jobbans" for(var/s in jobban_keylist) - world << s + to_chat(world, s) + /mob/verb/reload_jobbans() set name = "reload jobbans" @@ -92,7 +93,8 @@ DEBUG /proc/jobban_savebanfile() var/savefile/S=new("data/job_full.ban") - S["keys[0]"] << jobban_keylist + to_chat(S["keys[0]"], jobban_keylist) + /proc/jobban_unban(mob/M, rank) jobban_remove("[M.ckey] - [rank]") diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm index ebe37bc9697..fb1a9f6356e 100644 --- a/code/modules/admin/buildmode.dm +++ b/code/modules/admin/buildmode.dm @@ -149,45 +149,79 @@ /datum/click_intercept/buildmode/proc/show_help(mob/user) switch(mode) if(BASIC_BUILDMODE) - user << "***********************************************************" - user << "Left Mouse Button = Construct / Upgrade" - user << "Right Mouse Button = Deconstruct / Delete / Downgrade" - user << "Left Mouse Button + ctrl = R-Window" - user << "Left Mouse Button + alt = Airlock" - user << "" - user << "Use the button in the upper left corner to" - user << "change the direction of built objects." - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Left Mouse Button = Construct / Upgrade") + + to_chat(user, "Right Mouse Button = Deconstruct / Delete / Downgrade") + + to_chat(user, "Left Mouse Button + ctrl = R-Window") + + to_chat(user, "Left Mouse Button + alt = Airlock") + + to_chat(user, "") + + to_chat(user, "Use the button in the upper left corner to") + + to_chat(user, "change the direction of built objects.") + + to_chat(user, "***********************************************************") + if(ADV_BUILDMODE) - user << "***********************************************************" - user << "Right Mouse Button on buildmode button = Set object type" - user << "Left Mouse Button on turf/obj = Place objects" - user << "Right Mouse Button = Delete objects" - user << "" - user << "Use the button in the upper left corner to" - user << "change the direction of built objects." - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Right Mouse Button on buildmode button = Set object type") + + to_chat(user, "Left Mouse Button on turf/obj = Place objects") + + to_chat(user, "Right Mouse Button = Delete objects") + + to_chat(user, "") + + to_chat(user, "Use the button in the upper left corner to") + + to_chat(user, "change the direction of built objects.") + + to_chat(user, "***********************************************************") + if(VAR_BUILDMODE) - user << "***********************************************************" - user << "Right Mouse Button on buildmode button = Select var(type) & value" - user << "Left Mouse Button on turf/obj/mob = Set var(type) & value" - user << "Right Mouse Button on turf/obj/mob = Reset var's value" - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Right Mouse Button on buildmode button = Select var(type) & value") + + to_chat(user, "Left Mouse Button on turf/obj/mob = Set var(type) & value") + + to_chat(user, "Right Mouse Button on turf/obj/mob = Reset var's value") + + to_chat(user, "***********************************************************") + if(THROW_BUILDMODE) - user << "***********************************************************" - user << "Left Mouse Button on turf/obj/mob = Select" - user << "Right Mouse Button on turf/obj/mob = Throw" - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Left Mouse Button on turf/obj/mob = Select") + + to_chat(user, "Right Mouse Button on turf/obj/mob = Throw") + + to_chat(user, "***********************************************************") + if(AREA_BUILDMODE) - user << "***********************************************************" - user << "Left Mouse Button on turf/obj/mob = Select corner" - user << "Right Mouse Button on buildmode button = Select generator" - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner") + + to_chat(user, "Right Mouse Button on buildmode button = Select generator") + + to_chat(user, "***********************************************************") + if(COPY_BUILDMODE) - user << "***********************************************************" - user << "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target" - user << "Right Mouse Button on obj/mob = Select target to copy" - user << "***********************************************************" + to_chat(user, "***********************************************************") + + to_chat(user, "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target") + + to_chat(user, "Right Mouse Button on obj/mob = Select target to copy") + + to_chat(user, "***********************************************************") + /datum/click_intercept/buildmode/proc/change_settings(mob/user) switch(mode) @@ -351,13 +385,15 @@ log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]") object.vars[varholder] = valueholder else - user << "[initial(object.name)] does not have a var called '[varholder]'" + to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'") + if(right_click) if(object.vars.Find(varholder)) log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]") object.vars[varholder] = initial(object.vars[varholder]) else - user << "[initial(object.name)] does not have a var called '[varholder]'" + to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'") + if(THROW_BUILDMODE) if(left_click) @@ -377,7 +413,8 @@ if(left_click) //rectangular if(cornerA && cornerB) if(!generator_path) - user << "Select generator type first." + to_chat(user, "Select generator type first.") + else var/datum/mapGenerator/G = new generator_path G.defineRegion(cornerA.loc,cornerB.loc,1) @@ -394,5 +431,6 @@ DuplicateObject(stored, perfectcopy=1, sameloc=0,newloc=T) else if(right_click) if(ismovableatom(object)) // No copying turfs for now. - user << "[object] set as template." + to_chat(user, "[object] set as template.") + stored = object diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm index 6e690b469ac..16fa5b0db84 100644 --- a/code/modules/admin/create_poll.dm +++ b/code/modules/admin/create_poll.dm @@ -4,7 +4,8 @@ if(!check_rights(R_PERMISSIONS)) return if(!dbcon.IsConnected()) - src << "Failed to establish database connection." + to_chat(src, "Failed to establish database connection.") + return var/returned = create_poll_function() if(returned) @@ -26,7 +27,8 @@ log_admin("[key_name(usr)] has created a new server poll. Poll Type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"] - Question: [question]") message_admins("[key_name_admin(usr)] has created a new server poll. Poll Type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"]
Question: [question]") else - src << "Poll question created without any options, poll will be deleted." + to_chat(src, "Poll question created without any options, poll will be deleted.") + var/DBQuery/query_del_poll = dbcon.NewQuery("DELETE FROM [format_table_name("poll_question")] WHERE id = [returned]") if(!query_del_poll.Execute()) var/err = query_del_poll.ErrorMsg() @@ -63,7 +65,8 @@ if(query_validate_time.NextRow()) endtime = query_validate_time.item[1] if(!endtime) - src << "Datetime entered is invalid." + to_chat(src, "Datetime entered is invalid.") + return var/DBQuery/query_time_later = dbcon.NewQuery("SELECT TIMESTAMP('[endtime]') < NOW()") if(!query_time_later.Execute()) @@ -73,7 +76,8 @@ if(query_time_later.NextRow()) var/checklate = text2num(query_time_later.item[1]) if(checklate) - src << "Datetime entered is not later than current server time." + to_chat(src, "Datetime entered is not later than current server time.") + return var/adminonly switch(alert("Admin only poll?",,"Yes","No","Cancel")) @@ -132,7 +136,8 @@ if(!maxval) return pollid if(minval >= maxval) - src << "Minimum rating value can't be more than maximum rating value" + to_chat(src, "Minimum rating value can't be more than maximum rating value") + return pollid descmin = input("Optional: Set description for minimum rating","Minimum rating description") as message|null if(descmin) diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 572dfdbcf01..c34ad32c2d1 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -47,7 +47,8 @@ generally it would be used like so: proc/admin_proc() if(!check_rights(R_ADMIN)) return - world << "you have enough rights!" + to_chat(world, "you have enough rights!") + NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call you will have to do something like if(client.holder.rights & R_ADMIN) yourself. @@ -60,13 +61,15 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself. return 1 else if(show_msg) - user << "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")]." + to_chat(user, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") + else if(user.client.holder) return 1 else if(show_msg) - user << "Error: You are not an admin." + to_chat(user, "Error: You are not an admin.") + return 0 //probably a bit iffy - will hopefully figure out a better solution @@ -78,7 +81,8 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself. if(usr.client.holder.rights != other.holder.rights) if( (usr.client.holder.rights & other.holder.rights) == other.holder.rights ) return 1 //we have all the rights they have and more - usr << "Error: Cannot proceed. They have more or equal rights to us." + to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") + return 0 /client/proc/deadmin() diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm index a0e97c4ae7b..79cfac4d63a 100644 --- a/code/modules/admin/machine_upgrade.dm +++ b/code/modules/admin/machine_upgrade.dm @@ -6,7 +6,8 @@ return if(!istype(M)) - usr << "This can only be used on subtypes of /obj/machinery." + to_chat(usr, "This can only be used on subtypes of /obj/machinery.") + return var/new_rating = input("Enter new rating:","Num") as num diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index 7a879468d85..aa9a755b107 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -141,19 +141,27 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" if ( Banlistjob.dir.Find("[ckey][computerid][rank]") ) - usr << text("\red Banjob already exists.") + to_chat(usr, text("\red Banjob already exists.")) + return 0 else Banlistjob.dir.Add("[ckey][computerid][rank]") Banlistjob.cd = "/base/[ckey][computerid][rank]" - Banlistjob["key"] << ckey - Banlistjob["id"] << computerid - Banlistjob["rank"] << rank - Banlistjob["reason"] << reason - Banlistjob["bannedby"] << bannedby - Banlistjob["temp"] << temp + to_chat(Banlistjob["key"], ckey) + + to_chat(Banlistjob["id"], computerid) + + to_chat(Banlistjob["rank"], rank) + + to_chat(Banlistjob["reason"], reason) + + to_chat(Banlistjob["bannedby"], bannedby) + + to_chat(Banlistjob["temp"], temp) + if (temp) - Banlistjob["minutes"] << bantimestamp + to_chat(Banlistjob["minutes"], bantimestamp) + return 1 @@ -219,22 +227,30 @@ var/savefile/Banlistjob /*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job)) - M << "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a permanent ban." + to_chat(M, "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason].") + + to_chat(M, "\red This is a permanent ban.") + if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") + else - M << "\red No ban appeals URL has been set." + to_chat(M, "\red No ban appeals URL has been set.") + log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") /datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) - M << "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a temporary ban, it will be removed in [mins] minutes." + to_chat(M, "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].") + + to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.") + if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") + else - M << "\red No ban appeals URL has been set." + to_chat(M, "\red No ban appeals URL has been set.") + log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ //////////////////////////////////// DEBUG //////////////////////////////////// @@ -253,17 +269,24 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" Banlistjob.dir.Add("trash[i]trashid[i]") Banlistjob.cd = "/base/trash[i]trashid[i]" - Banlistjob["key"] << "trash[i]" + to_chat(Banlistjob["key"], "trash[i]") + else Banlistjob.cd = "/base" Banlistjob.dir.Add("[last]trashid[i]") Banlistjob.cd = "/base/[last]trashid[i]" - Banlistjob["key"] << last - Banlistjob["id"] << "trashid[i]" - Banlistjob["reason"] << "Trashban[i]." - Banlistjob["temp"] << a - Banlistjob["minutes"] << CMinutes + rand(1,2000) - Banlistjob["bannedby"] << "trashmin" + to_chat(Banlistjob["key"], last) + + to_chat(Banlistjob["id"], "trashid[i]") + + to_chat(Banlistjob["reason"], "Trashban[i].") + + to_chat(Banlistjob["temp"], a) + + to_chat(Banlistjob["minutes"], CMinutes + rand(1,2000)) + + to_chat(Banlistjob["bannedby"], "trashmin") + last = "trash[i]" Banlistjob.cd = "/base" diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 19ca9ef9b4f..9d4cd3f0071 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -63,7 +63,8 @@ establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + to_chat(usr, "\red Failed to establish database connection") + return if(!adm_ckey || !new_rank) @@ -91,14 +92,16 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');") log_query.Execute() - usr << "\blue New admin added." + to_chat(usr, "\blue New admin added.") + else if(!isnull(admin_id) && isnum(admin_id)) var/DBQuery/insert_query = dbcon.NewQuery("UPDATE [format_table_name("admin")] SET rank = '[new_rank]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Edited the rank of [adm_ckey] to [new_rank]');") log_query.Execute() - usr << "\blue Admin rank changed." + to_chat(usr, "\blue Admin rank changed.") + /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) if(config.admin_legacy_system) @@ -112,7 +115,8 @@ establish_db_connection() if(!dbcon.IsConnected()) - usr << "\red Failed to establish database connection" + to_chat(usr, "\red Failed to establish database connection") + return if(!adm_ckey || !new_permission) @@ -146,13 +150,15 @@ insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');") log_query.Execute() - usr << "\blue Permission removed." + to_chat(usr, "\blue Permission removed.") + else //This admin doesn't have this permission, so we are adding it. var/DBQuery/insert_query = dbcon.NewQuery("UPDATE [format_table_name("admin")] SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')") log_query.Execute() - usr << "\blue Permission added." + to_chat(usr, "\blue Permission added.") + /datum/admins/proc/updateranktodb(ckey,newrank) establish_db_connection() diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm index 7678814f0c6..16507468bdb 100644 --- a/code/modules/admin/sql_notes.dm +++ b/code/modules/admin/sql_notes.dm @@ -2,7 +2,8 @@ if(checkrights && !check_rights(R_ADMIN|R_MOD)) return if(!dbcon.IsConnected()) - usr << "Failed to establish database connection." + to_chat(usr, "Failed to establish database connection.") + return if(!target_ckey) var/new_ckey = ckey(input(usr,"Who would you like to add a note for?","Enter a ckey",null) as text|null) @@ -15,7 +16,8 @@ log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n") return if(!query_find_ckey.NextRow()) - usr << "[new_ckey] has not been seen before, you can only add notes to known players." + to_chat(usr, "[new_ckey] has not been seen before, you can only add notes to known players.") + return else target_ckey = new_ckey @@ -53,7 +55,8 @@ var/notetext var/adminckey if(!dbcon.IsConnected()) - usr << "Failed to establish database connection." + to_chat(usr, "Failed to establish database connection.") + return if(!note_id) return @@ -80,7 +83,8 @@ if(!check_rights(R_ADMIN|R_MOD)) return if(!dbcon.IsConnected()) - usr << "Failed to establish database connection." + to_chat(usr, "Failed to establish database connection.") + return if(!note_id) return diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 94f7a84daa1..e88ecaf70de 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -21,7 +21,8 @@ return ckey = ckey(ckey) if (get_stickyban_from_ckey(ckey)) - usr << "Error: Can not add a stickyban: User already has a current sticky ban" + to_chat(usr, "Error: Can not add a stickyban: User already has a current sticky ban") + if (data["reason"]) ban["message"] = data["reason"] @@ -43,12 +44,14 @@ var/ban = get_stickyban_from_ckey(ckey) if (!ban) - usr << "Error: No sticky ban for [ckey] found!" + to_chat(usr, "Error: No sticky ban for [ckey] found!") + return if (alert("Are you sure you want to remove the sticky ban on [ckey]?","Are you sure","Yes","No") == "No") return if (!get_stickyban_from_ckey(ckey)) - usr << "Error: The ban disappeared." + to_chat(usr, "Error: The ban disappeared.") + return world.SetConfig("ban", ckey, null) @@ -64,7 +67,8 @@ var/alt = ckey(data["alt"]) var/ban = get_stickyban_from_ckey(ckey) if (!ban) - usr << "Error: No sticky ban for [ckey] found!" + to_chat(usr, "Error: No sticky ban for [ckey] found!") + return var/found = 0 @@ -75,7 +79,8 @@ break if (!found) - usr << "Error: [alt] is not linked to [ckey]'s sticky ban!" + to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!") + return if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them","Are you sure","Yes","No") == "No") @@ -84,7 +89,8 @@ //we have to do this again incase something changes ban = get_stickyban_from_ckey(ckey) if (!ban) - usr << "Error: The ban disappeared." + to_chat(usr, "Error: The ban disappeared.") + return found = 0 @@ -95,7 +101,8 @@ break if (!found) - usr << "Error: [alt] link to [ckey]'s sticky ban disappeared." + to_chat(usr, "Error: [alt] link to [ckey]'s sticky ban disappeared.") + return world.SetConfig("ban",ckey,list2stickyban(ban)) @@ -109,7 +116,8 @@ var/ckey = data["ckey"] var/ban = get_stickyban_from_ckey(ckey) if (!ban) - usr << "Error: No sticky ban for [ckey] found!" + to_chat(usr, "Error: No sticky ban for [ckey] found!") + return var/oldreason = ban["message"] var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null @@ -118,7 +126,8 @@ //we have to do this again incase something changed while we waited for input ban = get_stickyban_from_ckey(ckey) if (!ban) - usr << "Error: The ban disappeared." + to_chat(usr, "Error: The ban disappeared.") + return ban["message"] = "[reason]" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b0de84846f0..6b122a48ee8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -17,11 +17,15 @@ if(!C) return - C << 'sound/effects/adminhelp.ogg' + to_chat(C, 'sound/effects/adminhelp.ogg') + + + to_chat(C, "- AdminHelp Rejected! -") + + to_chat(C, "Your admin help was rejected.") + + to_chat(C, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.") - C << "- AdminHelp Rejected! -" - C << "Your admin help was rejected." - C << "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking." message_admins("[key_name_admin(usr)] rejected [key_name_admin(C.mob)]'s admin help") log_admin("[key_name(usr)] rejected [key_name(C.mob)]'s admin help") @@ -34,35 +38,43 @@ if("1") log_admin("[key_name(usr)] has spawned a traitor.") if(!src.makeTraitors()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("2") log_admin("[key_name(usr)] has spawned a changeling.") if(!src.makeChanglings()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("3") log_admin("[key_name(usr)] has spawned revolutionaries.") if(!src.makeRevs()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("4") log_admin("[key_name(usr)] has spawned a cultists.") if(!src.makeCult()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("5") log_admin("[key_name(usr)] has spawned a malf AI.") if(!src.makeMalfAImode()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("6") log_admin("[key_name(usr)] has spawned a wizard.") if(!src.makeWizard()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("7") log_admin("[key_name(usr)] has spawned vampires.") if(!src.makeVampires()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + if("8") log_admin("[key_name(usr)] has spawned vox raiders.") if(!src.makeVoxRaiders()) - usr << "\red Unfortunately there weren't enough candidates available." + to_chat(usr, "\red Unfortunately there weren't enough candidates available.") + else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"]) var/adminckey = href_list["dbsearchadmin"] @@ -102,39 +114,46 @@ switch(bantype) if(BANTYPE_PERMA) if(!banckey || !banreason) - usr << "Not enough parameters (Requires ckey and reason)" + to_chat(usr, "Not enough parameters (Requires ckey and reason)") + return banduration = null banjob = null if(BANTYPE_TEMP) if(!banckey || !banreason || !banduration) - usr << "Not enough parameters (Requires ckey, reason and duration)" + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + return banjob = null if(BANTYPE_JOB_PERMA) if(!banckey || !banreason || !banjob) - usr << "Not enough parameters (Requires ckey, reason and job)" + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + return banduration = null if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) - usr << "Not enough parameters (Requires ckey, reason and job)" + to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") + return if(BANTYPE_APPEARANCE) if(!banckey || !banreason) - usr << "Not enough parameters (Requires ckey and reason)" + to_chat(usr, "Not enough parameters (Requires ckey and reason)") + return banduration = null banjob = null if(BANTYPE_ADMIN_PERMA) if(!banckey || !banreason) - usr << "Not enough parameters (Requires ckey and reason)" + to_chat(usr, "Not enough parameters (Requires ckey and reason)") + return banduration = null banjob = null if(BANTYPE_ADMIN_TEMP) if(!banckey || !banreason || !banduration) - usr << "Not enough parameters (Requires ckey, reason and duration)" + to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") + return banjob = null @@ -172,14 +191,16 @@ var/new_ckey = ckey(input(usr,"New admin's ckey","Admin ckey", null) as text|null) if(!new_ckey) return if(new_ckey in admin_datums) - usr << "Error: Topic 'editrights': [new_ckey] is already an admin" + to_chat(usr, "Error: Topic 'editrights': [new_ckey] is already an admin") + return adm_ckey = new_ckey task = "rank" else if(task != "show") adm_ckey = ckey(href_list["ckey"]) if(!adm_ckey) - usr << "Error: Topic 'editrights': No valid ckey" + to_chat(usr, "Error: Topic 'editrights': No valid ckey") + return var/datum/admins/D = admin_datums[adm_ckey] @@ -212,7 +233,8 @@ if(config.admin_legacy_system) new_rank = ckeyEx(new_rank) if(!new_rank) - usr << "Error: Topic 'editrights': Invalid rank" + to_chat(usr, "Error: Topic 'editrights': Invalid rank") + return if(config.admin_legacy_system) if(admin_ranks.len) @@ -306,7 +328,8 @@ var/mob/M = locate(href_list["mob"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return var/delmob = 0 @@ -400,10 +423,14 @@ ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]") message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) Banlist.cd = "/base/[banfolder]" - Banlist["reason"] << reason - Banlist["temp"] << temp - Banlist["minutes"] << minutes - Banlist["bannedby"] << usr.ckey + to_chat(Banlist["reason"], reason) + + to_chat(Banlist["temp"], temp) + + to_chat(Banlist["minutes"], minutes) + + to_chat(Banlist["bannedby"], usr.ckey) + Banlist.cd = "/base" feedback_inc("ban_edit",1) unbanpanel() @@ -415,16 +442,19 @@ return var/mob/M = locate(href_list["appearanceban"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(!M.ckey) //sanity - usr << "This mob has no ckey" + to_chat(usr, "This mob has no ckey") + return var/banreason = appearance_isbanned(M) if(banreason) /* if(!config.ban_legacy_system) - usr << "Unfortunately, database based unbanning cannot be done through this panel" + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + DB_ban_panel(M.ckey) return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) @@ -435,7 +465,8 @@ DB_ban_unban(M.ckey, BANTYPE_APPEARANCE) appearance_unban(M) message_admins("\blue [key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban", 1) - M << "\red[usr.client.ckey] has removed your appearance ban." + to_chat(M, "\red[usr.client.ckey] has removed your appearance ban.") + else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel")) if("Yes") @@ -449,13 +480,18 @@ appearance_fullban(M, "[reason]; By [usr.ckey] on [time2text(world.realtime)]") add_note(M.ckey, "Appearance banned - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] appearance banned [key_name_admin(M)]", 1) - M << "\redYou have been appearance banned by [usr.client.ckey]." - M << "\red The reason is: [reason]" - M << "\red Appearance ban can be lifted only upon request." + to_chat(M, "\redYou have been appearance banned by [usr.client.ckey].") + + to_chat(M, "\red The reason is: [reason]") + + to_chat(M, "\red Appearance ban can be lifted only upon request.") + if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") + else - M << "\red No ban appeals URL has been set." + to_chat(M, "\red No ban appeals URL has been set.") + if("No") return @@ -464,14 +500,17 @@ var/mob/M = locate(href_list["jobban2"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(!M.ckey) //sanity - usr << "This mob has no ckey" + to_chat(usr, "This mob has no ckey") + return if(!job_master) - usr << "Job Master has not been setup!" + to_chat(usr, "Job Master has not been setup!") + return var/dat = "" @@ -795,7 +834,8 @@ var/mob/M = locate(href_list["jobban4"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(M != usr) //we can jobban ourselves @@ -804,7 +844,8 @@ return if(!job_master) - usr << "Job Master has not been setup!" + to_chat(usr, "Job Master has not been setup!") + return //get jobs for department if specified, otherwise just returnt he one job in a list. @@ -873,7 +914,8 @@ switch(alert("Temporary Ban?",,"Yes","No", "Cancel")) if("Yes") if(config.ban_legacy_system) - usr << "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban." + to_chat(usr, "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban.") + return var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) @@ -896,9 +938,12 @@ msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) - M << "\redYou have been jobbanned by [usr.client.ckey] from: [msg]." - M << "\red The reason is: [reason]" - M << "\red This jobban will be lifted in [mins] minutes." + to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].") + + to_chat(M, "\red The reason is: [reason]") + + to_chat(M, "\red This jobban will be lifted in [mins] minutes.") + href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("No") @@ -916,9 +961,12 @@ else msg += ", [job]" add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) - M << "\redYou have been jobbanned by [usr.client.ckey] from: [msg]." - M << "\red The reason is: [reason]" - M << "\red Jobban can be lifted only upon request." + to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].") + + to_chat(M, "\red The reason is: [reason]") + + to_chat(M, "\red Jobban can be lifted only upon request.") + href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("Cancel") @@ -928,7 +976,8 @@ //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned) if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. if(!config.ban_legacy_system) - usr << "Unfortunately, database based unbanning cannot be done through this panel" + to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") + DB_ban_panel(M.ckey) return var/msg @@ -949,7 +998,8 @@ continue if(msg) message_admins("\blue [key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) - M << "\redYou have been un-jobbanned by [usr.client.ckey] from [msg]." + to_chat(M, "\redYou have been un-jobbanned by [usr.client.ckey] from [msg].") + href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! @@ -959,7 +1009,8 @@ if (ismob(M)) if(!check_if_greater_rights_than(M.client)) return - M << "\red You have been kicked from the server" + to_chat(M, "\red You have been kicked from the server") + log_admin("[key_name(usr)] booted [key_name(M)].") message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1) //M.client = null @@ -1043,15 +1094,19 @@ return AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") - M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a temporary ban, it will be removed in [mins] minutes." + to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].") + + to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.") + feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) feedback_inc("ban_tmp_mins",mins) if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") + else - M << "\red No ban appeals URL has been set." + to_chat(M, "\red No ban appeals URL has been set.") + log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("\blue [key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") @@ -1067,12 +1122,16 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, M.lastKnownIP) if("No") AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) - M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]." - M << "\red This is a permanent ban." + to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].") + + to_chat(M, "\red This is a permanent ban.") + if(config.banappeals) - M << "\red To try to resolve this matter head to [config.banappeals]" + to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") + else - M << "\red No ban appeals URL has been set." + to_chat(M, "\red No ban appeals URL has been set.") + ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") @@ -1178,7 +1237,8 @@ master_mode = href_list["c_mode2"] log_admin("[key_name(usr)] set the mode as [master_mode].") message_admins("\blue [key_name_admin(usr)] set the mode as [master_mode].", 1) - world << "\blue The mode is now: [master_mode]" + to_chat(world, "\blue The mode is now: [master_mode]") + Game() // updates the main game menu world.save_mode(master_mode) .(href, list("c_mode"=1)) @@ -1201,7 +1261,8 @@ var/mob/living/carbon/human/H = locate(href_list["monkeyone"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") @@ -1214,7 +1275,8 @@ var/mob/living/carbon/human/H = locate(href_list["corgione"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") @@ -1226,7 +1288,8 @@ var/mob/M = locate(href_list["forcespeech"]) if(!ismob(M)) - usr << "this can only be used on instances of type /mob" + to_chat(usr, "this can only be used on instances of type /mob") + var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return @@ -1243,10 +1306,12 @@ var/mob/M = locate(href_list["sendtoprison"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return var/turf/prison_cell = pick(prisonwarp) @@ -1276,7 +1341,8 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform) prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) - M << "\red You have been sent to the prison station!" + to_chat(M, "\red You have been sent to the prison station!") + log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) @@ -1287,11 +1353,13 @@ var/mob/M = locate(href_list["sendbacktolobby"]) if(!isobserver(M)) - usr << "You can only send ghost players back to the Lobby." + to_chat(usr, "You can only send ghost players back to the Lobby.") + return if(!M.client) - usr << "[M] doesn't seem to have an active client." + to_chat(usr, "[M] doesn't seem to have an active client.") + return if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes") @@ -1312,10 +1380,12 @@ var/mob/M = locate(href_list["tdome1"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return for(var/obj/item/I in M) @@ -1329,7 +1399,8 @@ sleep(5) M.loc = pick(tdome1) spawn(50) - M << "\blue You have been sent to the Thunderdome." + to_chat(M, "\blue You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) @@ -1341,10 +1412,12 @@ var/mob/M = locate(href_list["tdome2"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return for(var/obj/item/I in M) @@ -1358,7 +1431,8 @@ sleep(5) M.loc = pick(tdome2) spawn(50) - M << "\blue You have been sent to the Thunderdome." + to_chat(M, "\blue You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) @@ -1370,17 +1444,20 @@ var/mob/M = locate(href_list["tdomeadmin"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return M.Paralyse(5) sleep(5) M.loc = pick(tdomeadmin) spawn(50) - M << "\blue You have been sent to the Thunderdome." + to_chat(M, "\blue You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) @@ -1392,10 +1469,12 @@ var/mob/M = locate(href_list["tdomeobserve"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return for(var/obj/item/I in M) @@ -1413,7 +1492,8 @@ sleep(5) M.loc = pick(tdomeobserve) spawn(50) - M << "\blue You have been sent to the Thunderdome." + to_chat(M, "\blue You have been sent to the Thunderdome.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) @@ -1425,17 +1505,20 @@ var/mob/M = locate(href_list["aroomwarp"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return if(istype(M, /mob/living/silicon/ai)) - usr << "This cannot be used on instances of type /mob/living/silicon/ai" + to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") + return M.Paralyse(5) sleep(5) M.loc = pick(aroomwarp) spawn(50) - M << "\blue You have been sent to the Admin Room!." + to_chat(M, "\blue You have been sent to the Admin Room!.") + log_admin("[key_name(usr)] has sent [key_name(M)] to the Admin Room") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the Admin Room", 1) @@ -1445,7 +1528,8 @@ var/mob/living/L = locate(href_list["revive"]) if(!istype(L)) - usr << "This can only be used on instances of type /mob/living" + to_chat(usr, "This can only be used on instances of type /mob/living") + return L.revive() @@ -1457,7 +1541,8 @@ var/mob/living/carbon/human/H = locate(href_list["makeai"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1) @@ -1478,7 +1563,8 @@ var/mob/living/carbon/human/H = locate(href_list["makealien"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return usr.client.cmd_admin_alienize(H) @@ -1488,7 +1574,8 @@ var/mob/living/carbon/human/H = locate(href_list["makeslime"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return usr.client.cmd_admin_slimeize(H) @@ -1498,7 +1585,8 @@ var/mob/living/carbon/human/H = locate(href_list["makesuper"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return usr.client.cmd_admin_super(H) @@ -1508,7 +1596,8 @@ var/mob/living/carbon/human/H = locate(href_list["makerobot"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return usr.client.cmd_admin_robotize(H) @@ -1518,7 +1607,8 @@ var/mob/M = locate(href_list["makeanimal"]) if(istype(M, /mob/new_player)) - usr << "This cannot be used on instances of type /mob/new_player" + to_chat(usr, "This cannot be used on instances of type /mob/new_player") + return usr.client.cmd_admin_animalize(M) @@ -1528,7 +1618,8 @@ var/mob/dead/observer/G = locate(href_list["incarn_ghost"]) if(!istype(G)) - usr << "This will only work on /mob/dead/observer" + to_chat(usr, "This will only work on /mob/dead/observer") + log_admin("[key_name(G)] was incarnated by [key_name(src.owner)]") message_admins("[key_name_admin(G)] was incarnated by [key_name_admin(src.owner)]") G.incarnate_ghost() @@ -1538,7 +1629,8 @@ var/mob/living/carbon/human/H = locate(href_list["togmutate"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return var/block=text2num(href_list["block"]) //testing("togmutate([href_list["block"]] -> [block])") @@ -1594,7 +1686,8 @@ else if(href_list["adminmoreinfo"]) var/mob/M = locate(href_list["adminmoreinfo"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob" + to_chat(usr, "This can only be used on instances of type /mob") + return var/location_description = "" @@ -1634,19 +1727,26 @@ if(MALE,FEMALE) gender_description = "[M.gender]" else gender_description = "[M.gender]" - src.owner << "Info about [M.name]: " - src.owner << "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]" - src.owner << "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];" - src.owner << "Location = [location_description];" - src.owner << "[special_role_description]" - src.owner << "(PM) (PP) (VV) (SM) (FLW) (CA)" + to_chat(src.owner, "Info about [M.name]: ") + + to_chat(src.owner, "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]") + + to_chat(src.owner, "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];") + + to_chat(src.owner, "Location = [location_description];") + + to_chat(src.owner, "[special_role_description]") + + to_chat(src.owner, "(PM) (PP) (VV) (SM) (FLW) (CA)") + else if(href_list["adminspawncookie"]) if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) if(!ishuman(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) @@ -1663,28 +1763,32 @@ log_admin("[key_name(H)] got their cookie, spawned by [key_name(src.owner)]") message_admins("[key_name_admin(H)] got their cookie, spawned by [key_name_admin(src.owner)]") feedback_inc("admin_cookies_spawned",1) - H << "\blue Your prayers have been answered!! You received the best cookie!" + to_chat(H, "\blue Your prayers have been answered!! You received the best cookie!") + else if(href_list["BlueSpaceArtillery"]) if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) if(!isliving(M)) - usr << "This can only be used on instances of type /mob/living" + to_chat(usr, "This can only be used on instances of type /mob/living") + return if(alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Bluespace Artillery?", "Confirm Firing?" , "Yes" , "No") != "Yes") return if(BSACooldown) - src.owner << "Standby. Reload cycle in progress. Gunnery crews ready in five seconds!" + to_chat(src.owner, "Standby. Reload cycle in progress. Gunnery crews ready in five seconds!") + return BSACooldown = 1 spawn(50) BSACooldown = 0 - M << "You've been hit by bluespace artillery!" + to_chat(M, "You've been hit by bluespace artillery!") + log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [key_name(src.owner)]") message_admins("[key_name_admin(M)] has been hit by Bluespace Artillery fired by [key_name_admin(src.owner)]") @@ -1714,19 +1818,23 @@ var/mob/living/carbon/human/H = locate(href_list["CentcommReply"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) - usr << "The person you are trying to contact is not wearing a headset" + to_chat(usr, "The person you are trying to contact is not wearing a headset") + return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "") if(!input) return - src.owner << "You sent [input] to [H] via a secure channel." + to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + log_admin("[key_name(src.owner)] replied to [key_name(H)]'s Centcomm message with the message [input].") message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)]'s Centcom message with: \"[input]\"") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"" + to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"") + else if(href_list["SyndicateReply"]) if(!check_rights(R_ADMIN)) @@ -1734,37 +1842,46 @@ var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return if(H.stat != 0) - usr << "The person you are trying to contact is not conscious." + to_chat(usr, "The person you are trying to contact is not conscious.") + return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) - usr << "The person you are trying to contact is not wearing a headset" + to_chat(usr, "The person you are trying to contact is not wearing a headset") + return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "") if(!input) return - src.owner << "You sent [input] to [H] via a secure channel." + to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"" + to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"") + else if(href_list["HONKReply"]) var/mob/living/carbon/human/H = locate(href_list["HONKReply"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) - usr << "The person you are trying to contact is not wearing a headset" + to_chat(usr, "The person you are trying to contact is not wearing a headset") + return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from HONKplanet", "") if(!input) return - src.owner << "You sent [input] to [H] via a secure channel." + to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + log_admin("[src.owner] replied to [key_name(H)]'s HONKplanet message with the message [input].") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your HONKbrothers. Message as follows, HONK. [input]. Message ends, HONK.\"" + to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your HONKbrothers. Message as follows, HONK. [input]. Message ends, HONK.\"") + else if(href_list["ErtReply"]) if(!check_rights(R_ADMIN)) @@ -1773,21 +1890,26 @@ if(alert(src.owner, "Accept or Deny ERT request?", "CentComm Response", "Accept", "Deny") == "Deny") var/mob/living/carbon/human/H = locate(href_list["ErtReply"]) if(!istype(H)) - usr << "This can only be used on instances of type /mob/living/carbon/human" + to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") + return if(H.stat != 0) - usr << "The person you are trying to contact is not conscious." + to_chat(usr, "The person you are trying to contact is not conscious.") + return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) - usr << "The person you are trying to contact is not wearing a headset" + to_chat(usr, "The person you are trying to contact is not wearing a headset") + return var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "") if(!input) return - src.owner << "You sent [input] to [H] via a secure channel." + to_chat(src.owner, "You sent [input] to [H] via a secure channel.") + log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].") - H << "You hear something crackle in your headset for a moment before a voice speaks. \"Your ERT request has been denied for the following reasons: [input]. Message ends.\"" + to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Your ERT request has been denied for the following reasons: [input]. Message ends.\"") + else src.owner.response_team() @@ -1815,7 +1937,8 @@ usr << browse(data, "window=[B.name]") else - usr << "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]" + to_chat(usr, "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]") + else if (href_list["AdminFaxViewPage"]) if(!check_rights(R_ADMIN)) @@ -1947,14 +2070,16 @@ if(destination != "All Departments") if(!fax.receivefax(P)) - src.owner << "\red Message transmission failed." + to_chat(src.owner, "\red Message transmission failed.") + return else for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) if((F.z in config.station_levels)) spawn(0) if(!F.receivefax(P)) - src.owner << "\red Message transmission to [F.department] failed." + to_chat(src.owner, "\red Message transmission to [F.department] failed.") + var/datum/fax/admin/A = new /datum/fax/admin() A.name = P.name @@ -1969,11 +2094,13 @@ A.sent_by = usr A.sent_at = world.time - src.owner << "\blue Message transmitted successfully." + to_chat(src.owner, "\blue Message transmitted successfully.") + if(notify == "Yes") var/mob/living/carbon/human/H = sender if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/device/radio/headset) || istype(H.r_ear, /obj/item/device/radio/headset))) - sender << "Your headset pings, notifying you that a reply to your fax has arrived." + to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") + if(sender) log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]") message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (VIEW).", 1) @@ -2028,7 +2155,8 @@ var/mob/M = locate(href_list["traitor"]) if(!ismob(M)) - usr << "This can only be used on instances of type /mob." + to_chat(usr, "This can only be used on instances of type /mob.") + return show_traitor_panel(M) @@ -2097,7 +2225,8 @@ switch(where) if("inhand") if (!iscarbon(usr) && !isrobot(usr)) - usr << "Can only spawn in hand when you're a carbon mob or cyborg." + to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") + where = "onfloor" target = usr @@ -2109,10 +2238,12 @@ target = locate(loc.x + X,loc.y + Y,loc.z + Z) if("inmarked") if(!marked_datum) - usr << "You don't have any object marked. Abandoning spawn." + to_chat(usr, "You don't have any object marked. Abandoning spawn.") + return else if(!istype(marked_datum,/atom)) - usr << "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn." + to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") + return else target = marked_datum @@ -2176,7 +2307,8 @@ message_admins("[key_name_admin(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") log_admin("[key_name(usr)] has kicked [afkonly ? "all AFK" : "all"] clients from the lobby. [length(listkicked)] clients kicked: [strkicked ? strkicked : "--"]") else - usr << "You may only use this when the game is running." + to_chat(usr, "You may only use this when the game is running.") + else if(href_list["memoeditlist"]) if(!check_rights(R_SERVER)) return @@ -2254,7 +2386,8 @@ feedback_add_details("admin_secrets_fun_used","TriAI") if("gravity") if(!(ticker && ticker.mode)) - usr << "Please wait until the game starts! Not sure how it will work otherwise." + to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") + return gravity_is_on = !gravity_is_on for(var/area/A in world) @@ -2416,11 +2549,14 @@ M.show_message(text("\blue The chilling wind suddenly stops..."), 1) /* if("shockwave") ok = 1 - world << "\red ALERT: STATION STRESS CRITICAL" + to_chat(world, "\red ALERT: STATION STRESS CRITICAL") + sleep(60) - world << "\red ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!" + to_chat(world, "\red ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!") + sleep(80) - world << "\red ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!" + to_chat(world, "\red ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!") + sleep(40) for(var/mob/M in world) shake_camera(M, 400, 1) @@ -2474,7 +2610,8 @@ message_admins("[key_name_admin(usr)] fixed all lights", 1) if("floorlava") if(floorIsLava) - usr << "The floor is lava already." + to_chat(usr, "The floor is lava already.") + return feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","LF") @@ -2531,7 +2668,8 @@ feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","RET") for(var/mob/living/carbon/human/H in player_list) - H << "\red You suddenly feel stupid." + to_chat(H, "\red You suddenly feel stupid.") + H.setBrainLoss(60) message_admins("[key_name_admin(usr)] made everybody retarded") if("fakeguns") @@ -2552,7 +2690,8 @@ W.item_state = "w_suit" W.item_color = "schoolgirl" message_admins("[key_name_admin(usr)] activated Japanese Animes mode") - world << sound('sound/AI/animes.ogg') + to_chat(world, sound('sound/AI/animes.ogg')) + if("eagles")//SCRAW feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","EgL") @@ -2658,7 +2797,8 @@ if(usr) log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]") if (ok) - world << text("A secret has been activated by []!", usr.key) + to_chat(world, text("A secret has been activated by []!", usr.key)) + else if(href_list["secretsadmin"]) if(!check_rights(R_ADMIN)) return @@ -2735,7 +2875,8 @@ if (usr) log_admin("[key_name(usr)] used secret [href_list["secretsadmin"]]") if (ok) - world << text("A secret has been activated by []!", usr.key) + to_chat(world, text("A secret has been activated by []!", usr.key)) + else if(href_list["secretscoder"]) if(!check_rights(R_DEBUG)) return diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm index 1d414c7ebf9..dd135db1c50 100644 --- a/code/modules/admin/verbs/BrokenInhands.dm +++ b/code/modules/admin/verbs/BrokenInhands.dm @@ -31,6 +31,8 @@ if(text) var/F = file("broken_hand_icons.txt") fdel(F) - F << text - world << "Completed and written to [F]" + to_chat(F, text) + + to_chat(world, "Completed and written to [F]") + diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index e58e59209f6..b8fafe55e93 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -25,7 +25,8 @@ if(!query_text || length(query_text) < 1) return - //world << query_text +// to_chat(world, query_text) + var/list/query_list = SDQL2_tokenize(query_text) @@ -147,8 +148,10 @@ for(var/v in vals) d.vars[v] = vals[v] catch(var/exception/e) - usr << "A runtime error has occured during the execution of your query and your query has been aborted." - usr << "[e]" + to_chat(usr, "A runtime error has occured during the execution of your query and your query has been aborted.") + + to_chat(usr, "[e]") + /proc/SDQL_parse(list/query_list) var/datum/SDQL_parser/parser = new() @@ -174,7 +177,8 @@ 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. - usr << "Parsing error on [querys_pos]\th query. Nothing was executed." + to_chat(usr, "Parsing error on [querys_pos]\th query. Nothing was executed.") + return list() query_tree = list() do_parse = 0 @@ -195,22 +199,28 @@ for(var/item in query_tree) if(istype(item, /list)) - usr << "[spaces](" + to_chat(usr, "[spaces](") + SDQL_testout(item, indent + 1) - usr << "[spaces])" + to_chat(usr, "[spaces])") + else - usr << "[spaces][item]" + to_chat(usr, "[spaces][item]") + if(!isnum(item) && query_tree[item]) if(istype(query_tree[item], /list)) - usr << "[spaces] (" + to_chat(usr, "[spaces] (") + SDQL_testout(query_tree[item], indent + 2) - usr << "[spaces] )" + to_chat(usr, "[spaces] )") + else - usr << "[spaces] [query_tree[item]]" + to_chat(usr, "[spaces] [query_tree[item]]") + /proc/SDQL_from_objs(list/tree) if("world" in tree) @@ -320,7 +330,8 @@ if("or", "||") result = (result || val) else - usr << "SDQL2: Unknown op [op]" + to_chat(usr, "SDQL2: Unknown op [op]") + result = null else result = val @@ -388,11 +399,13 @@ return null else if(expression[start] == "\[" && start < expression.len) if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") - usr << "Invalid ref syntax: [expression[start + 1]]" + to_chat(usr, "Invalid ref syntax: [expression[start + 1]]") + return null v = locate("\[[expression[start + 1]]\]") if(!v) - usr << "Invalid ref: [expression[start + 1]]" + to_chat(usr, "Invalid ref: [expression[start + 1]]") + return null start++ else @@ -448,7 +461,8 @@ else if(char == "'") if(word != "") - usr << "SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again.") + return null word = "'" @@ -468,7 +482,8 @@ word += char if(i > len) - usr << "SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again." + to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again.") + return null query_list += "[word]'" @@ -476,7 +491,8 @@ else if(char == "\"") if(word != "") - usr << "SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again." + to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again.") + return null word = "\"" @@ -496,7 +512,8 @@ word += char if(i > len) - usr << "SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again." + to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again.") + return null query_list += "[word]\"" diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index f2ec46111ba..e564876c39f 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -60,7 +60,8 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 - usr << "SQDL2 Parsing Error: [error_message]" + to_chat(usr, "SQDL2 Parsing Error: [error_message]") + return query.len + 1 /datum/SDQL_parser/proc/parse() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 494961eb767..936fd7b3404 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -9,7 +9,8 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) - src << "Error: Admin-PM: You cannot send adminhelps (Muted)." + to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") + return adminhelped = 1 //Determines if they get the message to reply by clicking the name. @@ -112,17 +113,22 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]" for(var/client/X in mentorholders + modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' - X << msg + to_chat(X, 'sound/effects/adminhelp.ogg') + + to_chat(X, msg) + if("Adminhelp") msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]" for(var/client/X in modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) - X << 'sound/effects/adminhelp.ogg' - X << msg + to_chat(X, 'sound/effects/adminhelp.ogg') + + to_chat(X, msg) + //show it to the person adminhelping too - src << "[selected_type]: [original_msg]" + to_chat(src, "[selected_type]: [original_msg]") + var/admin_number_present = adminholders.len - admin_number_afk log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.") diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 14613d4567f..98d24ed5526 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -19,7 +19,8 @@ var/turf/T = pick_n_take(turfs) if(!T) - src << "Nowhere to jump to!" + to_chat(src, "Nowhere to jump to!") + return admin_forcemove(usr, T) @@ -56,7 +57,8 @@ feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! admin_forcemove(A, M.loc) else - A << "This mob is not located in the game world." + to_chat(A, "This mob is not located in the game world.") + /client/proc/jumptocoord(tx as num, ty as num, tz as num) set category = "Admin" @@ -85,7 +87,8 @@ keys += M.client var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys) if(!selection) - src << "No keys found." + to_chat(src, "No keys found.") + return var/mob/M = selection:mob log_admin("[key_name(usr)] jumped to [key_name(M)]") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 18fc3ef07c7..2bb2450d1ea 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -3,7 +3,8 @@ set category = null set name = "Admin PM Mob" if(!holder) - src << "Error: Admin-PM-Context: Only administrators may use this command." + to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.") + return if( !ismob(M) || !M.client ) return cmd_admin_pm(M.client,null) @@ -14,7 +15,8 @@ set category = "Admin" set name = "Admin PM Name" if(!holder) - src << "Error: Admin-PM-Panel: Only administrators may use this command." + to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") + return var/list/client/targets[0] for(var/client/T) @@ -37,7 +39,8 @@ set category = "Admin" set name = "Admin PM Key" if(!holder) - src << "Error: Admin-PM-Panel: Only administrators may use this command." + to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") + return var/list/client/targets[0] for(var/client/T) @@ -60,7 +63,8 @@ //Fetching a message if needed. src is the sender and C is the target client /client/proc/cmd_admin_pm(whom, msg, type = "PM") if(prefs.muted & MUTE_ADMINHELP) - src << "Error: Private-Message: You are unable to use PM-s (muted)." + to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") + return var/client/C @@ -73,7 +77,8 @@ if(!C) if(holder) - src << "Error: Private-Message: Client not found." + to_chat(src, "Error: Private-Message: Client not found.") + else adminhelp(msg) //admin we are replying to left. adminhelp instead return @@ -81,7 +86,8 @@ /*if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder) //send a warning to admins, but have a delay popup for mods if(holder.rights & R_ADMIN) - src << "\red Simultaneous PMs warning: that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]" + to_chat(src, "\red Simultaneous PMs warning: that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]") + else if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel") return*/ @@ -94,7 +100,8 @@ return if(!C) if(holder) - src << "Error: Admin-PM: Client not found." + to_chat(src, "Error: Admin-PM: Client not found.") + else adminhelp(msg) //admin we are replying to has vanished, adminhelp instead return @@ -125,7 +132,8 @@ recieve_pm_type = holder.rank else if(!C.holder) - src << "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden." + to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") + return var/recieve_message = "" @@ -133,7 +141,8 @@ if(holder && !C.holder) recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n" if(C.adminhelped) - C << recieve_message + to_chat(C, recieve_message) + C.adminhelped = 0 //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn @@ -150,8 +159,10 @@ return recieve_message = "[type] from-[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]: [msg]" - C << recieve_message - src << "[send_pm_type][type] to-[key_name(C, src, holder ? 1 : 0, type)]: [msg]" + to_chat(C, recieve_message) + + to_chat(src, "[send_pm_type][type] to-[key_name(C, src, holder ? 1 : 0, type)]: [msg]") + /*if(holder && !C.holder) C.last_pm_recieved = world.time @@ -160,7 +171,8 @@ //play the recieving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this if(C.prefs.sound & SOUND_ADMINHELP) - C << 'sound/effects/adminhelp.ogg' + to_chat(C, 'sound/effects/adminhelp.ogg') + log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") //we don't use message_admins here because the sender/receiver might get it too @@ -172,17 +184,21 @@ switch(type) if("Mentorhelp") if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]" + to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") + if("Adminhelp") if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]" + to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") + else if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) - X << "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]" + to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") + /client/proc/cmd_admin_irc_pm() if(prefs.muted & MUTE_ADMINHELP) - src << "Error: Private-Message: You are unable to use PM-s (muted)." + to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") + return var/msg = input(src,"Message:", "Private message to admins on IRC / 400 character limit") as text|null @@ -193,17 +209,21 @@ sanitize(msg) if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations. Probably easier to do this on the bots ends. - src << "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting" - src << "\blue [msg]" + to_chat(src, "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting") + + to_chat(src, "\blue [msg]") + return send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]") - src << "IRC PM to-IRC-Admins: [msg]" + to_chat(src, "IRC PM to-IRC-Admins: [msg]") + log_admin("PM: [key_name(src)]->IRC: [msg]") for(var/client/X in admins) if(X == src) continue if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) - X << "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]" + to_chat(X, "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]") + diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 63ae34e248d..2cd44302a1d 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -12,7 +12,8 @@ if(check_rights(R_ADMIN,0)) for(var/client/C in admins) if(R_ADMIN & C.holder.rights) - C << "ADMIN: [key_name(usr, 1)] ([admin_jump_link(mob, "holder")]): [msg]" + to_chat(C, "ADMIN: [key_name(usr, 1)] ([admin_jump_link(mob, "holder")]): [msg]") + feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -35,6 +36,7 @@ spanclass = "mod_channel_admin" for(var/client/C in admins) if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) - C << "MOD: [key_name(usr, 1)] ([admin_jump_link(mob, C.holder)]): [msg]" + to_chat(C, "MOD: [key_name(usr, 1)] ([admin_jump_link(mob, C.holder)]): [msg]") + feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index 400c60b2dea..de28cfab042 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -14,7 +14,8 @@ for(var/mob/M in mob_list) if((M.mind && M.mind.special_role && M.client) || (M.client && M.client.holder && (M.client.holder.rights & R_ADMIN)) ) - M << "AOOC: [display_name]: [msg]" + to_chat(M, "AOOC: [display_name]: [msg]") + log_ooc("(ANTAG) [key] : [msg]") diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index f4e163394cb..f6f7f985fea 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -3,30 +3,36 @@ set name = "Check Piping" set background = 1 if(!src.holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(alert("WARNING: This command should not be run on a live server. Do you want to continue?", "Check Piping", "No", "Yes") == "No") return - usr << "Checking for disconnected pipes..." + to_chat(usr, "Checking for disconnected pipes...") + //all plumbing - yes, some things might get stated twice, doesn't matter. for (var/obj/machinery/atmospherics/plumbing in world) if (plumbing.nodealert) - usr << "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])" + to_chat(usr, "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])") + //Manifolds for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world) if (!pipe.node1 || !pipe.node2 || !pipe.node3) - usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])" + to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") + //Pipes for (var/obj/machinery/atmospherics/pipe/simple/pipe in world) if (!pipe.node1 || !pipe.node2) - usr << "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])" + to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") + + + to_chat(usr, "Checking for overlapping pipes...") - usr << "Checking for overlapping pipes..." next_turf: for(var/turf/T in world) for(var/dir in cardinal) @@ -35,15 +41,18 @@ if(dir & pipe.initialize_directions) check++ if(check > 1) - usr << "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])" + to_chat(usr, "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])") + continue next_turf - usr << "Done" + to_chat(usr, "Done") + /client/proc/powerdebug() set category = "Mapping" set name = "Check Power" if(!src.holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -51,9 +60,11 @@ if (!PN.nodes || !PN.nodes.len) if(PN.cables && (PN.cables.len > 1)) var/obj/structure/cable/C = PN.cables[1] - usr << "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]" + to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") + if (!PN.cables || (PN.cables.len < 10)) if(PN.cables && (PN.cables.len > 1)) var/obj/structure/cable/C = PN.cables[1] - usr << "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]" \ No newline at end of file + to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") + diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 56e8fe30217..93a8dd8abac 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -4,7 +4,8 @@ set name = "Change Custom Event" if(!holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null @@ -19,10 +20,14 @@ custom_event_msg = input - world << "

Custom Event

" - world << "

A custom event is starting. OOC Info:

" - world << "[html_encode(custom_event_msg)]" - world << "
" + to_chat(world, "

Custom Event

") + + to_chat(world, "

A custom event is starting. OOC Info:

") + + to_chat(world, "[html_encode(custom_event_msg)]") + + to_chat(world, "
") + // normal verb for players to view info /client/verb/cmd_view_custom_event() @@ -30,11 +35,17 @@ set name = "Custom Event Info" if(!custom_event_msg || custom_event_msg == "") - src << "There currently is no known custom event taking place." - src << "Keep in mind: it is possible that an admin has not properly set this." + to_chat(src, "There currently is no known custom event taking place.") + + to_chat(src, "Keep in mind: it is possible that an admin has not properly set this.") + return - src << "

Custom Event

" - src << "

A custom event is taking place. OOC Info:

" - src << "[html_encode(custom_event_msg)]" - src << "
" + to_chat(src, "

Custom Event

") + + to_chat(src, "

A custom event is taking place. OOC Info:

") + + to_chat(src, "[html_encode(custom_event_msg)]") + + to_chat(src, "
") + diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index b448099f635..a2663d0ba53 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -10,11 +10,13 @@ return if(prefs.muted & MUTE_DEADCHAT) - src << "You cannot send DSAY messages (muted)." + to_chat(src, "You cannot send DSAY messages (muted).") + return if(!(prefs.toggles & CHAT_DEAD)) - src << "You have deadchat muted." + to_chat(src, "You have deadchat muted.") + 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 9c6f671fba7..f5ff82bc040 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -72,7 +72,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(!procname) return if(targetselected && !hascall(target,procname)) - usr << "Error: callproc(): target has no such call [procname]." + to_chat(usr, "Error: callproc(): target has no such call [procname].") + return var/list/lst = get_callproc_args() @@ -81,7 +82,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(targetselected) if(!target) - usr << "Error: callproc(): owner of proc no longer exists." + to_chat(usr, "Error: callproc(): owner of proc no longer exists.") + return message_admins("[key_name_admin(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") @@ -92,7 +94,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc - usr << "[procname] returned: [returnval ? returnval : "null"]" + to_chat(usr, "[procname] returned: [returnval ? returnval : "null"]") + feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/callproc_datum(var/A as null|area|mob|obj|turf) @@ -107,7 +110,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that return if(!hascall(A,procname)) - usr << "Error: callproc_datum(): target has no such call [procname]." + to_chat(usr, "Error: callproc_datum(): target has no such call [procname].") + return var/list/lst = get_callproc_args() @@ -115,14 +119,16 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that return if(!A || !IsValidSrc(A)) - usr << "Error: callproc_datum(): owner of proc no longer exists." + to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists.") + return message_admins("[key_name_admin(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") spawn() var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc - usr << "[procname] returned: [returnval ? returnval : "null"]" + to_chat(usr, "[procname] returned: [returnval ? returnval : "null"]") + feedback_add_details("admin_verb","DPC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -506,41 +512,59 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/areas_without_intercom = areas_all - areas_with_intercom var/list/areas_without_camera = areas_all - areas_with_camera - world << "AREAS WITHOUT AN APC:" + to_chat(world, "AREAS WITHOUT AN APC:") + for(var/areatype in areas_without_APC) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT AN AIR ALARM:") - world << "AREAS WITHOUT AN AIR ALARM:" for(var/areatype in areas_without_air_alarm) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITH TOO MANY APCS:") - world << "AREAS WITH TOO MANY APCS:" for(var/areatype in areas_with_multiple_APCs) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITH TOO MANY AIR ALARMS:") - world << "AREAS WITH TOO MANY AIR ALARMS:" for(var/areatype in areas_with_multiple_air_alarms) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT A REQUEST CONSOLE:") - world << "AREAS WITHOUT A REQUEST CONSOLE:" for(var/areatype in areas_without_RC) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT ANY LIGHTS:") - world << "AREAS WITHOUT ANY LIGHTS:" for(var/areatype in areas_without_light) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT A LIGHT SWITCH:") - world << "AREAS WITHOUT A LIGHT SWITCH:" for(var/areatype in areas_without_LS) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT ANY INTERCOMS:") - world << "AREAS WITHOUT ANY INTERCOMS:" for(var/areatype in areas_without_intercom) - world << "* [areatype]" + to_chat(world, "* [areatype]") + + + to_chat(world, "AREAS WITHOUT ANY CAMERAS:") - world << "AREAS WITHOUT ANY CAMERAS:" for(var/areatype in areas_without_camera) - world << "* [areatype]" + to_chat(world, "* [areatype]") + /client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list) set category = "Event" @@ -1166,21 +1190,29 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Silicons","Clients","Respawnable Mobs")) if("Players") - usr << jointext(player_list,",") + to_chat(usr, jointext(player_list,",")) + if("Admins") - usr << jointext(admins,",") + to_chat(usr, jointext(admins,",")) + if("Mobs") - usr << jointext(mob_list,",") + to_chat(usr, jointext(mob_list,",")) + if("Living Mobs") - usr << jointext(living_mob_list,",") + to_chat(usr, jointext(living_mob_list,",")) + if("Dead Mobs") - usr << jointext(dead_mob_list,",") + to_chat(usr, jointext(dead_mob_list,",")) + if("Silicons") - usr << jointext(silicon_mob_list,",") + to_chat(usr, jointext(silicon_mob_list,",")) + if("Clients") - usr << jointext(clients,",") + to_chat(usr, jointext(clients,",")) + if("Respawnable Mobs") - usr << jointext(respawnable_list,",") + to_chat(usr, jointext(respawnable_list,",")) + /client/proc/cmd_admin_toggle_block(var/mob/M,var/block) diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 6c5db7cd1e6..abef5d0e08a 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -15,9 +15,11 @@ if(T.active_hotspot) burning = 1 - usr << "\blue @[target.x],[target.y]: O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]" + to_chat(usr, "\blue @[target.x],[target.y]: O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]") + for(var/datum/gas/trace_gas in GM.trace_gases) - usr << "[trace_gas.type]: [trace_gas.moles]" + to_chat(usr, "[trace_gas.type]: [trace_gas.moles]") + message_admins("[key_name_admin(usr)] has checked the air status of [T]") log_admin("[key_name(usr)] has checked the air status of [T]") @@ -130,9 +132,11 @@ if(!check_rights(R_DEBUG)) return - usr << "Jobbans active in this round." + to_chat(usr, "Jobbans active in this round.") + for(var/t in jobban_keylist) - usr << "[t]" + to_chat(usr, "[t]") + message_admins("[key_name_admin(usr)] has printed the jobban log") log_admin("[key_name(usr)] has printed the jobban log") @@ -149,10 +153,12 @@ if(!filter) return - usr << "Jobbans active in this round." + to_chat(usr, "Jobbans active in this round.") + for(var/t in jobban_keylist) if(findtext(t, filter)) - usr << "[t]" + to_chat(usr, "[t]") + message_admins("[key_name_admin(usr)] has searched the jobban log for [filter]") log_admin("[key_name(usr)] has searched the jobban log for [filter]") diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm index 62b46fba8ee..e77ef3c65fe 100644 --- a/code/modules/admin/verbs/dice.dm +++ b/code/modules/admin/verbs/dice.dm @@ -12,11 +12,13 @@ var/dice = num2text(sum) + "d" + num2text(side) if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes") - world << "

The dice have been rolled by Gods!

" + to_chat(world, "

The dice have been rolled by Gods!

") + var/result = roll(dice) if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes") - world << "

Gods rolled [dice], result is [result]

" + to_chat(world, "

Gods rolled [dice], result is [result]

") + message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) \ No newline at end of file diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm index 2d3314bd045..e17e70ce637 100644 --- a/code/modules/admin/verbs/freeze.dm +++ b/code/modules/admin/verbs/freeze.dm @@ -10,7 +10,8 @@ var/global/list/frozen_mob_list = list() set category = "Special Verbs" set name = "Freeze" if(!holder) - src << "Error: Freeze: Only administrators may use this command." + to_chat(src, "Error: Freeze: Only administrators may use this command.") + return if(!istype(M)) return if(!check_rights(R_ADMIN)) return @@ -26,7 +27,8 @@ var/global/list/frozen_mob_list = list() /mob/living/proc/admin_Freeze(var/client/admin) if(istype(admin)) - src << "You have been frozen by [key_name(admin)]" + to_chat(src, "You have been frozen by [key_name(admin)]") + message_admins("[key_name_admin(admin)] froze [key_name_admin(src)]") log_admin("[key_name(admin)] froze [key_name(src)]") @@ -42,7 +44,8 @@ var/global/list/frozen_mob_list = list() /mob/living/proc/admin_unFreeze(var/client/admin) if(istype(admin)) - src << "You have been unfrozen by [key_name(admin)]" + to_chat(src, "You have been unfrozen by [key_name(admin)]") + message_admins("\blue [key_name_admin(admin)] unfroze [key_name_admin(src)]") log_admin("[key_name(admin)] unfroze [key_name(src)]") @@ -85,11 +88,13 @@ var/global/list/frozen_mob_list = list() set category = "Special Verbs" set name = "Freeze Mech" if(!holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return var/obj/mecha/M = O if(!istype(M,/obj/mecha)) - src << "\red This can only be used on Mechs!" + to_chat(src, "\red This can only be used on Mechs!") + return else if(usr) @@ -101,7 +106,8 @@ var/global/list/frozen_mob_list = list() M.overlays += adminomaly if(M.occupant) M.removeVerb(/obj/mecha/verb/eject) - M.occupant << "You have been frozen by [key]" + to_chat(M.occupant, "You have been frozen by [key]") + message_admins("\blue [key_name_admin(usr)] froze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] froze [key_name(M.occupant)] in a [M.name]") else @@ -112,7 +118,8 @@ var/global/list/frozen_mob_list = list() M.overlays -= adminomaly if(M.occupant) M.addVerb(/obj/mecha/verb/eject) - M.occupant << "You have been unfrozen by [key]" + to_chat(M.occupant, "You have been unfrozen by [key]") + message_admins("\blue [key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] unfroze [M.occupant.name]/[M.occupant.ckey] in a [M.name]") else diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index cf939c0ae9f..fe1e0bdf416 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -24,16 +24,19 @@ set category = null if(!src.holder) - src << "Only Admins may use this command." + to_chat(src, "Only Admins may use this command.") + return var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in clients if(!istype(target,/client)) - src << "Error: giveruntimelog(): Client not found." + to_chat(src, "Error: giveruntimelog(): Client not found.") + return target.verbs |= /client/proc/getruntimelog - target << "You have been granted access to runtime logs. Please use them responsibly or risk being banned." + to_chat(target, "You have been granted access to runtime logs. Please use them responsibly or risk being banned.") + return @@ -52,8 +55,10 @@ return message_admins("[key_name_admin(src)] accessed file: [path]") - src << ftp( file(path) ) - src << "Attempting to send file, this may take a fair few minutes if the file is very large." + src << ftp(file(path)) + + to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") + return @@ -72,8 +77,10 @@ return message_admins("[key_name_admin(src)] accessed file: [path]") - src << ftp( file(path) ) - src << "Attempting to send file, this may take a fair few minutes if the file is very large." + src << ftp(file(path)) + + to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") + return @@ -87,9 +94,10 @@ var/path = "data/logs/[time2text(world.realtime,"YYYY/MM-Month/DD-Day")].log" if( fexists(path) ) - src << ftp( file(path) ) + src << ftp(file(path)) + else - src << "Error: view_txt_log(): File not found/Invalid path([path])." + to_chat(src, "Error: view_txt_log(): File not found/Invalid path([path]).") return feedback_add_details("admin_verb","VTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -102,10 +110,13 @@ var/path = "data/logs/[time2text(world.realtime,"YYYY/MM-Month/DD-Day")] Attack.log" if( fexists(path) ) - src << ftp( file(path) ) + src << ftp(file(path)) + else - src << "Error: view_atk_log(): File not found/Invalid path([path])." + to_chat(src, "Error: view_atk_log(): File not found/Invalid path([path]).") + return - usr << run( file(path) ) + usr << run(file(path)) + feedback_add_details("admin_verb","SSAL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm index e64cbf66574..a2377a2c3a6 100644 --- a/code/modules/admin/verbs/honksquad.dm +++ b/code/modules/admin/verbs/honksquad.dm @@ -5,13 +5,16 @@ var/global/sent_honksquad = 0 /client/proc/honksquad() if(!ticker) - usr << "The game hasn't started yet!" + to_chat(usr, "The game hasn't started yet!") + return if(world.time < 6000) - usr << "There are [(6000-world.time)/10] seconds remaining before it may be called." + to_chat(usr, "There are [(6000-world.time)/10] seconds remaining before it may be called.") + return if(sent_honksquad == 1) - usr << "Clown Planet has already dispatched a HONKsquad." + to_chat(usr, "Clown Planet has already dispatched a HONKsquad.") + return if(alert("Do you want to send in the HONKsquad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") return @@ -25,7 +28,8 @@ var/global/sent_honksquad = 0 return if(sent_honksquad) - usr << "Looks like someone beat you to it. HONK." + to_chat(usr, "Looks like someone beat you to it. HONK.") + return sent_honksquad = 1 @@ -64,7 +68,8 @@ var/global/sent_honksquad = 0 //So they don't forget their code or mission. new_honksquad.mind.store_memory("Mission: \red [input].") - new_honksquad << "\blue You are a HONKsquad. [!honk_leader_selected?"commando":"LEADER"] in the service of Clown Planet. You are called in cases of exteme low levels of HONK. You are NOT authorized to kill. \nYour current mission is: \red[input]" + to_chat(new_honksquad, "\blue You are a HONKsquad. [!honk_leader_selected?"commando":"LEADER"] in the service of Clown Planet. You are called in cases of exteme low levels of HONK. You are NOT authorized to kill. \nYour current mission is: \red[input]") + honksquad_number-- diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 0af366ef215..0dac4624f51 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -188,7 +188,8 @@ var/list/admin_verbs_show_debug_verbs = list( count++ atom_list += A - world << "There are [count] objects of type [type_path] on z-level [num_level]." + to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level].") + feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_all() @@ -209,5 +210,6 @@ var/list/admin_verbs_show_debug_verbs = list( if(istype(A,type_path)) count++ - world << "There are [count] objects of type [type_path] in the game world." + to_chat(world, "There are [count] objects of type [type_path] in the game world.") + feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index aa05d810810..701ff9e0ad8 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -30,7 +30,8 @@ for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) - usr << "It is forbidden to edit this object's variables." + to_chat(usr, "It is forbidden to edit this object's variables.") + return var/list/names = list() @@ -55,43 +56,53 @@ if(!check_rights(R_DEBUG)) return if(isnull(var_value)) - usr << "Unable to determine variable type." + to_chat(usr, "Unable to determine variable type.") + else if(isnum(var_value)) - usr << "Variable appears to be NUM." + to_chat(usr, "Variable appears to be NUM.") + default = "num" dir = 1 else if(istext(var_value)) - usr << "Variable appears to be TEXT." + to_chat(usr, "Variable appears to be TEXT.") + default = "text" else if(isloc(var_value)) - usr << "Variable appears to be REFERENCE." + to_chat(usr, "Variable appears to be REFERENCE.") + default = "reference" else if(isicon(var_value)) - usr << "Variable appears to be ICON." + to_chat(usr, "Variable appears to be ICON.") + var_value = "\icon[var_value]" default = "icon" else if(istype(var_value,/atom) || istype(var_value,/datum)) - usr << "Variable appears to be TYPE." + to_chat(usr, "Variable appears to be TYPE.") + default = "type" else if(istype(var_value,/list)) - usr << "Variable appears to be LIST." + to_chat(usr, "Variable appears to be LIST.") + default = "list" else if(istype(var_value,/client)) - usr << "Variable appears to be CLIENT." + to_chat(usr, "Variable appears to be CLIENT.") + default = "cancel" else - usr << "Variable appears to be FILE." + to_chat(usr, "Variable appears to be FILE.") + default = "file" - usr << "Variable contains: [var_value]" + to_chat(usr, "Variable contains: [var_value]") + if(dir) switch(var_value) if(1) @@ -113,7 +124,8 @@ else dir = null if(dir) - usr << "If a direction, direction is: [dir]" + to_chat(usr, "If a direction, direction is: [dir]") + var/class = input("What kind of variable?","Variable Type",default) as null|anything in list("text", "num","type","icon","file","edit referenced object","restore to default") diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index f4f348bb72a..2e7ced5f038 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -18,7 +18,8 @@ var/list/forbidden_varedit_object_types = list( set name = "Edit Ticker Variables" if (ticker == null) - src << "Game hasn't started yet." + to_chat(src, "Game hasn't started yet.") + else src.modify_variables(ticker) feedback_add_details("admin_verb","ETV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -53,7 +54,8 @@ var/list/forbidden_varedit_object_types = list( var/type_text = input("Enter type:", "Type") as null|message var_value = text2path(type_text) if(!var_value) - src << "[type_text] is not a valid path!" + to_chat(src, "[type_text] is not a valid path!") + if("reference") var_value = input("Select reference:","Reference") as null|mob|obj|turf|area in world @@ -106,7 +108,8 @@ var/list/forbidden_varedit_object_types = list( var/type_text = input("Enter type:", "Type") as null|message var_value = text2path(type_text) if(!var_value) - src << "[type_text] is not a valid path!" + to_chat(src, "[type_text] is not a valid path!") + if("reference") var_value = input("Select reference:","Reference") as mob|obj|turf|area in world @@ -135,7 +138,8 @@ var/list/forbidden_varedit_object_types = list( /client/proc/mod_list(var/list/L) if(!check_rights(R_VAREDIT)) return - if(!istype(L,/list)) src << "Not a List." + if(!istype(L,/list)) + to_chat(src, "Not a List.") if(L.len > 1000) var/confirm = alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", "Continue", "Abort") @@ -149,7 +153,8 @@ var/list/forbidden_varedit_object_types = list( var/a = L[1] if(istext(a) && L[a] != null) assoc = 1 //This is pretty weak test but i can't think of anything else - usr << "List appears to be associative." + to_chat(usr, "List appears to be associative.") + var/list/names = null if(!assoc) @@ -182,12 +187,14 @@ var/list/forbidden_varedit_object_types = list( default = variable_to_type(variable) - usr << "Variable contains: [variable]" + to_chat(usr, "Variable contains: [variable]") + if(default == "num") dir = dir2text(variable) if(dir) - usr << "If a direction, direction is: [dir]" + to_chat(usr, "If a direction, direction is: [dir]") + var/class = "text" var/list/allowed_types = list("text", "num","type", "type from text", "reference","mob reference", "icon","file","list","edit referenced object","restore to default","DELETE FROM LIST") @@ -276,11 +283,13 @@ var/list/forbidden_varedit_object_types = list( for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) - usr << "It is forbidden to edit this object's variables." + to_chat(usr, "It is forbidden to edit this object's variables.") + return if(istype(O, /client) && (param_var_name == "ckey" || param_var_name == "key")) - usr << "You cannot edit ckeys on client objects." + to_chat(usr, "You cannot edit ckeys on client objects.") + return var/class @@ -289,7 +298,8 @@ var/list/forbidden_varedit_object_types = list( if(param_var_name) if(!param_var_name in O.vars) - src << "A variable with this name ([param_var_name]) doesn't exist in this atom ([O])" + to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this atom ([O])") + return if(param_var_name == "holder" || (param_var_name in locked)) @@ -330,11 +340,13 @@ var/list/forbidden_varedit_object_types = list( else if(default == "icon") var_value = "\icon[var_value]" - usr << "Variable contains: [var_value]" + to_chat(usr, "Variable contains: [var_value]") + if(dir) dir = dir2text(var_value) if(dir) - usr << "If a direction, direction is: [dir]" + to_chat(usr, "If a direction, direction is: [dir]") + var/list/allowed_types = list("text", "num","type","reference","mob reference", "path", "matrix", "icon","file","list","edit referenced object","restore to default") if(src.holder && src.holder.marked_datum) @@ -402,7 +414,8 @@ var/list/forbidden_varedit_object_types = list( var/path_text = input("Enter path:", "Path",O.vars[variable]) as null|text var/var_new = text2path(path_text) if(!var_new && path_text != null) // So aborting doesn't bother the VVer - usr << "[path_text] does not appear to be a valid path." + to_chat(usr, "[path_text] does not appear to be a valid path.") + return O.vars[variable] = var_new @@ -410,7 +423,8 @@ var/list/forbidden_varedit_object_types = list( var/matrix_text = input("Enter a, b, c, d, e, and f, separated by a space.", "Matrix", "1 0 0 0 1 0") as null|text var/var_new = text2matrix(matrix_text) if(!var_new && matrix_text != null) - usr << "[matrix_text] is not a valid matrix string." + to_chat(usr, "[matrix_text] is not a valid matrix string.") + return O.vars[variable] = var_new var_as_text = "matrix([matrix_text])" @@ -449,51 +463,63 @@ var/list/forbidden_varedit_object_types = list( /proc/variable_to_type(var/variable) var/class if(isnull(variable)) - usr << "Unable to determine variable type." + to_chat(usr, "Unable to determine variable type.") + class = null else if(isnum(variable)) - usr << "Variable appears to be NUM." + to_chat(usr, "Variable appears to be NUM.") + class = "num" else if(istext(variable)) - usr << "Variable appears to be TEXT." + to_chat(usr, "Variable appears to be TEXT.") + class = "text" else if(isloc(variable)) - usr << "Variable appears to be REFERENCE." + to_chat(usr, "Variable appears to be REFERENCE.") + class = "reference" else if(isicon(variable)) - usr << "Variable appears to be ICON." + to_chat(usr, "Variable appears to be ICON.") + variable = "\icon[variable]" class = "icon" else if(istype(variable,/matrix)) - usr << "Variable appears to be MATRIX" + to_chat(usr, "Variable appears to be MATRIX") + class = "matrix" else if(istype(variable,/atom) || istype(variable,/datum)) - usr << "Variable appears to be TYPE." + to_chat(usr, "Variable appears to be TYPE.") + class = "type" else if(istype(variable,/list)) - usr << "Variable appears to be LIST." + to_chat(usr, "Variable appears to be LIST.") + class = "list" else if(istype(variable,/client)) - usr << "Variable appears to be CLIENT." + to_chat(usr, "Variable appears to be CLIENT.") + class = "cancel" else if(ispath(variable)) - usr << "Variable appears to be PATH." + to_chat(usr, "Variable appears to be PATH.") + class = "path" else if(isfile(variable)) - usr << "Variable appears to be FILE." + to_chat(usr, "Variable appears to be FILE.") + class = "file" else - usr << "Variable type is UNKNOWN." + to_chat(usr, "Variable type is UNKNOWN.") + class = null return class \ No newline at end of file diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 038c9a27b3f..a5f97673afc 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -377,7 +377,8 @@ client/proc/one_click_antag() //So they don't forget their code or mission. - new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red [input]" + to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red [input]") + numagents-- if(numagents >= 6) @@ -482,8 +483,10 @@ client/proc/one_click_antag() break new_vox.key = theghost.key - new_vox << "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red [input]" - new_vox << "\red Don't forget to turn on your nitrogen internals!" + to_chat(new_vox, "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red [input]") + + to_chat(new_vox, "\red Don't forget to turn on your nitrogen internals!") + raiders-- if(raiders > max_raiders) @@ -612,7 +615,8 @@ client/proc/one_click_antag() newMember.key = theghost.key teamOneMembers-- - newMember << "You are a member of the GREEN Thunderdome team! Gear up and help your team destroy the red team!" + to_chat(newMember, "You are a member of the GREEN Thunderdome team! Gear up and help your team destroy the red team!") + if(L.name == "tdome2") if(teamTwoMembers<=0) @@ -634,7 +638,8 @@ client/proc/one_click_antag() newMember.key = theghost.key teamTwoMembers-- - newMember << "You are a member of the RED Thunderdome team! Gear up and help your team destroy the green team!" + to_chat(newMember, "You are a member of the RED Thunderdome team! Gear up and help your team destroy the green team!") + else return 0 return 1 \ No newline at end of file diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 97e7f716a3c..052b00b69e4 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -21,10 +21,12 @@ hijack_objective.owner = H.mind H.mind.objectives += hijack_objective - H << "You are a Highlander. Kill all other Highlanders. There can be only one." + to_chat(H, "You are a Highlander. Kill all other Highlanders. There can be only one.") + var/obj_count = 1 for(var/datum/objective/OBJ in H.mind.objectives) - H << "Objective #[obj_count]: [OBJ.explanation_text]" + to_chat(H, "Objective #[obj_count]: [OBJ.explanation_text]") + obj_count++ for (var/obj/item/I in H) @@ -55,7 +57,8 @@ message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ONE! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1) log_admin("[key_name(usr)] used there can be only one.") nologevent = 1 - world << sound('sound/music/THUNDERDOME.ogg') + to_chat(world, sound('sound/music/THUNDERDOME.ogg')) + /client/proc/only_me() if(!ticker) @@ -73,10 +76,12 @@ hijack_objective.owner = H.mind H.mind.objectives += hijack_objective - H << "You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side." + to_chat(H, "You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side.") + var/obj_count = 1 for(var/datum/objective/OBJ in H.mind.objectives) - H << "Objective #[obj_count]: [OBJ.explanation_text]" + to_chat(H, "Objective #[obj_count]: [OBJ.explanation_text]") + obj_count++ var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id) @@ -101,4 +106,5 @@ message_admins("[key_name_admin(usr)] used THERE CAN BE ONLY ME! -NO ATTACK LOGS WILL BE SENT TO ADMINS FROM THIS POINT FORTH-", 1) log_admin("[key_name(usr)] used there can be only me.") nologevent = 1 - world << sound('sound/music/THUNDERDOME.ogg') \ No newline at end of file + to_chat(world, sound('sound/music/THUNDERDOME.ogg')) + diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index 016b4c891a0..cdf276d03a6 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -21,7 +21,8 @@ continue qdel(I) - H << "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs." + to_chat(H, "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.") + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_r_hand) @@ -75,13 +76,16 @@ if(H.l_hand == src) return var/mob/A = H.LAssailant if((H in team_alpha) && (A in team_alpha)) - A << "He's on your team!" + to_chat(A, "He's on your team!") + return else if((H in team_bravo) && (A in team_bravo)) - A << "He's on your team!" + to_chat(A, "He's on your team!") + return else if(!A in team_alpha && !A in team_bravo) - A << "You're not part of the dodgeball game, sorry!" + to_chat(A, "You're not part of the dodgeball game, sorry!") + return else playsound(src, 'sound/items/dodgeball.ogg', 50, 1) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index ab132d792ec..442478229f6 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -17,7 +17,8 @@ var/list/sounds_cache = list() message_admins("[key_name_admin(src)] played sound [S]", 1) for(var/mob/M in player_list) if(M.client.prefs.sound & SOUND_MIDI) - M << uploaded_sound + to_chat(M, uploaded_sound) + feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -86,11 +87,13 @@ var/list/sounds_cache = list() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'cubanpetetime.ogg' + to_chat(M, 'cubanpetetime.ogg') + for(var/mob/living/carbon/human/CP in world) if(CP.real_name=="Cuban Pete" && CP.key!="Rosham") - CP << "Your body can't contain the rhumba beat" + to_chat(CP, "Your body can't contain the rhumba beat") + CP.gib() @@ -102,7 +105,8 @@ var/list/sounds_cache = list() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'bananaphone.ogg' + to_chat(M, 'bananaphone.ogg') + client/proc/space_asshole() @@ -113,7 +117,8 @@ client/proc/space_asshole() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'sound/music/space_asshole.ogg' + to_chat(M, 'sound/music/space_asshole.ogg') + client/proc/honk_theme() @@ -124,4 +129,5 @@ client/proc/honk_theme() for(var/mob/M in world) if(M.client) if(M.client.midis) - M << 'honk_theme.ogg'*/ + to_chat(M, 'honk_theme.ogg')*/ + diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index e6c5659f63b..208a69df52e 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -4,7 +4,8 @@ if(istype(O,/obj/singularity)) if(config.forbid_singulo_possession) - usr << "It is forbidden to possess singularities." + to_chat(usr, "It is forbidden to possess singularities.") + return var/turf/T = get_turf(O) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 8d41f49a918..f70940e9ae8 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -7,7 +7,8 @@ if(usr.client) if(usr.client.prefs.muted & MUTE_PRAY) - usr << "\red You cannot pray (muted)." + to_chat(usr, "\red You cannot pray (muted).") + return if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return @@ -17,9 +18,11 @@ for(var/client/X in admins) if(check_rights(R_EVENT,0,X.mob)) - X << msg + to_chat(X, msg) + + + to_chat(usr, "Your prayers have been received by the gods.") - usr << "Your prayers have been received by the gods." feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") @@ -30,7 +33,8 @@ for(var/client/X in admins) if(R_EVENT & X.holder.rights) - X << msg + to_chat(X, msg) + /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -38,7 +42,8 @@ for(var/client/X in admins) if(check_rights(R_EVENT,0,X.mob)) - X << msg + to_chat(X, msg) + /proc/HONK_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -46,7 +51,8 @@ for(var/client/X in admins) if(R_EVENT & X.holder.rights) - X << msg + to_chat(X, msg) + /proc/ERT_Announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) @@ -54,15 +60,15 @@ for(var/client/X in admins) if(check_rights(R_EVENT,0,X.mob)) - X << msg - + to_chat(X, msg) + + /proc/Nuke_request(text , mob/Sender) var/nuke_code = get_nuke_code() var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "NUKE CODE REQUEST: [key_name(Sender)] (PP) (VV) (SM) ([admin_jump_link(Sender, "holder")]) (CA) (BSA) (RPLY): [msg]" - + for(var/client/X in admins) if(check_rights(R_EVENT,0,X.mob)) - X << msg - X << "The nuke code is [nuke_code]." - \ No newline at end of file + to_chat(X, msg) + to_chat(X, "The nuke code is [nuke_code].") diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 970ebfee0ef..71afd3eeb0b 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -39,7 +39,8 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(prisoner), slot_w_uniform) prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) spawn(50) - M << "\red You have been sent to the prison station!" + to_chat(M, "\red You have been sent to the prison station!") + log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -61,7 +62,8 @@ if(usr) if (usr.client) if(usr.client.holder) - M << "\bold You hear a voice in your head... \italic [msg]" + to_chat(M, "\bold You hear a voice in your head... \italic [msg]") + log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") message_admins("\blue \bold SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) @@ -91,12 +93,14 @@ msg += "[key_name_admin(C)]: account is [C.player_age] days old
" if(missing_ages) - src << "Some accounts did not have proper ages set in their clients. This function requires database to be present" + to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present") + if(msg != "") src << browse(msg, "window=Player_age_check") else - src << "No matches for that age range found." + to_chat(src, "No matches for that age range found.") + /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE @@ -110,7 +114,8 @@ if (!msg) return - world << "[msg]" + to_chat(world, "[msg]") + log_admin("GlobalNarrate: [key_name(usr)] : [msg]") message_admins("\blue \bold GlobalNarrate: [key_name_admin(usr)]: [msg]
", 1) feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -133,7 +138,8 @@ if( !msg ) return - M << msg + to_chat(M, msg) + log_admin("DirectNarrate: [key_name(usr)] to ([key_name(M)]): [msg]") message_admins("\blue \bold DirectNarrate: [key_name_admin(usr)] to ([key_name_admin(M)]): [msg]
", 1) feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -146,7 +152,8 @@ return M.status_flags ^= GODMODE - usr << "\blue Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]" + to_chat(usr, "\blue Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]") + log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1) @@ -161,10 +168,12 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) if(!usr || !usr.client) return if(!check_rights(R_ADMIN|R_MOD)) - usr << "Error: cmd_admin_mute: You don't have permission to do this." + to_chat(usr, "Error: cmd_admin_mute: You don't have permission to do this.") + return if(!M.client) - usr << "Error: cmd_admin_mute: This mob doesn't have a client tied to it." + to_chat(usr, "Error: cmd_admin_mute: This mob doesn't have a client tied to it.") + if(!M.client) return @@ -185,7 +194,8 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) M.client.prefs.muted |= mute_type log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]") message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1) - M << "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin." + to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") + feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -198,7 +208,8 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]") message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1) - M << "You have been [muteunmute] from [mute_string]." + to_chat(M, "You have been [muteunmute] from [mute_string].") + feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_add_random_ai_law() @@ -235,18 +246,23 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) if(g.antagHUD) g.antagHUD = 0 // Disable it on those that have it enabled g.has_enabled_antagHUD = 2 // We'll allow them to respawn - g << "\red The Administrator has disabled AntagHUD " + to_chat(g, "\red The Administrator has disabled AntagHUD ") + config.antag_hud_allowed = 0 - src << "\red AntagHUD usage has been disabled" + to_chat(src, "\red AntagHUD usage has been disabled") + action = "disabled" else for(var/mob/dead/observer/g in get_ghosts()) if(!g.client.holder) // Add the verb back for all non-admin ghosts g.verbs += /mob/dead/observer/verb/toggle_antagHUD - g << "\blue The Administrator has enabled AntagHUD " // Notify all observers they can now use AntagHUD + to_chat(g, "\blue The Administrator has enabled AntagHUD ")// Notify all observers they can now use AntagHUD + + config.antag_hud_allowed = 1 action = "enabled" - src << "\blue AntagHUD usage has been enabled" + to_chat(src, "\blue AntagHUD usage has been enabled") + log_admin("[key_name(usr)] has [action] antagHUD usage for observers") @@ -263,19 +279,24 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) var/action="" if(config.antag_hud_restricted) for(var/mob/dead/observer/g in get_ghosts()) - g << "\blue The administrator has lifted restrictions on joining the round if you use AntagHUD" + to_chat(g, "\blue The administrator has lifted restrictions on joining the round if you use AntagHUD") + action = "lifted restrictions" config.antag_hud_restricted = 0 - src << "\blue AntagHUD restrictions have been lifted" + to_chat(src, "\blue AntagHUD restrictions have been lifted") + else for(var/mob/dead/observer/g in get_ghosts()) - g << "\red The administrator has placed restrictions on joining the round if you use AntagHUD" - g << "\red Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions " + to_chat(g, "\red The administrator has placed restrictions on joining the round if you use AntagHUD") + + to_chat(g, "\red Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions ") + g.antagHUD = 0 g.has_enabled_antagHUD = 0 action = "placed restrictions" config.antag_hud_restricted = 1 - src << "\red AntagHUD restrictions have been enabled" + to_chat(src, "\red AntagHUD restrictions have been enabled") + log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD") message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1) @@ -304,7 +325,8 @@ Traitors and the like can also be revived with the previous role mostly intact. break if(!G_found)//If a ghost was not found. - usr << "There is no active key like that in the game or the person is not currently a ghost." + to_chat(usr, "There is no active key like that in the game or the person is not currently a ghost.") + return if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something @@ -328,7 +350,8 @@ Traitors and the like can also be revived with the previous role mostly intact. //Now to give them their mind back. G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use new_xeno.key = G_found.key - new_xeno << "You have been fully respawned. Enjoy the game." + to_chat(new_xeno, "You have been fully respawned. Enjoy the game.") + message_admins("\blue [key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.", 1) return //all done. The ghost is auto-deleted @@ -433,7 +456,8 @@ Traitors and the like can also be revived with the previous role mostly intact. message_admins("\blue [key_name_admin(usr)] has respawned [key_name_admin(G_found)] as [new_character.real_name].", 1) - new_character << "You have been fully respawned. Enjoy the game." + to_chat(new_character, "You have been fully respawned. Enjoy the game.") + feedback_add_details("admin_verb","RSPCH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return new_character @@ -452,7 +476,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if(candidates.len) ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates else - usr << "Error: create_xeno(): no suitable candidates." + to_chat(usr, "Error: create_xeno(): no suitable candidates.") + if(!istext(ckey)) return 0 var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Hunter","Sentinel","Drone","Larva") @@ -484,7 +509,8 @@ Traitors and the like can also be revived with the previous role mostly intact. any = 1 //if no ghosts show up, any will just be 0 if(!any) if(notify) - src << "There doesn't appear to be any ghosts for you to select." + to_chat(src, "There doesn't appear to be any ghosts for you to select.") + return for(var/mob/M in mobs) @@ -558,7 +584,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Yes") communications_announcement.Announce(input, customname, , , , from); if("No") - world << "\red [from] available at all communications consoles." + to_chat(world, "\red [from] available at all communications consoles.") + for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) @@ -578,7 +605,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if("Yes") command_announcement.Announce(input, customname); if("No") - world << "\red New Nanotrasen Update available at all communication consoles." + to_chat(world, "\red New Nanotrasen Update available at all communication consoles.") + for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) @@ -589,7 +617,8 @@ Traitors and the like can also be revived with the previous role mostly intact. C.messagetitle.Add("[command_name()] Update") C.messagetext.Add(P.info) - //world << sound('sound/AI/commandreport.ogg') +// to_chat(world, sound('sound/AI/commandreport.ogg')) + log_admin("[key_name(src)] has created a communications report: [input]") message_admins("[key_name_admin(src)] has created a communications report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -621,7 +650,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if(job_master) for(var/datum/job/job in job_master.occupations) - src << "[job.title]: [job.total_positions]" + to_chat(src, "[job.title]: [job.total_positions]") + feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in view()) @@ -727,7 +757,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/list/L = M.get_contents() for(var/t in L) - usr << "[t]" + to_chat(usr, "[t]") + feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_view_range() @@ -809,9 +840,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!check_rights(R_ADMIN)) return - usr << text("\red Attack Log for []", mob) + to_chat(usr, text("\red Attack Log for []", mob)) + for(var/t in M.attack_log) - usr << t + to_chat(usr, t) + feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -824,13 +857,15 @@ Traitors and the like can also be revived with the previous role mostly intact. return if (ticker && ticker.mode) - usr << "Nope you can't do this, the game's already started. This only works before rounds!" + to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!") + return if(ticker.random_players) ticker.random_players = 0 message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1) - usr << "Disabled." + to_chat(usr, "Disabled.") + return @@ -842,9 +877,11 @@ 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.", 1) if(notifyplayers == "Yes") - world << "\blue Admin [usr.key] has forced the players to have completely random identities!" + to_chat(world, "\blue 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.") - usr << "Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet." ticker.random_players = 1 feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -859,11 +896,13 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!config.allow_random_events) config.allow_random_events = 1 - usr << "Random events enabled" + to_chat(usr, "Random events enabled") + message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1) else config.allow_random_events = 0 - usr << "Random events disabled" + to_chat(usr, "Random events disabled") + message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1) feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -877,12 +916,14 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ticker.mode.ert_disabled) ticker.mode.ert_disabled = 0 - usr << "\blue ERT has been Enabled." + to_chat(usr, "\blue ERT has been Enabled.") + log_admin("Admin [key_name(src)] has enabled ERT calling.") message_admins("Admin [key_name_admin(usr)] has enabled ERT calling.", 1) else ticker.mode.ert_disabled = 1 - usr << "\red ERT has been Disabled." + to_chat(usr, "\red ERT has been Disabled.") + log_admin("Admin [key_name(src)] has disabled ERT calling.") message_admins("Admin [key_name_admin(usr)] has disabled ERT calling.", 1) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index b06df8ddf02..ed201afbc1c 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -5,10 +5,12 @@ var/global/sent_strike_team = 0 /client/proc/strike_team() if(!ticker) - usr << "The game hasn't started yet!" + to_chat(usr, "The game hasn't started yet!") + return if(sent_strike_team == 1) - usr << "CentComm is already sending a team." + to_chat(usr, "CentComm is already sending a team.") + return if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") return @@ -22,7 +24,8 @@ var/global/sent_strike_team = 0 return if(sent_strike_team) - usr << "Looks like someone beat you to it." + to_chat(usr, "Looks like someone beat you to it.") + return sent_strike_team = 1 @@ -71,7 +74,8 @@ var/global/sent_strike_team = 0 new_commando.mind.store_memory("Nuke Code: \red [nuke_code].") new_commando.mind.store_memory("Mission: \red [input].") - new_commando << "\blue You are a Special Ops. [!leader_selected?"commando":"LEADER"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: \red[input]" + to_chat(new_commando, "\blue You are a Special Ops. [!leader_selected?"commando":"LEADER"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: \red[input]") + commando_number-- diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index d609b5f8ac7..fec7441299c 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -7,7 +7,8 @@ var/global/sent_syndicate_strike_team = 0 set name = "Spawn Syndicate Strike Team" set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event." if(!src.holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return if(!ticker) alert("The game hasn't started yet!") @@ -27,7 +28,8 @@ var/global/sent_syndicate_strike_team = 0 return if(sent_syndicate_strike_team) - src << "Looks like someone beat you to it." + to_chat(src, "Looks like someone beat you to it.") + return sent_syndicate_strike_team = 1 @@ -78,7 +80,8 @@ var/global/sent_syndicate_strike_team = 0 new_syndicate_commando.mind.store_memory("Nuke Code: \red [nuke_code].") new_syndicate_commando.mind.store_memory("Mission: \red [input].") - new_syndicate_commando << "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red[input]" + to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red[input]") + syndicate_commando_number-- diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index defe8f7d846..aec66031cc4 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -19,6 +19,7 @@ if("Yes") config.Tickcomp = 1 else config.Tickcomp = 0 else - src << "\red Error: ticklag(): Invalid world.ticklag value. No changes made." + to_chat(src, "\red Error: ticklag(): Invalid world.ticklag value. No changes made.") + diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 35219c4c1c8..358dbb46ce0 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -3,20 +3,24 @@ set name = "Create AI Triumvirate" if(ticker.current_state > GAME_STATE_PREGAME) - usr << "This option is currently only usable during pregame. This may change at a later date." + to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.") + return if(job_master && ticker) var/datum/job/job = job_master.GetJob("AI") if(!job) - usr << "Unable to locate the AI job" + to_chat(usr, "Unable to locate the AI job") + return if(ticker.triai) ticker.triai = 0 - usr << "Only one AI will be spawned at round start." + to_chat(usr, "Only one AI will be spawned at round start.") + message_admins("\blue [key_name_admin(usr)] has toggled off triple AIs at round start.", 1) else ticker.triai = 1 - usr << "There will be an AI Triumvirate at round start." + to_chat(usr, "There will be an AI Triumvirate at round start.") + message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1) return diff --git a/code/modules/admin/watchlist.dm b/code/modules/admin/watchlist.dm index e6332dad786..a3368f060ea 100644 --- a/code/modules/admin/watchlist.dm +++ b/code/modules/admin/watchlist.dm @@ -12,13 +12,15 @@ log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n") return if(!query_watchfind.NextRow()) - usr << "[new_ckey] has not been seen before, you can only add known players." + to_chat(usr, "[new_ckey] has not been seen before, you can only add known players.") + return else target_ckey = new_ckey var/target_sql_ckey = sanitizeSQL(target_ckey) if(check_watchlist(target_sql_ckey)) - usr << "[target_sql_ckey] is already on the watchlist." + to_chat(usr, "[target_sql_ckey] is already on the watchlist.") + return var/reason = input(usr,"Please state the reason","Reason") as message|null if(!reason) diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index da83338b5f3..8922f7ce787 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -23,16 +23,21 @@ /obj/machinery/arcade/examine(mob/user) ..(user) if(freeplay) - user << "Someone enabled freeplay on this machine!" + to_chat(user, "Someone enabled freeplay on this machine!") + else if(token_price) - user << "\The [src.name] costs [token_price] credits per play." + to_chat(user, "\The [src.name] costs [token_price] credits per play.") + if(!tokens) - user << "\The [src.name] has no available play credits. Better feed the machine!" + to_chat(user, "\The [src.name] has no available play credits. Better feed the machine!") + else if(tokens == 1) - user << "\The [src.name] has only 1 play credit left!" + to_chat(user, "\The [src.name] has only 1 play credit left!") + else - user << "\The [src.name] has [tokens] play credits!" + to_chat(user, "\The [src.name] has [tokens] play credits!") + /obj/machinery/arcade/attack_hand(mob/user as mob) if(..()) @@ -47,7 +52,8 @@ if(stat & BROKEN || panel_open) return if(!tokens && !freeplay) - user << "\The [src.name] doesn't have enough credits to play! Pay first!" + to_chat(user, "\The [src.name] doesn't have enough credits to play! Pay first!") + return if(!in_use && (tokens || freeplay)) in_use = 1 @@ -55,14 +61,16 @@ return if(in_use) if(src != user.machine) - user << "Someone else is already playing this machine, please wait your turn!" + to_chat(user, "Someone else is already playing this machine, please wait your turn!") + return /obj/machinery/arcade/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/screwdriver) && anchored) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") + update_icon() return if(!freeplay) @@ -84,7 +92,8 @@ /obj/machinery/arcade/proc/pay_with_cash(var/obj/item/weapon/spacecash/cashmoney, var/mob/user) if(cashmoney.get_total() < token_price) - user << "\icon[cashmoney] That is not enough money." + to_chat(user, "\icon[cashmoney] That is not enough money.") + return 0 visible_message("[usr] inserts a credit chip into [src].") var/left = cashmoney.get_total() - token_price @@ -98,11 +107,13 @@ visible_message("[usr] swipes a card through [src].") var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number) if (!customer_account) - user <<"Error: Unable to access account. Please contact technical support if problem persists." + to_chat(user, "Error: Unable to access account. Please contact technical support if problem persists.") + return 0 if(customer_account.suspended) - user << "Unable to access account: account suspended." + to_chat(user, "Unable to access account: account suspended.") + return 0 // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is @@ -112,11 +123,13 @@ customer_account = attempt_account_access(I.associated_account_number, attempt_pin, 2) if(!customer_account) - user << "Unable to access account: incorrect credentials." + to_chat(user, "Unable to access account: incorrect credentials.") + return 0 if(token_price > customer_account.money) - user << "Insufficient funds in account." + to_chat(user, "Insufficient funds in account.") + return 0 else // Okay to move the money at this point diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index 9c3dfe875fe..0b789f02b46 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -38,12 +38,14 @@ tickets += T.amount qdel(T) else - user << "\The [T] seems stuck to your hand!" + to_chat(user, "\The [T] seems stuck to your hand!") + return if(istype(O, /obj/item/weapon/screwdriver) && anchored) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") + update_icon() return if(panel_open) @@ -179,9 +181,11 @@ td.cost.toomuch { updateUsrDialog() return if(!global_prizes.PlaceOrder(src, itemID)) - usr << "Unable to complete the exchange." + to_chat(usr, "Unable to complete the exchange.") + else - usr << "You've successfully purchased the item." + to_chat(usr, "You've successfully purchased the item.") + interact(usr) return diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 485c8756375..a7a688a9d50 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -114,7 +114,8 @@ attach_assembly(var/obj/item/device/assembly/A, var/mob/user) holder = new/obj/item/device/assembly_holder(get_turf(src)) if(holder.attach(A,src,user)) - user << "\blue You attach \the [A] to \the [src]!" + to_chat(user, "\blue You attach \the [A] to \the [src]!") + return 1 return 0 @@ -127,9 +128,11 @@ return if(istype(W, /obj/item/weapon/screwdriver)) if(toggle_secure()) - user << "\blue \The [src] is ready!" + to_chat(user, "\blue \The [src] is ready!") + else - user << "\blue \The [src] can now be attached!" + to_chat(user, "\blue \The [src] can now be attached!") + return ..() return @@ -144,9 +147,11 @@ ..(user) if((in_range(src, user) || loc == user)) if(secured) - user << "\The [src] is ready!" + to_chat(user, "\The [src] is ready!") + else - user << "\The [src] can be attached!" + to_chat(user, "\The [src] can be attached!") + attack_self(mob/user as mob) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index dbda18e7b71..50f39995fe0 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -29,7 +29,8 @@ return if(istype(W, /obj/item/weapon/wrench) && !status) //This is basically bomb assembly code inverted. apparently it works. - user << "You disassemble [src]." + to_chat(user, "You disassemble [src].") + bombassembly.loc = user.loc bombassembly.master = null @@ -46,11 +47,13 @@ status = 1 bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]") - user << "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited." + to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") + else status = 0 bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" - user << "The hole has been closed." + to_chat(user, "The hole has been closed.") + add_fingerprint(user) ..() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index 1d48afde8a5..bc718f8cbfc 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -70,9 +70,11 @@ ..(user) if ((in_range(src, user) || src.loc == user)) if (src.secured) - user << "\The [src] is ready!" + to_chat(user, "\The [src] is ready!") + else - user << "\The [src] can be attached!" + to_chat(user, "\The [src] can be attached!") + HasProximity(atom/movable/AM as mob|obj) @@ -140,15 +142,18 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/screwdriver)) if(!a_left || !a_right) - user << "\red BUG:Assembly part missing, please report this!" + to_chat(user, "\red BUG:Assembly part missing, please report this!") + return a_left.toggle_secure() a_right.toggle_secure() secured = !secured if(secured) - user << "\blue \The [src] is ready!" + to_chat(user, "\blue \The [src] is ready!") + else - user << "\blue \The [src] can now be taken apart!" + to_chat(user, "\blue \The [src] can now be taken apart!") + update_icon() return else @@ -160,7 +165,8 @@ src.add_fingerprint(user) if(src.secured) if(!a_left || !a_right) - user << "\red Assembly part missing!" + to_chat(user, "\red 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/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 75c40dcb8b0..8d169b1dac5 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -11,7 +11,8 @@ examine(mob/user) ..(user) if(armed) - user << "It looks like it's armed." + to_chat(user, "It looks like it's armed.") + activate() if(..()) @@ -20,7 +21,8 @@ if(ishuman(usr)) var/mob/living/carbon/human/user = usr if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) - user << "Your hand slips, setting off the trigger." + to_chat(user, "Your hand slips, setting off the trigger.") + pulse(0) update_icon() if(usr) @@ -68,7 +70,8 @@ attack_self(mob/living/user as mob) if(!armed) - user << "You arm [src]." + to_chat(user, "You arm [src].") + else if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) var/which_hand = "l_hand" @@ -78,7 +81,8 @@ user.visible_message("[user] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") return - user << "You disarm [src]." + to_chat(user, "You disarm [src].") + armed = !armed update_icon() playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) @@ -142,4 +146,5 @@ return layer = TURF_LAYER+0.2 - usr << "You hide [src]." \ No newline at end of file + to_chat(usr, "You hide [src].") + diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index d34dc9e4c76..9d661d7f2f3 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -31,7 +31,8 @@ return if(istype(W, /obj/item/weapon/screwdriver)) status = !status - user << "[src] is now [status ? "secured" : "unsecured"]!" + to_chat(user, "[src] is now [status ? "secured" : "unsecured"]!") + add_fingerprint(user) return diff --git a/code/modules/atmos_automation/implementation/digital_valves.dm b/code/modules/atmos_automation/implementation/digital_valves.dm index d9121aa3f34..e79d27ab88e 100644 --- a/code/modules/atmos_automation/implementation/digital_valves.dm +++ b/code/modules/atmos_automation/implementation/digital_valves.dm @@ -37,7 +37,8 @@ if(!isnull(V.id_tag) && V.frequency == parent.frequency) valves|=V.id_tag if(valves.len==0) - usr << "Unable to find any digital valves on this frequency." + to_chat(usr, "Unable to find any digital valves on this frequency.") + return valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves parent.updateUsrDialog() diff --git a/code/modules/atmos_automation/implementation/emitters.dm b/code/modules/atmos_automation/implementation/emitters.dm index 0e0dc2720cf..91f8398acc0 100644 --- a/code/modules/atmos_automation/implementation/emitters.dm +++ b/code/modules/atmos_automation/implementation/emitters.dm @@ -35,7 +35,8 @@ if(!isnull(E.id_tag) && E.frequency == parent.frequency) emitters|=E.id_tag if(emitters.len==0) - usr << "Unable to find any emitters on this frequency." + to_chat(usr, "Unable to find any emitters on this frequency.") + return emitter = input("Select an emitter:", "Emitter", emitter) as null|anything in emitters parent.updateUsrDialog() diff --git a/code/modules/atmos_automation/implementation/vent_pump.dm b/code/modules/atmos_automation/implementation/vent_pump.dm index ff1c2cbdc44..6a6f3ca6d9b 100644 --- a/code/modules/atmos_automation/implementation/vent_pump.dm +++ b/code/modules/atmos_automation/implementation/vent_pump.dm @@ -46,7 +46,8 @@ injector_names |= I.id_tag else for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) - //world << "test" +// to_chat(world, "test") + if(!isnull(I.id_tag) && I.frequency == parent.frequency) injector_names |= I.id_tag diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 39dd9180ea0..3baf9764d6a 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -11,7 +11,8 @@ light_color = LIGHT_COLOR_LIGHTBLUE /obj/machinery/computer/artillerycontrol/attack_ai(user as mob) - user << "Access denied." + to_chat(user, "Access denied.") + return /obj/machinery/computer/artillerycontrol/attack_hand(user as mob) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index cc4ddb95856..cba145b8075 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -97,10 +97,12 @@ obj/machinery/gateway/centerstation/process() if(!awaygate) awaygate = locate(/obj/machinery/gateway/centeraway) in world if(!awaygate) - user << "Error: No destination found." + to_chat(user, "Error: No destination found.") + return if(world.time < wait) - user << "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes." + to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.") + return for(var/obj/machinery/gateway/G in linked) @@ -149,7 +151,8 @@ obj/machinery/gateway/centerstation/process() /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params) if(istype(W,/obj/item/device/multitool)) - user << "\black The gate is already calibrated, there is no work for you to do here." + to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.") + return /////////////////////////////////////Away//////////////////////// @@ -204,7 +207,8 @@ obj/machinery/gateway/centerstation/process() if(!stationgate) stationgate = locate(/obj/machinery/gateway/centerstation) in world if(!stationgate) - user << "Error: No destination found." + to_chat(user, "Error: No destination found.") + return for(var/obj/machinery/gateway/G in linked) @@ -246,16 +250,19 @@ obj/machinery/gateway/centerstation/process() /obj/machinery/gateway/centeraway/proc/exilecheck(var/mob/living/carbon/M) for(var/obj/item/weapon/implant/exile/E in M)//Checking that there is an exile implant in the contents if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket - M << "The station gate has detected your exile implant and is blocking your entry." + to_chat(M, "The station gate has detected your exile implant and is blocking your entry.") + return 1 return 0 /obj/machinery/gateway/centeraway/attackby(obj/item/device/W as obj, mob/user as mob, params) if(istype(W,/obj/item/device/multitool)) if(calibrated) - user << "The gate is already calibrated, there is no work for you to do here." + to_chat(user, "The gate is already calibrated, there is no work for you to do here.") + return else - user << "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target." + to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") + calibrated = 1 return diff --git a/code/modules/awaymissions/maploader/writer.dm b/code/modules/awaymissions/maploader/writer.dm index 81c6a396033..212ef92c972 100644 --- a/code/modules/awaymissions/maploader/writer.dm +++ b/code/modules/awaymissions/maploader/writer.dm @@ -36,7 +36,8 @@ dmm_suite{ fdel("[map_name].dmm") } var/saved_map = file("[map_name].dmm") - saved_map << file_text + to_chat(saved_map, file_text) + return saved_map } write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 577304c7e38..d4d60b53574 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -55,18 +55,22 @@ usr.set_machine(src) if(chargesa <= 0) - user << "The Wish Granter lies silent." + to_chat(user, "The Wish Granter lies silent.") + return else if(!istype(user, /mob/living/carbon/human)) - user << "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's." + to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") + return else if(is_special_character(user)) - user << "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away." + to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") + else if (!insistinga) - user << "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?" + to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") + insistinga++ else @@ -75,71 +79,99 @@ var/wish = input("You want...","Wish") as null|anything in list("Power","Wealth","Immortality","To Kill","Peace") switch(wish) if("Power") - user << "Your wish is granted, but at a terrible cost..." - user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." + to_chat(user, "Your wish is granted, but at a terrible cost...") + + to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") + user.mutations.Add(LASER) user.mutations.Add(RESIST_COLD) user.mutations.Add(XRAY) if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") - user << "\red Your flesh rapidly mutates!" - user << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids." - user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness." - user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations." + to_chat(user, "\red Your flesh rapidly mutates!") + + to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") + + to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") + + to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") + human.set_species("Shadow") user.regenerate_icons() if("Wealth") - user << "Your wish is granted, but at a terrible cost..." - user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." + to_chat(user, "Your wish is granted, but at a terrible cost...") + + to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") + new /obj/structure/closet/syndicate/resources/everything(loc) if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") - user << "\red Your flesh rapidly mutates!" - user << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids." - user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness." - user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations." + to_chat(user, "\red Your flesh rapidly mutates!") + + to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") + + to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") + + to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") + human.set_species("Shadow") user.regenerate_icons() if("Immortality") - user << "Your wish is granted, but at a terrible cost..." - user << "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart." + to_chat(user, "Your wish is granted, but at a terrible cost...") + + to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") + user.verbs += /mob/living/carbon/proc/immortality if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") - user << "\red Your flesh rapidly mutates!" - user << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids." - user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness." - user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations." + to_chat(user, "\red Your flesh rapidly mutates!") + + to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") + + to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") + + to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") + human.set_species("Shadow") user.regenerate_icons() if("To Kill") - user << "Your wish is granted, but at a terrible cost..." - user << "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart." + to_chat(user, "Your wish is granted, but at a terrible cost...") + + to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.") + ticker.mode.traitors += user.mind user.mind.special_role = "traitor" var/datum/objective/hijack/hijack = new hijack.owner = user.mind user.mind.objectives += hijack - user << "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!" + to_chat(user, "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") + var/obj_count = 1 for(var/datum/objective/OBJ in user.mind.objectives) - user << "Objective #[obj_count]: [OBJ.explanation_text]" + to_chat(user, "Objective #[obj_count]: [OBJ.explanation_text]") + obj_count++ if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") - user << "\red Your flesh rapidly mutates!" - user << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids." - user << "\red Your body reacts violently to light. \green However, it naturally heals in darkness." - user << "Aside from your new traits, you are mentally unchanged and retain your prior obligations." + to_chat(user, "\red Your flesh rapidly mutates!") + + to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") + + to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") + + to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") + human.set_species("Shadow") user.regenerate_icons() if("Peace") - user << "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence." - user << "You feel as if you just narrowly avoided a terrible fate..." + to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") + + to_chat(user, "You feel as if you just narrowly avoided a terrible fate...") + for(var/mob/living/simple_animal/hostile/faithless/F in world) F.health = -10 F.stat = 2 @@ -172,7 +204,8 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) - O << "[M] triggered the \icon[src] [src]" + to_chat(O, "[M] triggered the \icon[src] [src]") + triggered = 1 call(src,triggerproc)(M) @@ -193,9 +226,11 @@ var/mob/living/carbon/C = usr if(!C.stat) - C << "You're not dead yet!" + to_chat(C, "You're not dead yet!") + return - C << "Death is not your end!" + to_chat(C, "Death is not your end!") + spawn(rand(800,1200)) if(C.stat == DEAD) @@ -212,7 +247,8 @@ C.radiation = 0 C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() - C << "You have regenerated." + to_chat(C, "You have regenerated.") + C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") C.update_canmove() return 1 \ No newline at end of file diff --git a/code/modules/awaymissions/trigger.dm b/code/modules/awaymissions/trigger.dm index 38b086f5869..06b7419a973 100644 --- a/code/modules/awaymissions/trigger.dm +++ b/code/modules/awaymissions/trigger.dm @@ -4,7 +4,8 @@ /obj/effect/step_trigger/message/Trigger(mob/M as mob) if(M.client) - M << "[message]" + to_chat(M, "[message]") + if(once) qdel(src) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index a49cfe03ccc..a4bcdf921fc 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -92,7 +92,8 @@ You can set verify to TRUE if you want send() to sleep until the client has the if(!unreceived || !unreceived.len) return 0 if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT) - client << "Sending Resources..." + to_chat(client, "Sending Resources...") + for(var/asset in unreceived) if (asset in asset_cache) client << browse_rsc(asset_cache[asset], asset) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index 2670fcd6376..c9296cd84d8 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -28,16 +28,20 @@ return #if defined(TOPIC_DEBUGGING) - world << "[src]'s Topic: [href] destined for [hsrc]." + to_chat(world, "[src]'s Topic: [href] destined for [hsrc].") + #endif if(href_list["nano_err"]) //nano throwing errors if(topic_debugging) - src << "## NanoUI: " + html_decode(href_list["nano_err"]) //NANO DEBUG HOOK + to_chat(src, "## NanoUI: " + html_decode(href_list["nano_err"]))//NANO DEBUG HOOK + + if(href_list["asset_cache_confirm_arrival"]) - //src << "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED." +// to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.") + var/job = text2num(href_list["asset_cache_confirm_arrival"]) completed_asset_jobs += job return @@ -65,10 +69,12 @@ if(href_list["irc_msg"]) if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes - usr << "You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you" + to_chat(usr, "You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you") + return if(mute_irc) - usr << "" + to_chat(usr, "") + return cmd_admin_irc_pm() return @@ -77,7 +83,8 @@ //Logs all hrefs if(config && config.log_hrefs && href_logfile) - href_logfile << "[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
" + to_chat(href_logfile, "[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
") + switch(href_list["karmashop"]) if("tab") @@ -90,49 +97,56 @@ switch(href_list["KarmaBuy"]) if("1") if(karma <5) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Barber",5) return if("2") if(karma <5) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Brig Physician",5) return if("3") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Nanotrasen Representative",30) return if("5") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Blueshield",30) return if("6") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Mechanic",30) return if("7") if(karma <45) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Magistrate",45) return if("9") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_job_unlock("Security Pod Pilot",30) @@ -142,42 +156,48 @@ switch(href_list["KarmaBuy2"]) if("1") if(karma <15) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Machine",15) return if("2") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Kidan",30) return if("3") if(karma <30) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Grey",30) return if("4") if(karma <45) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Vox",45) return if("5") if(karma <45) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Slime People",45) return if("6") if(karma <100) - usr << "You do not have enough karma!" + to_chat(usr, "You do not have enough karma!") + return else src.DB_species_unlock("Plasmaman",100) @@ -199,7 +219,7 @@ /client/proc/is_content_unlocked() if(!prefs.unlock_content) - src << "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Click here to find out more." + to_chat(src, "Become a BYOND member to access member-perks and features, as well as support the engine that makes this game possible. Click here to find out more.") return 0 return 1 @@ -207,11 +227,13 @@ if(config.automute_on && !holder && src.last_message == message) src.last_message_count++ if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE) - src << "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied." + to_chat(src, "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied.") + cmd_admin_mute(src.mob, mute_type, 1) return 1 if(src.last_message_count >= SPAM_TRIGGER_WARNING) - src << "\red You are nearing the spam filter limit for identical messages." + to_chat(src, "\red You are nearing the spam filter limit for identical messages.") + return 0 else last_message = message @@ -221,13 +243,15 @@ //This stops files larger than UPLOAD_LIMIT being sent from client to server via input(), client.Import() etc. /client/AllowUpload(filename, filelength) if(filelength > UPLOAD_LIMIT) - src << "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB." + to_chat(src, "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.") + return 0 /* //Don't need this at the moment. But it's here if it's needed later. //Helps prevent multiple files being uploaded at once. Or right after eachother. var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) - src << "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds." + to_chat(src, "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.") + return 0 fileaccess_timer = world.time + FTPDELAY */ return 1 @@ -254,7 +278,8 @@ src.preload_rsc = pick(config.resource_urls) else src.preload_rsc = 1 // If config.resource_urls is not set, preload like normal. - src << "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears." + to_chat(src, "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") + clients += src @@ -277,10 +302,14 @@ . = ..() //calls mob.Login() if(custom_event_msg && custom_event_msg != "") - src << "

Custom Event

" - src << "

A custom event is taking place. OOC Info:

" - src << "[html_encode(custom_event_msg)]" - src << "
" + to_chat(src, "

Custom Event

") + + to_chat(src, "

A custom event is taking place. OOC Info:

") + + to_chat(src, "[html_encode(custom_event_msg)]") + + to_chat(src, "
") + if( (world.address == address || !address) && !host ) host = key @@ -301,7 +330,8 @@ if (ckey in clientmessages) for (var/message in clientmessages[ckey]) - src << message + to_chat(src, message) + clientmessages.Remove(ckey) @@ -313,7 +343,8 @@ screen += void if(!winexists(src, "asset_cache_browser")) // The client is using a custom skin, tell them. - 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, "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.") + ////////////// @@ -431,4 +462,5 @@ var/message = "[lang.name] : [lang.type]" if(lang.flags & RESTRICTED) message += " (RESTRICTED)" - world << "[message]" + to_chat(world, "[message]") + diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a64ae9f443c..7692f051621 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -262,7 +262,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts //display limbs below var/ind = 0 for(var/name in organ_data) - //world << "[ind] \ [organ_data.len]" +// to_chat(world, "[ind] \ [organ_data.len]") + var/status = organ_data[name] var/organ_name = null switch(name) @@ -673,7 +674,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts return if (!isnum(desiredLvl)) - user << "\red UpdateJobPreference - desired level was not a number. Please notify coders!" + to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!") + ShowChoices(user) return @@ -1057,7 +1059,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if(new_name) real_name = new_name else - user << "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and ." + to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .") + if("age") var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null @@ -1583,7 +1586,8 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/cleaned_r = sql_sanitize_text(r) if(r != cleaned_r) // up to no good message_admins("[user] attempted an href exploit! (This could have possibly lead to a \"Bobby Tables\" exploit, so they're probably up to no good). String: [r] ID: [last_id] IP: [last_ip]") - user << "Stop right there, criminal scum" + to_chat(user, "Stop right there, criminal scum") + else be_special ^= r @@ -1599,9 +1603,11 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if("lobby_music") sound ^= SOUND_LOBBY if(sound & SOUND_LOBBY) - user << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) + to_chat(user, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)) + else - user << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) + to_chat(user, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)) + if("ghost_ears") toggles ^= CHAT_GHOSTEARS diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index d1c100c37c7..341efffcb69 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -4,7 +4,8 @@ set category = "Preferences" set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs" prefs.toggles ^= CHAT_GHOSTEARS - src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"]." + to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") + prefs.save_preferences(src) feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -13,7 +14,8 @@ set category = "Preferences" set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs" prefs.toggles ^= CHAT_GHOSTSIGHT - src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"]." + to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") + prefs.save_preferences(src) feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -22,7 +24,8 @@ set category = "Preferences" set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers" prefs.toggles ^= CHAT_GHOSTRADIO - src << "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"]." + to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].") + prefs.save_preferences(src) feedback_add_details("admin_verb","TGR") @@ -33,7 +36,8 @@ if(!holder) return prefs.toggles ^= CHAT_RADIO prefs.save_preferences(src) - usr << "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers" + to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers") + feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggleadminhelpsound() @@ -43,7 +47,8 @@ if(!holder) return prefs.sound ^= SOUND_ADMINHELP prefs.save_preferences(src) - usr << "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive." + to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") + feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/deadchat() // Deadchat toggle is usable by anyone. @@ -54,9 +59,11 @@ prefs.save_preferences(src) if(src.holder) - src << "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat." + to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") + else - src << "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat." + to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") + feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -66,7 +73,8 @@ set desc = "Toggles seeing prayers" prefs.toggles ^= CHAT_PRAYER prefs.save_preferences(src) - src << "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat." + to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") + feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglescoreboard() @@ -75,7 +83,8 @@ set desc = "Toggles displaying end of round scoreboard" prefs.toggles ^= DISABLE_SCOREBOARD prefs.save_preferences(src) - src << "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard." + to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.") + feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglekarmareminder() @@ -84,7 +93,8 @@ set desc = "Toggles displaying end of round karma reminder" prefs.toggles ^= DISABLE_KARMA_REMINDER prefs.save_preferences(src) - src << "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder." + to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.") + feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggletitlemusic() @@ -94,13 +104,17 @@ prefs.sound ^= SOUND_LOBBY prefs.save_preferences(src) if(prefs.sound & SOUND_LOBBY) - src << "You will now hear music in the game lobby." + to_chat(src, "You will now hear music in the game lobby.") + if(istype(mob, /mob/new_player)) playtitlemusic() else - src << "You will no longer hear music in the game lobby." + to_chat(src, "You will no longer hear music in the game lobby.") + if(istype(mob, /mob/new_player)) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jamsz + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jamsz + + feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglemidis() @@ -110,12 +124,16 @@ prefs.sound ^= SOUND_MIDI prefs.save_preferences(src) if(prefs.sound & SOUND_MIDI) - src << "You will now hear any sounds uploaded by admins." + to_chat(src, "You will now hear any sounds uploaded by admins.") + else var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777) break_sound.priority = 250 - src << break_sound //breaks the client's sound output on channel 777 - src << "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled." + to_chat(src, break_sound)//breaks the client's sound output on channel 777 + + + to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.") + feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/listen_ooc() @@ -124,7 +142,8 @@ set desc = "Toggles seeing OutOfCharacter chat" prefs.toggles ^= CHAT_OOC prefs.save_preferences(src) - src << "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel." + to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") + feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -134,7 +153,8 @@ set desc = "Toggles seeing Local OutOfCharacter chat" prefs.toggles ^= CHAT_LOOC prefs.save_preferences(src) - src << "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel." + to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") + feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -145,10 +165,13 @@ prefs.sound ^= SOUND_AMBIENCE prefs.save_preferences(src) if(prefs.sound & SOUND_AMBIENCE) - src << "You will now hear ambient sounds." + to_chat(src, "You will now hear ambient sounds.") + else - src << "You will no longer hear ambient sounds." - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) + to_chat(src, "You will no longer hear ambient sounds.") + + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)) + feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels. @@ -158,10 +181,13 @@ prefs.sound ^= SOUND_BUZZ prefs.save_preferences(src) if(prefs.sound & SOUND_BUZZ) - src << "You will now hear ambient white noise." + to_chat(src, "You will now hear ambient white noise.") + else - src << "You will no longer hear ambient white noise." - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) + to_chat(src, "You will no longer hear ambient white noise.") + + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)) + feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -172,11 +198,15 @@ prefs.sound ^= SOUND_HEARTBEAT prefs.save_preferences(src) if(prefs.sound & SOUND_HEARTBEAT) - src << "You will now hear heartbeat sounds." + to_chat(src, "You will now hear heartbeat sounds.") + else - src << "You will no longer hear heartbeat sounds." - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 1) - src << sound(null, repeat = 0, wait = 0, volume = 0, channel = 2) + to_chat(src, "You will no longer hear heartbeat sounds.") + + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)) + + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)) + feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! // This needs a toggle because you people are awful and spammed terrible music @@ -187,9 +217,11 @@ prefs.toggles ^= SOUND_INSTRUMENTS prefs.save_preferences(src) if(prefs.toggles & SOUND_INSTRUMENTS) - src << "You will now hear people playing musical instruments." + to_chat(src, "You will now hear people playing musical instruments.") + else - src << "You will no longer hear musical instruments." + to_chat(src, "You will no longer hear musical instruments.") + feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_media() @@ -199,7 +231,8 @@ prefs.sound ^= SOUND_STREAMING prefs.save_preferences(src) - usr << "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media." + to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.") + if(!media) return if(prefs.sound & SOUND_STREAMING) media.update_music() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1257117237d..a179d56db14 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -51,7 +51,8 @@ wearable = 1 if(!wearable) - M << "\red Your species cannot wear [src]." + to_chat(M, "\red Your species cannot wear [src].") + return 0 return 1 @@ -200,7 +201,8 @@ BLIND // can't see anything species_restricted -= "Tajaran" update_icon() else - user << "[src] have already been clipped!" + to_chat(user, "[src] have already been clipped!") + return else ..() @@ -213,29 +215,36 @@ BLIND // can't see anything if (istype(M, /mob/dead/)) return if (user.stat || user.restrained()) return if(has_sensor >= 2) - user << "The controls are locked." + to_chat(user, "The controls are locked.") + return 0 if(has_sensor <= 0) - user << "This suit does not have any sensors." + to_chat(user, "This suit does not have any sensors.") + return 0 var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes if(get_dist(user, src) > 1) - user << "You have moved too far away." + to_chat(user, "You have moved too far away.") + return sensor_mode = modes.Find(switchMode) - 1 if (src.loc == user) switch(sensor_mode) if(0) - user << "You disable your suit's remote sensing equipment." + to_chat(user, "You disable your suit's remote sensing equipment.") + if(1) - user << "Your suit will now report whether you are live or dead." + to_chat(user, "Your suit will now report whether you are live or dead.") + if(2) - user << "Your suit will now report your vital lifesigns." + to_chat(user, "Your suit will now report your vital lifesigns.") + if(3) - user << "Your suit will now report your vital lifesigns as well as your coordinate position." + to_chat(user, "Your suit will now report your vital lifesigns as well as your coordinate position.") + if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user if(H.w_uniform == src) @@ -303,7 +312,8 @@ BLIND // can't see anything Had to use this instead of initial() because initial reverted to the wrong state.*/ gas_transfer_coefficient = initial(gas_transfer_coefficient) permeability_coefficient = initial(permeability_coefficient) - user << "You push \the [src] back into place." + to_chat(user, "You push \the [src] back into place.") + mask_adjusted = 0 slot_flags = initial(slot_flags) if(flags_inv != initial(flags_inv)) @@ -324,7 +334,8 @@ BLIND // can't see anything user.put_in_hands(src) else icon_state += "_up" - user << "You push \the [src] out of the way." + to_chat(user, "You push \the [src] out of the way.") + gas_transfer_coefficient = null permeability_coefficient = null mask_adjusted = 1 @@ -393,7 +404,8 @@ BLIND // can't see anything M.dropped() user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.") else // Match has been previously lit and extinguished. - user << "The [M] has already been extinguished." + to_chat(user, "The [M] has already been extinguished.") + return if(istype(I, /obj/item/weapon/wirecutters)) @@ -411,7 +423,8 @@ BLIND // can't see anything species_restricted -= "Tajaran" update_icon() else - user << "[src] have already had their toes cut open!" + to_chat(user, "[src] have already had their toes cut open!") + return else ..() @@ -463,7 +476,8 @@ BLIND // can't see anything item_state = copytext(item_state, 1, findtext(item_state, "_open")) if(adjust_flavour) flavour = "[copytext(adjust_flavour, 3, lentext(adjust_flavour) + 1)] up" //Trims off the 'un' at the beginning of the word. unzip -> zip, unbutton->button. - user << "You [flavour] \the [src]." + to_chat(user, "You [flavour] \the [src].") + suit_adjusted = 0 //Suit is no longer adjusted. else var/flavour = "open" @@ -471,7 +485,8 @@ BLIND // can't see anything item_state += "_open" if(adjust_flavour) flavour = "[adjust_flavour]" - user << "You [flavour] \the [src]." + to_chat(user, "You [flavour] \the [src].") + suit_adjusted = 1 //Suit's adjusted. else if(user.canUnEquip(src)) //Checks to see if the item can be unequipped. If so, lets shred. Otherwise, struggle and fail. @@ -487,11 +502,14 @@ BLIND // can't see anything qdel(src) //Now that the pockets have been emptied, we can safely destroy the jacket. user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!")) else - user << "You yank and pull at \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")], however you are unable to change its state!" //Yep, that's all they get. Avoids having to snowflake in a cooldown. + to_chat(user, "You yank and pull at \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")], however you are unable to change its state!")//Yep, that's all they get. Avoids having to snowflake in a cooldown. + + return user.update_inv_wear_suit() else - user << "You attempt to button up the velcro on \the [src], before promptly realising how retarded you are." + to_chat(user, "You attempt to button up the velcro on \the [src], before promptly realising how retarded you are.") + /obj/item/clothing/suit/verb/openjacket(var/mob/user) //The verb you can use to adjust jackets. set name = "Open/Close Jacket" @@ -599,7 +617,8 @@ BLIND // can't see anything return else - user << "You cannot attach more accessories of this type to [src]." + to_chat(user, "You cannot attach more accessories of this type to [src].") + if(accessories.len) for(var/obj/item/clothing/accessory/A in accessories) @@ -642,16 +661,21 @@ BLIND // can't see anything ..(user) switch(src.sensor_mode) if(0) - user << "Its sensors appear to be disabled." + to_chat(user, "Its sensors appear to be disabled.") + if(1) - user << "Its binary life sensors appear to be enabled." + to_chat(user, "Its binary life sensors appear to be enabled.") + if(2) - user << "Its vital tracker appears to be enabled." + to_chat(user, "Its vital tracker appears to be enabled.") + if(3) - user << "Its vital tracker and tracking beacon appear to be enabled." + to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") + if(accessories.len) for(var/obj/item/clothing/accessory/A in accessories) - user << "\A [A] is attached to it." + to_chat(user, "\A [A] is attached to it.") + /obj/item/clothing/under/verb/rollsuit() @@ -663,12 +687,14 @@ BLIND // can't see anything if(copytext(item_color,-2) != "_d") basecolor = item_color - usr << "DEBUG:[basecolor]" + to_chat(usr, "DEBUG:[basecolor]") + if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi')) item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" usr.update_inv_w_uniform() else - usr << "You cannot roll down the uniform!" + to_chat(usr, "You cannot roll down the uniform!") + /obj/item/clothing/under/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A) if(!(A in accessories)) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index fc89300fcf0..2a5cb6d554e 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -24,11 +24,13 @@ if(prescription_upgradable) if(istype(O, /obj/item/clothing/glasses/regular)) if(prescription) - H << "You can't possibly imagine how adding more lenses would improve \the [name]." + to_chat(H, "You can't possibly imagine how adding more lenses would improve \the [name].") + return H.unEquip(O) O.loc = src // Store the glasses for later removal - H << "You fit \the [name] with lenses from \the [O]." + to_chat(H, "You fit \the [name] with lenses from \the [O].") + prescription = 1 name = "prescription [name]" return @@ -36,7 +38,8 @@ var/obj/item/clothing/glasses/regular/G = locate() in src if(!G) G = new(get_turf(H)) - H << "You salvage the prescription lenses from \the [name]." + to_chat(H, "You salvage the prescription lenses from \the [name].") + prescription = 0 name = initial(name) H.put_in_hands(G) @@ -264,7 +267,8 @@ playsound(src.loc, 'sound/misc/yeah.ogg', 100, 0) usr.visible_message("YEEEAAAAAHHHHHHHHHHHHH!!") else - usr << "The moment is gone." + to_chat(usr, "The moment is gone.") + /obj/item/clothing/glasses/sunglasses/reagent @@ -324,7 +328,8 @@ src.flags |= GLASSESCOVERSEYES flags_inv |= HIDEEYES icon_state = initial(icon_state) - usr << "You flip the [src] down to protect your eyes." + to_chat(usr, "You flip the [src] down to protect your eyes.") + flash_protect = 2 tint = initial(tint) //better than istype else @@ -332,7 +337,8 @@ src.flags &= ~HEADCOVERSEYES flags_inv &= ~HIDEEYES icon_state = "[initial(icon_state)]up" - usr << "You push the [src] up out of your face." + to_chat(usr, "You push the [src] up out of your face.") + flash_protect = 0 tint = 0 @@ -392,7 +398,8 @@ emp_act(severity) if(istype(src.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/M = src.loc - M << "\red The Optical Thermal Scanner overloads and blinds you!" + to_chat(M, "\red The Optical Thermal Scanner overloads and blinds you!") + if(M.glasses == src) M.eye_blind = 3 M.eye_blurry = 5 diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index 3c7c10b792c..a1a2c04bd5f 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -21,21 +21,25 @@ icon_state = initial(icon_state) examine(mob/user) ..(user) - user << "This one is made of [material]." + to_chat(user, "This one is made of [material].") + if(stud) - user << "It is adorned with a single gem." + to_chat(user, "It is adorned with a single gem.") + /obj/item/clothing/gloves/ring/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/stack/sheet/mineral/diamond)) var/obj/item/stack/sheet/mineral/diamond/D = I if(stud) - usr << "The [src] already has a gem." + to_chat(usr, "The [src] already has a gem.") + else if(D.amount >= 1) D.use(1) stud = 1 update_icon() - usr << "You socket the diamond into the [src]." + to_chat(usr, "You socket the diamond into the [src].") + // s'pensive /obj/item/clothing/gloves/ring/silver diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 062ff9e978b..aa5d722d056 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -13,7 +13,9 @@ attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]" //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc]")//To prevent some lighting anomalities. + + return on = !on icon_state = "hardhat[on]_[item_color]" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1e6708994f2..463c2eb2861 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -24,7 +24,8 @@ flags ^= visor_flags flags_inv ^= visor_flags_inv icon_state = "[initial(icon_state)][up ? "up" : ""]" - user << "[up ? alt_toggle_message : toggle_message] \the [src]" + to_chat(user, "[up ? alt_toggle_message : toggle_message] \the [src]") + user.update_inv_head() diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 4c83ec37782..50bb85e5cc4 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -58,7 +58,8 @@ src.flags |= (HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = initial(icon_state) - usr << "You flip the [src] down to protect your eyes." + to_chat(usr, "You flip the [src] down to protect your eyes.") + flash_protect = 2 tint = 2 else @@ -66,7 +67,8 @@ src.flags &= ~(HEADCOVERSEYES | HEADCOVERSMOUTH) flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[initial(icon_state)]up" - usr << "You push the [src] up out of your face." + to_chat(usr, "You push the [src] up out of your face.") + flash_protect = 0 tint = 0 usr.update_inv_head() //so our mob-overlays update @@ -130,11 +132,13 @@ if(src.icon_state == "ushankadown") src.icon_state = "ushankaup" src.item_state = "ushankaup" - user << "You raise the ear flaps on the ushanka." + to_chat(user, "You raise the ear flaps on the ushanka.") + else src.icon_state = "ushankadown" src.item_state = "ushankadown" - user << "You lower the ear flaps on the ushanka." + to_chat(user, "You lower the ear flaps on the ushanka.") + /* * Pumpkin head diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 45a4c9f4141..b9c88bcc11e 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -19,10 +19,12 @@ src.flipped = !src.flipped if(src.flipped) icon_state = "[item_color]soft_flipped" - usr << "You flip the hat backwards." + to_chat(usr, "You flip the hat backwards.") + else icon_state = "[item_color]soft" - usr << "You flip the hat back in normal position." + to_chat(usr, "You flip the hat back in normal position.") + usr.update_inv_head() //so our mob-overlays update /obj/item/clothing/head/soft/red diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 62aec510e90..3ccfe44cc39 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -45,7 +45,8 @@ src.flags |= (MASKCOVERSEYES) flags_inv |= (HIDEEYES) icon_state = initial(icon_state) - usr << "You flip the [src] down to protect your eyes." + to_chat(usr, "You flip the [src] down to protect your eyes.") + flash_protect = 2 tint = 2 else @@ -53,7 +54,8 @@ src.flags &= ~(MASKCOVERSEYES) flags_inv &= ~(HIDEEYES) icon_state = "[initial(icon_state)]up" - usr << "You push the [src] up out of your face." + to_chat(usr, "You push the [src] up out of your face.") + flash_protect = 0 tint = 0 usr.update_inv_wear_mask() //so our mob-overlays update @@ -110,7 +112,8 @@ if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] - M << "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!" + to_chat(M, "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!") + return 1 /obj/item/clothing/mask/gas/clownwiz @@ -247,19 +250,24 @@ if(istype(W, /obj/item/weapon/screwdriver)) switch(aggressiveness) if(1) - user << "\blue You set the restrictor to the middle position." + to_chat(user, "\blue You set the restrictor to the middle position.") + aggressiveness = 2 if(2) - user << "\blue You set the restrictor to the last position." + to_chat(user, "\blue You set the restrictor to the last position.") + aggressiveness = 3 if(3) - user << "\blue You set the restrictor to the first position." + to_chat(user, "\blue You set the restrictor to the first position.") + aggressiveness = 1 if(4) - user << "\red You adjust the restrictor but nothing happens, probably because its broken." + to_chat(user, "\red You adjust the restrictor but nothing happens, probably because its broken.") + else if(istype(W, /obj/item/weapon/wirecutters)) if(aggressiveness != 4) - user << "\red You broke it!" + to_chat(user, "\red You broke it!") + aggressiveness = 4 else ..() @@ -270,7 +278,8 @@ /obj/item/clothing/mask/gas/sechailer/emag_act(mob/user as mob) if(safety) safety = 0 - user << "You silently fry [src]'s vocal circuit with the cryptographic sequencer." + to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") + else return diff --git a/code/modules/clothing/masks/voice.dm b/code/modules/clothing/masks/voice.dm index 2defc8402e0..887518ab906 100644 --- a/code/modules/clothing/masks/voice.dm +++ b/code/modules/clothing/masks/voice.dm @@ -15,7 +15,8 @@ set src in usr changer.active = !changer.active - usr << "You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src]." + to_chat(usr, "You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].") + /obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text) set category = "Object" @@ -24,7 +25,8 @@ var/voice = sanitize(copytext(name,1,MAX_MESSAGE_LEN)) if(!voice || !length(voice)) return changer.voice = voice - usr << "You are now mimicking [changer.voice]." + to_chat(usr, "You are now mimicking [changer.voice].") + /obj/item/clothing/mask/gas/voice/New() ..() diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index d4572017361..6b6a047fc0b 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -19,7 +19,8 @@ src.slowdown = slowdown_active magpulse = !magpulse icon_state = "[magboot_state][magpulse]" - user << "You [magpulse ? "enable" : "disable"] the mag-pulse traction system." + to_chat(user, "You [magpulse ? "enable" : "disable"] the mag-pulse traction system.") + user.update_inv_shoes() //so our mob-overlays update user.update_gravity(user.mob_has_gravity()) @@ -28,7 +29,8 @@ /obj/item/clothing/shoes/magboots/examine(mob/user) ..(user) - user << "Its mag-pulse traction system appears to be [magpulse ? "enabled" : "disabled"]." + to_chat(user, "Its mag-pulse traction system appears to be [magpulse ? "enabled" : "disabled"].") + /obj/item/clothing/shoes/magboots/advance diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index d5354f94683..d576902a43e 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -205,22 +205,26 @@ flags &= ~NOSLIP magpulse = 0 flags |= NODROP - user << "You relax your deathgrip on the flooring." + to_chat(user, "You relax your deathgrip on the flooring.") + else //make sure these can only be used when equipped. if(!ishuman(user)) return var/mob/living/carbon/human/H = user if (H.shoes != src) - user << "You will have to put on the [src] before you can do that." + to_chat(user, "You will have to put on the [src] before you can do that.") + return flags |= NOSLIP magpulse = 1 flags &= ~NODROP //kinda hard to take off magclaws when you are gripping them tightly. - user << "You dig your claws deeply into the flooring, bracing yourself." - user << "It would be hard to take off the [src] without relaxing your grip first." + to_chat(user, "You dig your claws deeply into the flooring, bracing yourself.") + + to_chat(user, "It would be hard to take off the [src] without relaxing your grip first.") + //In case they somehow come off while enabled. /obj/item/clothing/shoes/magboots/vox/dropped(mob/user as mob) @@ -234,7 +238,9 @@ /obj/item/clothing/shoes/magboots/vox/examine(mob/user) ..(user) if (magpulse) - user << "It would be hard to take these off without relaxing your grip first." //theoretically this message should only be seen by the wearer when the claws are equipped. + to_chat(user, "It would be hard to take these off without relaxing your grip first.")//theoretically this message should only be seen by the wearer when the claws are equipped. + + /obj/item/clothing/suit/space/eva/vox name = "Vox EVA Suit" diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index 780a763b3bd..cd46fd580d9 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -55,7 +55,8 @@ var/global/list/breach_burn_descriptors = list( /obj/item/clothing/suit/space/proc/repair_breaches(var/damtype, var/amount, var/mob/user) if(!can_breach || !breaches || !breaches.len || !damage) - user << "There are no breaches to repair on \the [src]." + to_chat(user, "There are no breaches to repair on \the [src].") + return var/list/valid_breaches = list() @@ -65,7 +66,8 @@ var/global/list/breach_burn_descriptors = list( valid_breaches += B if(!valid_breaches.len) - user << "There are no breaches to repair on \the [src]." + to_chat(user, "There are no breaches to repair on \the [src].") + return var/amount_left = amount @@ -178,11 +180,13 @@ var/global/list/breach_burn_descriptors = list( if(istype(W,/obj/item/stack/sheet/mineral/plastic) || istype(W,/obj/item/stack/sheet/metal)) if(istype(src.loc,/mob/living)) - user << "\red How do you intend to patch a hardsuit while someone is wearing it?" + to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?") + return if(!damage || !burn_damage) - user << "There is no surface damage on \the [src] to repair." + to_chat(user, "There is no surface damage on \the [src] to repair.") + return var/obj/item/stack/sheet/P = W @@ -197,16 +201,19 @@ var/global/list/breach_burn_descriptors = list( else if(istype(W, /obj/item/weapon/weldingtool)) if(istype(src.loc,/mob/living)) - user << "\red How do you intend to patch a hardsuit while someone is wearing it?" + to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?") + return if (!damage || ! brute_damage) - user << "There is no structural damage on \the [src] to repair." + to_chat(user, "There is no structural damage on \the [src] to repair.") + return var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(5)) - user << "\red You need more welding fuel to repair this suit." + to_chat(user, "\red You need more welding fuel to repair this suit.") + return repair_breaches(BRUTE, 3, user) @@ -218,4 +225,5 @@ var/global/list/breach_burn_descriptors = list( ..(user) if(can_breach && breaches && breaches.len) for(var/datum/breach/B in breaches) - user << "\red It has \a [B.descriptor]." \ No newline at end of file + to_chat(user, "\red It has \a [B.descriptor].") + diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index f128220b4d6..46bd28dc368 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -61,7 +61,8 @@ switch(severity) if(1) if(user && ishuman(user) && (user.wear_suit == src)) - user << "Elecrtromagnetic pulse detected, shutting down systems to preserve integrity..." + to_chat(user, "Elecrtromagnetic pulse detected, shutting down systems to preserve integrity...") + deactivate() /obj/item/clothing/suit/space/chronos/proc/chronowalk(var/mob/living/carbon/human/user) @@ -131,24 +132,33 @@ var/mob/living/carbon/human/user = src.loc if(user && ishuman(user)) if(user.wear_suit == src) - user << "\nChronosuitMK4 login: root" - user << "Password:\n" - user << "root@ChronosuitMK4# chronowalk4 --start\n" + to_chat(user, "\nChronosuitMK4 login: root") + + to_chat(user, "Password:\n") + + to_chat(user, "root@ChronosuitMK4# chronowalk4 --start\n") + if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos)) - user << "\[ ok \] Mounting /dev/helmet" + to_chat(user, "\[ ok \] Mounting /dev/helmet") + helmet = user.head helmet.flags |= NODROP helmet.suit = src src.flags |= NODROP - user << "\[ ok \] Starting brainwave scanner" - user << "\[ ok \] Starting ui display driver" - user << "\[ ok \] Initializing chronowalk4-view" + to_chat(user, "\[ ok \] Starting brainwave scanner") + + to_chat(user, "\[ ok \] Starting ui display driver") + + to_chat(user, "\[ ok \] Initializing chronowalk4-view") + new_camera(user) processing_objects.Add(src) activated = 1 else - user << "\[ fail \] Mounting /dev/helmet" - user << "FATAL: Unable to locate /dev/helmet. Aborting..." + to_chat(user, "\[ fail \] Mounting /dev/helmet") + + to_chat(user, "FATAL: Unable to locate /dev/helmet. Aborting...") + cooldown = world.time + cooldowntime activating = 0 return 0 @@ -159,18 +169,25 @@ var/mob/living/carbon/human/user = src.loc if(user && ishuman(user)) if(user.wear_suit == src) - user << "\nroot@ChronosuitMK4# chronowalk4 --stop\n" + to_chat(user, "\nroot@ChronosuitMK4# chronowalk4 --stop\n") + if(camera) - user << "\[ ok \] Sending TERM signal to chronowalk4-view" //yes I know they aren't a different color when shutting down, but they were too similar at a glance + to_chat(user, "\[ ok \] Sending TERM signal to chronowalk4-view")//yes I know they aren't a different color when shutting down, but they were too similar at a glance + + qdel(camera) if(helmet) - user << "\[ ok \] Stopping ui display driver" - user << "\[ ok \] Stopping brainwave scanner" - user << "\[ ok \] Unmounting /dev/helmet" + to_chat(user, "\[ ok \] Stopping ui display driver") + + to_chat(user, "\[ ok \] Stopping brainwave scanner") + + to_chat(user, "\[ ok \] Unmounting /dev/helmet") + helmet.flags &= ~NODROP helmet.suit = null helmet = null - user << "logout" + to_chat(user, "logout") + src.flags &= ~NODROP cooldown = world.time + cooldowntime * 1.5 activated = 0 diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index 669c10d34c3..cece5f9b414 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -17,11 +17,13 @@ camera.network = list("ERT") cameranet.removeCamera(camera) camera.c_tag = user.name - user << "\blue User scanned as [camera.c_tag]. Camera activated." + to_chat(user, "\blue User scanned as [camera.c_tag]. Camera activated.") + /obj/item/clothing/head/helmet/space/rig/ert/examine(mob/user) if(..(user, 1)) - user << "This helmet has a built-in camera. It's [camera ? "" : "in"]active." + to_chat(user, "This helmet has a built-in camera. It's [camera ? "" : "in"]active.") + /obj/item/clothing/suit/space/rig/ert name = "emergency response team suit" diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index ca4d59fbe6a..0b434a2aab2 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -22,7 +22,8 @@ /obj/item/clothing/suit/space/eva/plasmaman/examine(mob/user) ..(user) - user << "There are [extinguishes_left] extinguisher canisters left in this suit." + to_chat(user, "There are [extinguishes_left] extinguisher canisters left in this suit.") + /obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/user) var/mob/living/carbon/human/H=user @@ -32,7 +33,8 @@ next_extinguish = world.time + extinguish_cooldown extinguishes_left-- - H << "Your suit automatically extinguishes the fire." + to_chat(H, "Your suit automatically extinguishes the fire.") + H.ExtinguishMob() /obj/item/clothing/head/helmet/space/eva/plasmaman @@ -50,7 +52,9 @@ /obj/item/clothing/head/helmet/space/eva/plasmaman/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. + + return toggle_light(user) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 92862aa3861..4fd0961910a 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -31,7 +31,9 @@ /obj/item/clothing/head/helmet/space/rig/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. + + return toggle_light(user) @@ -104,9 +106,11 @@ if(attached_helmet && helmet) if(H.head) - M << "You are unable to deploy your suit's helmet as \the [H.head] is in the way." + to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.") + else - M << "Your suit's helmet deploys with a hiss." + to_chat(M, "Your suit's helmet deploys with a hiss.") + //TODO: Species check, skull damage for forcing an unfitting helmet on? helmet.forceMove(H) H.equip_to_slot(helmet, slot_head) @@ -114,9 +118,11 @@ if(attached_boots && boots) if(H.shoes) - M << "You are unable to deploy your suit's magboots as \the [H.shoes] are in the way." + to_chat(M, "You are unable to deploy your suit's magboots as \the [H.shoes] are in the way.") + else - M << "Your suit's boots deploy with a hiss." + to_chat(M, "Your suit's boots deploy with a hiss.") + boots.forceMove(H) H.equip_to_slot(boots, slot_shoes) boots.flags |= NODROP @@ -151,7 +157,8 @@ return if(!helmet) - usr << "There is no helmet installed." + to_chat(usr, "There is no helmet installed.") + return var/mob/living/carbon/human/H = usr @@ -164,17 +171,20 @@ helmet.flags &= ~NODROP H.unEquip(helmet) helmet.loc = src - H << "You retract your hardsuit helmet." + to_chat(H, "You retract your hardsuit helmet.") + else if(H.head) - H << "You cannot deploy your helmet while wearing another helmet." + to_chat(H, "You cannot deploy your helmet while wearing another helmet.") + return //TODO: Species check, skull damage for forcing an unfitting helmet on? helmet.loc = H helmet.pickup(H) H.equip_to_slot(helmet, slot_head) helmet.flags |= NODROP - H << "You deploy your hardsuit helmet, sealing you off from the world." + to_chat(H, "You deploy your hardsuit helmet, sealing you off from the world.") + H.update_inv_head() /obj/item/clothing/suit/space/rig/attackby(obj/item/W as obj, mob/user as mob, params) @@ -182,33 +192,41 @@ return if(istype(src.loc,/mob/living)) - user << "How do you propose to modify a hardsuit while it is being worn?" + to_chat(user, "How do you propose to modify a hardsuit while it is being worn?") + return if(istype(W,/obj/item/weapon/screwdriver)) if(!helmet) - user << "\The [src] does not have a helmet installed." + to_chat(user, "\The [src] does not have a helmet installed.") + else - user << "You detach \the [helmet] from \the [src]'s helmet mount." + to_chat(user, "You detach \the [helmet] from \the [src]'s helmet mount.") + helmet.loc = get_turf(src) src.helmet = null return if(!boots) - user << "\The [src] does not have any boots installed." + to_chat(user, "\The [src] does not have any boots installed.") + else - user << "You detach \the [boots] from \the [src]'s boot mounts." + to_chat(user, "You detach \the [boots] from \the [src]'s boot mounts.") + boots.loc = get_turf(src) boots = null return else if(istype(W,/obj/item/clothing/head/helmet/space)) if(!attached_helmet) - user << "\The [src] does not have a helmet mount." + to_chat(user, "\The [src] does not have a helmet mount.") + return if(helmet) - user << "\The [src] already has a helmet installed." + to_chat(user, "\The [src] already has a helmet installed.") + else - user << "You attach \the [W] to \the [src]'s helmet mount." + to_chat(user, "You attach \the [W] to \the [src]'s helmet mount.") + user.drop_item() W.loc = src src.helmet = W @@ -216,13 +234,16 @@ else if(istype(W,/obj/item/clothing/shoes/magboots)) if(!attached_boots) - user << "\The [src] does not have boot mounts." + to_chat(user, "\The [src] does not have boot mounts.") + return if(boots) - user << "\The [src] already has magboots installed." + to_chat(user, "\The [src] already has magboots installed.") + else - user << "You attach \the [W] to \the [src]'s boot mounts." + to_chat(user, "You attach \the [W] to \the [src]'s boot mounts.") + user.drop_item() W.loc = src boots = W @@ -304,12 +325,15 @@ /obj/item/clothing/head/helmet/space/rig/syndi/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot toggle your helmet while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot toggle your helmet while in this [user.loc].")//To prevent some lighting anomalities. + + return on = !on if(on) - user << "You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor." + to_chat(user, "You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.") + name = "blood-red hardsuit helmet" desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP @@ -317,7 +341,8 @@ cold_protection = HEAD set_light(brightness_on) else - user << "You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight." + to_chat(user, "You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.") + name = "blood-red hardsuit helmet (combat)" desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." flags = BLOCKHAIR | THICKMATERIAL | NODROP @@ -348,7 +373,8 @@ /obj/item/clothing/suit/space/rig/syndi/attack_self(mob/user) on = !on if(on) - user << "You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor." + to_chat(user, "You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.") + name = "blood-red hardsuit" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." slowdown = 1 @@ -356,7 +382,8 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS else - user << "You switch your hardsuit to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight." + to_chat(user, "You switch your hardsuit to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.") + name = "blood-red hardsuit (combat)" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." slowdown = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 5dc87417901..b555fdd2050 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -51,10 +51,12 @@ return 0 if(accepted_item.charges >= 5) - user << "Another grenade of that type will not fit into the module." + to_chat(user, "Another grenade of that type will not fit into the module.") + return 0 - user << "You slot \the [input_device] into the suit module." + to_chat(user, "You slot \the [input_device] into the suit module.") + user.unEquip(input_device) qdel(input_device) accepted_item.charges++ @@ -71,7 +73,8 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - H << "You have not selected a grenade type." + to_chat(H, "You have not selected a grenade type.") + return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -80,7 +83,8 @@ return 0 if(charge.charges <= 0) - H << "Insufficient grenades!" + to_chat(H, "Insufficient grenades!") + return 0 charge.charges-- @@ -186,7 +190,8 @@ var/mob/living/M = holder.wearer if(M.l_hand && M.r_hand) - M << "Your hands are full." + to_chat(M, "Your hands are full.") + deactivate() return @@ -238,11 +243,13 @@ firing.throw_at(target,fire_force,fire_distance) else if(H.l_hand && H.r_hand) - H << "Your hands are full." + to_chat(H, "Your hands are full.") + else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) - H << "You quickly fabricate \a [new_weapon]." + to_chat(H, "You quickly fabricate \a [new_weapon].") + H.put_in_hands(new_weapon) return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 44bb65e9e10..6059173f090 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -15,12 +15,14 @@ set src in usr if(!usr.loc || !usr.loc.loc || !istype(usr.loc.loc, /obj/item/rig_module)) - usr << "You are not loaded into a hardsuit." + to_chat(usr, "You are not loaded into a hardsuit.") + return var/obj/item/rig_module/module = usr.loc.loc if(!module.holder) - usr << "Your module is not installed in a hardsuit." + to_chat(usr, "Your module is not installed in a hardsuit.") + return module.holder.ui_interact(usr, nano_state = contained_state) @@ -160,9 +162,11 @@ if(istype(ai_card, /obj/item/device/aicard)) if(integrated_ai && !integrated_ai.stat) if(user) - user << "You cannot eject your currently stored AI. Purge it manually." + to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") + return 0 - user << "You purge the remaining scraps of data from your previous AI, freeing it for use." + to_chat(user, "You purge the remaining scraps of data from your previous AI, freeing it for use.") + if(integrated_ai) integrated_ai.ghostize() qdel(integrated_ai) @@ -209,8 +213,10 @@ user.unEquip(ai) ai.forceMove(src) ai_card = ai - ai_mob << "You have been transferred to \the [holder]'s [src]." - user << "You load [ai_mob] into \the [holder]'s [src]." + to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") + + to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") + integrated_ai = ai_mob @@ -218,9 +224,11 @@ integrated_ai = null eject_ai() else - user << "There is no active AI within \the [ai]." + to_chat(user, "There is no active AI within \the [ai].") + else - user << "There is no active AI within \the [ai]." + to_chat(user, "There is no active AI within \the [ai].") + update_verb_holder() /obj/item/rig_module/datajack @@ -257,16 +265,20 @@ /obj/item/rig_module/datajack/accepts_item(var/obj/item/input_device, var/mob/living/user) if(istype(input_device,/obj/item/weapon/disk/tech_disk)) - user << "You slot the disk into [src]." + to_chat(user, "You slot the disk into [src].") + var/obj/item/weapon/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) - user << "Download successful; disk erased." + to_chat(user, "Download successful; disk erased.") + disk.stored = null else - user << "The disk is corrupt. It is useless to you." + to_chat(user, "The disk is corrupt. It is useless to you.") + else - user << "The disk is blank. It is useless to you." + to_chat(user, "The disk is blank. It is useless to you.") + return 1 // I fucking hate R&D code. This typecheck spam would be totally unnecessary in a sane setup. @@ -283,13 +295,16 @@ incoming_files = input_machine.files if(!incoming_files || !incoming_files.known_tech || !incoming_files.known_tech.len) - user << "Memory failure. There is nothing accessible stored on this terminal." + to_chat(user, "Memory failure. There is nothing accessible stored on this terminal.") + else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) - user << "Download successful; local and remote repositories synchronized." + to_chat(user, "Download successful; local and remote repositories synchronized.") + else - user << "Scan complete. There is nothing useful stored on this terminal." + to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") + return 1 return 0 @@ -369,7 +384,8 @@ if(interfaced_with) if(holder && holder.wearer) - holder.wearer << "Your power sink retracts as the module deactivates." + to_chat(holder.wearer, "Your power sink retracts as the module deactivates.") + drain_complete() interfaced_with = null total_power_drained = 0 @@ -401,7 +417,8 @@ if(target.drain_power(1) <= 0) return 0 - H << "You begin draining power from [target]!" + to_chat(H, "You begin draining power from [target]!") + interfaced_with = target drain_loc = interfaced_with.loc @@ -433,17 +450,20 @@ playsound(H.loc, 'sound/effects/sparks2.ogg', 50, 1) if(!holder.cell) - H << "Your power sink flashes an error; there is no cell in your rig." + to_chat(H, "Your power sink flashes an error; there is no cell in your rig.") + drain_complete(H) return if(!interfaced_with || !interfaced_with.Adjacent(H) || !(interfaced_with.loc == drain_loc)) - H << "Your power sink retracts into its casing." + to_chat(H, "Your power sink retracts into its casing.") + drain_complete(H) return if(holder.cell.fully_charged()) - H << "Your power sink flashes an amber light; your rig cell is full." + to_chat(H, "Your power sink flashes an amber light; your rig cell is full.") + drain_complete(H) return @@ -451,7 +471,8 @@ var/to_drain = min(40000, ((holder.cell.maxcharge - holder.cell.charge) / CELLRATE)) var/target_drained = interfaced_with.drain_power(0,0,to_drain) if(target_drained <= 0) - H << "Your power sink flashes a red light; there is no power left in [interfaced_with]." + to_chat(H, "Your power sink flashes a red light; there is no power left in [interfaced_with].") + drain_complete(H) return @@ -463,9 +484,11 @@ /obj/item/rig_module/power_sink/proc/drain_complete(var/mob/living/M) if(!interfaced_with) - if(M) M << "Total power drained: [round(total_power_drained/1000)]kJ." + to_chat(if(M) M, "Total power drained: [round(total_power_drained/1000)]kJ.") + else - if(M) M << "Total power drained from [interfaced_with]: [round(total_power_drained/1000)]kJ." + to_chat(if(M) M, "Total power drained from [interfaced_with]: [round(total_power_drained/1000)]kJ.") + interfaced_with.drain_power(0,1,0) // Damage the victim. drain_loc = null diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index 6e19fab742c..ae790b74f6b 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -57,28 +57,34 @@ ..() switch(damage) if(0) - usr << "It is undamaged." + to_chat(usr, "It is undamaged.") + if(1) - usr << "It is badly damaged." + to_chat(usr, "It is badly damaged.") + if(2) - usr << "It is almost completely destroyed." + to_chat(usr, "It is almost completely destroyed.") + /obj/item/rig_module/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/nanopaste)) if(damage == 0) - user << "There is no damage to mend." + to_chat(user, "There is no damage to mend.") + return - user << "You start mending the damaged portions of \the [src]..." + to_chat(user, "You start mending the damaged portions of \the [src]...") + if(!do_after(user,30, target = src) || !W || !src) return var/obj/item/stack/nanopaste/paste = W damage = 0 - user << "You mend the damage to [src] with [W]." + to_chat(user, "You mend the damage to [src] with [W].") + paste.use(1) return @@ -86,23 +92,28 @@ switch(damage) if(0) - user << "There is no damage to mend." + to_chat(user, "There is no damage to mend.") + return if(2) - user << "There is no damage that you are capable of mending with such crude tools." + to_chat(user, "There is no damage that you are capable of mending with such crude tools.") + return var/obj/item/stack/cable_coil/cable = W if(!cable.amount >= 5) - user << "You need five units of cable to repair \the [src]." + to_chat(user, "You need five units of cable to repair \the [src].") + return - user << "You start mending the damaged portions of \the [src]..." + to_chat(user, "You start mending the damaged portions of \the [src]...") + if(!do_after(user, 30, target = src) || !W || !src) return damage = 1 - user << "You mend some of damage to [src] with [W], but you will need more advanced tools to fix it completely." + to_chat(user, "You mend some of damage to [src] with [W], but you will need more advanced tools to fix it completely.") + cable.use(5) return ..() @@ -142,27 +153,33 @@ /obj/item/rig_module/proc/engage() if(damage >= 2) - usr << "The [interface_name] is damaged beyond use!" + to_chat(usr, "The [interface_name] is damaged beyond use!") + return 0 if(world.time < next_use) - usr << "You cannot use the [interface_name] again so soon." + to_chat(usr, "You cannot use the [interface_name] again so soon.") + return 0 if(!holder || (!(holder.flags & NODROP))) - usr << "The suit is not initialized." + to_chat(usr, "The suit is not initialized.") + return 0 if(usr.lying || usr.stat || usr.stunned || usr.paralysis || usr.weakened) - usr << "You cannot use the suit in this state." + to_chat(usr, "You cannot use the suit in this state.") + return 0 if(holder.wearer && holder.wearer.lying) - usr << "The suit cannot function while the wearer is prone." + to_chat(usr, "The suit cannot function while the wearer is prone.") + return 0 if(holder.security_check_enabled && !holder.check_suit_access(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") + return 0 if(!holder.check_power_cost(usr, use_power_cost, 0, src, (istype(usr,/mob/living/silicon ? 1 : 0) ) ) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 138978d2c06..5db07ba037c 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -37,7 +37,8 @@ var/mob/living/carbon/human/H = holder.wearer - H << "You are now invisible to normal detection." + to_chat(H, "You are now invisible to normal detection.") + H.invisibility = INVISIBILITY_LEVEL_TWO anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null) @@ -51,7 +52,8 @@ var/mob/living/carbon/human/H = holder.wearer - H << "You are now visible." + to_chat(H, "You are now visible.") + H.invisibility = 0 anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir) @@ -102,7 +104,8 @@ var/mob/living/carbon/human/H = holder.wearer if(!istype(H.loc, /turf)) - H << "You cannot teleport out of your current location." + to_chat(H, "You cannot teleport out of your current location.") + return 0 var/turf/T @@ -112,11 +115,13 @@ T = get_teleport_loc(get_turf(H), H, rand(5, 9)) /*if(!T || T.density) - H << "You cannot teleport into solid walls." + to_chat(H, "You cannot teleport into solid walls.") + return 0*///Who the fuck cares? Ninjas in walls are cool. if(T.z in config.admin_levels) - H << "You cannot use your teleporter on this Z-level." + to_chat(H, "You cannot use your teleporter on this Z-level.") + return 0 phase_out(H,get_turf(H)) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 26159df516f..7d68a18986a 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -164,7 +164,8 @@ return 0 if(!input_item.reagents || !input_item.reagents.total_volume) - user << "\The [input_item] is empty." + to_chat(user, "\The [input_item] is empty.") + return 0 // Magical chemical filtration system, do not question it. @@ -186,9 +187,11 @@ break if(total_transferred) - user << "You transfer [total_transferred] units into the suit reservoir." + to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") + else - user << "None of the reagents seem suitable." + to_chat(user, "None of the reagents seem suitable.") + return 1 /obj/item/rig_module/chem_dispenser/engage(atom/target) @@ -199,7 +202,8 @@ var/mob/living/carbon/human/H = holder.wearer if(!charge_selected) - H << "You have not selected a chemical type." + to_chat(H, "You have not selected a chemical type.") + return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -209,7 +213,8 @@ var/chems_to_use = 10 if(charge.charges <= 0) - H << "Insufficient chems!" + to_chat(H, "Insufficient chems!") + return 0 else if(charge.charges < chems_to_use) chems_to_use = charge.charges @@ -224,8 +229,10 @@ target_mob = H if(target_mob != H) - H << "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name]." - target_mob << "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected." + to_chat(H, "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].") + + to_chat(target_mob, "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.") + target_mob.reagents.add_reagent(charge.display_name, chems_to_use) charge.charges -= chems_to_use @@ -299,17 +306,20 @@ if("Enable") active = 1 voice_holder.active = 1 - usr << "You enable the speech synthesiser." + to_chat(usr, "You enable the speech synthesiser.") + if("Disable") active = 0 voice_holder.active = 0 - usr << "You disable the speech synthesiser." + to_chat(usr, "You disable the speech synthesiser.") + if("Set Name") var/raw_choice = sanitize(input(usr, "Please enter a new name.") as text|null, MAX_NAME_LEN) if(!raw_choice) return 0 voice_holder.voice = raw_choice - usr << "You are now mimicking [voice_holder.voice]." + to_chat(usr, "You are now mimicking [voice_holder.voice].") + return 1 /obj/item/rig_module/maneuvering_jets @@ -435,10 +445,12 @@ if(!target) if(device == iastamp) device = deniedstamp - holder.wearer << "Switched to denied stamp." + to_chat(holder.wearer, "Switched to denied stamp.") + else if(device == deniedstamp) device = iastamp - holder.wearer << "Switched to internal affairs stamp." + to_chat(holder.wearer, "Switched to internal affairs stamp.") + return 1 /obj/item/rig_module/welding_tank @@ -472,9 +484,11 @@ if(istype(W)) fill_welder(W) else - holder.wearer << "Your welding tank is out of fuel!" + to_chat(holder.wearer, "Your welding tank is out of fuel!") + else - holder.wearer << "You need to have a welding tool in one of your hands to dispense fuel." + to_chat(holder.wearer, "You need to have a welding tool in one of your hands to dispense fuel.") + /obj/item/rig_module/welding_tank/proc/fill_welder(var/obj/item/weapon/weldingtool/W) if(!istype(W)) @@ -483,10 +497,12 @@ if(reagents) if(get_fuel() >= W.max_fuel) reagents.trans_to(W, W.max_fuel) - holder.wearer << "Your [holder] dispenses some of the contents of the welding fuel tank into \the [W]." + to_chat(holder.wearer, "Your [holder] dispenses some of the contents of the welding fuel tank into \the [W].") + else reagents.trans_to(W, W.max_fuel) - holder.wearer << "You hear a faint dripping as your hardsuit welding tank completely empties." + to_chat(holder.wearer, "You hear a faint dripping as your hardsuit welding tank completely empties.") + W.update_icon() /obj/item/rig_module/welding_tank/proc/get_fuel() diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index aa106eda02a..f4db1864ffc 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -160,7 +160,8 @@ // Don't cycle if this engage() is being called by activate(). if(starting_up) - holder.wearer << "You activate your visual sensors." + to_chat(holder.wearer, "You activate your visual sensors.") + return 1 if(vision_modes.len > 1) @@ -169,9 +170,11 @@ vision_index = 1 vision = vision_modes[vision_index] - holder.wearer << "You cycle your sensors to [vision.mode] mode." + to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") + else - holder.wearer << "Your sensors only have one mode." + to_chat(holder.wearer, "Your sensors only have one mode.") + return 1 /obj/item/rig_module/vision/New() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 114ad9d7b35..d44baeab2d4 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -82,17 +82,22 @@ var/datum/effect/system/spark_spread/spark_system /obj/item/weapon/rig/examine() - usr << "This is \icon[src][src.name]." - usr << "[src.desc]" + to_chat(usr, "This is \icon[src][src.name].") + + to_chat(usr, "[src.desc]") + if(wearer) for(var/obj/item/piece in list(helmet,gloves,chest,boots)) if(!piece || piece.loc != wearer) continue - usr << "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed." + to_chat(usr, "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") + if(src.loc == usr) - usr << "The maintenance panel is [open ? "open" : "closed"]." - usr << "Hardsuit systems are [offline ? "offline" : "online"]." + to_chat(usr, "The maintenance panel is [open ? "open" : "closed"].") + + to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].") + /obj/item/weapon/rig/New() ..() @@ -214,7 +219,9 @@ if(!instant) M.visible_message("[M]'s suit emits a quiet hum as it begins to adjust its seals.","With a quiet hum, the suit begins running checks and adjusting components.") if(seal_delay && !do_after(user, seal_delay, target = M)) - if(user) user << "You must remain still while the suit is adjusting the components." + if(user) + to_chat(user, "You must remain still while the suit is adjusting the components.") + failed_to_seal = 1 if(!M) @@ -231,7 +238,9 @@ continue if(!istype(M) || !istype(piece) || !istype(compare_piece) || !msg_type) - if(M) M << "You must remain still while the suit is adjusting the components." + if(M) + to_chat(M, "You must remain still while the suit is adjusting the components.") + failed_to_seal = 1 break @@ -243,16 +252,20 @@ piece.icon_state = "[initial(icon_state)][!seal_target ? "_sealed" : ""]" switch(msg_type) if("boots") - M << "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"]." + to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") + M.update_inv_shoes() if("gloves") - M << "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"]." + to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") + M.update_inv_gloves() if("chest") - M << "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"]." + to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") + M.update_inv_wear_suit() if("helmet") - M << "\The [piece] hisses [!seal_target ? "closed" : "open"]." + to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") + M.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -289,7 +302,8 @@ flags &= ~NODROP else flags |= NODROP - M << "Your entire suit [!(flags & NODROP) ? "loosens as the components relax" : "tightens around you as the components lock into place"]." + to_chat(M, "Your entire suit [!(flags & NODROP) ? "loosens as the components relax" : "tightens around you as the components lock into place"].") + if(!(flags & NODROP)) for(var/obj/item/rig_module/module in installed_modules) @@ -326,13 +340,17 @@ if(istype(wearer)) if(flags & NODROP) if (offline_slowdown < 3) - wearer << "Your suit beeps stridently, and suddenly goes dead." + to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") + else - wearer << "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit." + to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") + if(offline_vision_restriction == 1) - wearer << "The suit optics flicker and die, leaving you with restricted vision." + to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") + else if(offline_vision_restriction == 2) - wearer << "The suit optics drop out completely, drowning you in darkness." + to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.") + if(!offline) offline = 1 if(istype(wearer) && wearer.wearing_rig) @@ -387,7 +405,8 @@ fail_msg = "Not enough stored power." if(fail_msg) - user << "[fail_msg]" + to_chat(user, "[fail_msg]") + return 0 // This is largely for cancelling stealth and whatever. @@ -513,11 +532,13 @@ if(user.back != src) return 0 else if(!src.allowed(user)) - user << "Unauthorized user. Access denied." + to_chat(user, "Unauthorized user. Access denied.") + return 0 else if(!ai_override_enabled) - user << "Synthetic access disabled. Please consult hardware provider." + to_chat(user, "Synthetic access disabled. Please consult hardware provider.") + return 0 return 1 @@ -566,7 +587,8 @@ for(var/obj/item/rig_module/module in installed_modules) for(var/mob/living/silicon/ai/ai in module.contents) if(ai && ai.client && !ai.stat) - ai << "[message]" + to_chat(ai, "[message]") + /obj/item/weapon/rig/equipped(mob/living/carbon/human/M) ..() @@ -632,7 +654,8 @@ holder = use_obj.loc if(istype(holder)) if(use_obj && check_slot == use_obj) - H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly." + to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") + use_obj.flags &= ~NODROP holder.unEquip(use_obj, 1) use_obj.forceMove(src) @@ -640,7 +663,8 @@ else if (deploy_mode != ONLY_RETRACT) if(check_slot) if(check_slot != use_obj) - H << "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way." + to_chat(H, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") + return else use_obj.forceMove(H) @@ -648,7 +672,8 @@ if(!H.equip_to_slot_if_possible(use_obj, equip_to, 0, 1)) use_obj.forceMove(src) else - H << "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly." + to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") + use_obj.flags |= NODROP if(piece == "helmet" && helmet) @@ -764,17 +789,21 @@ if(wearer) if(dam_module.damage >= 2) - wearer << "The [source] has disabled your [dam_module.interface_name]!" + to_chat(wearer, "The [source] has disabled your [dam_module.interface_name]!") + else - wearer << "The [source] has damaged your [dam_module.interface_name]!" + to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!") + dam_module.deactivate() /obj/item/weapon/rig/proc/malfunction_check(var/mob/living/carbon/human/user) if(malfunction_delay) if(offline) - user << "The suit is completely unresponsive." + to_chat(user, "The suit is completely unresponsive.") + else - user << "ERROR: Hardware fault. Rebooting interface..." + to_chat(user, "ERROR: Hardware fault. Rebooting interface...") + return 1 return 0 @@ -798,17 +827,24 @@ return 0 var/obj/item/rig_module/ai_container/module = user.loc.loc if(!istype(module) || module.damage >= 2) - user << "Your host module is unable to interface with the suit." + to_chat(user, "Your host module is unable to interface with the suit.") + return 0 if(offline || !cell || !cell.charge || locked_down) - if(user) user << "Your host rig is unpowered and unresponsive." + if(user) + to_chat(user, "Your host rig is unpowered and unresponsive.") + return 0 if(!wearer || wearer.back != src) - if(user) user << "Your host rig is not being worn." + if(user) + to_chat(user, "Your host rig is not being worn.") + return 0 if(!wearer.stat && !control_overridden && !ai_override_enabled) - if(user) user << "You are locked out of the suit servo controller." + if(user) + to_chat(user, "You are locked out of the suit servo controller.") + return 0 return 1 @@ -816,7 +852,8 @@ if(!ai_can_move_suit(user, check_user_module = 1)) return wearer.lay_down() - user << "\The [wearer] is now [wearer.resting ? "resting" : "getting up"]." + to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].") + /obj/item/weapon/rig/proc/forced_move(var/direction, var/mob/user) @@ -856,13 +893,15 @@ for(var/mob/M in range(wearer, 1)) if(M.pulling == wearer) if(!M.restrained() && M.stat == 0 && M.canmove && wearer.Adjacent(M)) - user << "Your host is restrained! They can't move!" + to_chat(user, "Your host is restrained! They can't move!") + return 0 else M.stop_pulling() if(wearer.pinned.len) - src << "Your host is pinned to a wall by [wearer.pinned[1]]!" + to_chat(src, "Your host is pinned to a wall by [wearer.pinned[1]]!") + return 0 // AIs are a bit slower than regular and ignore move intent. diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index d00d4b87abf..26912b6c005 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -14,30 +14,36 @@ if(W.GetID()) if(subverted) locked = 0 - user << "It looks like the locking system has been shorted out." + to_chat(user, "It looks like the locking system has been shorted out.") + return if((!req_access || !req_access.len) && (!req_one_access || !req_one_access.len)) locked = 0 - user << "\The [src] doesn't seem to have a locking mechanism." + to_chat(user, "\The [src] doesn't seem to have a locking mechanism.") + return if(security_check_enabled && !src.allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return locked = !locked - user << "You [locked ? "lock" : "unlock"] \the [src] access panel." + to_chat(user, "You [locked ? "lock" : "unlock"] \the [src] access panel.") + return else if(istype(W,/obj/item/weapon/crowbar)) if(!open && locked) - user << "The access panel is locked shut." + to_chat(user, "The access panel is locked shut.") + return open = !open - user << "You [open ? "open" : "close"] the access panel." + to_chat(user, "You [open ? "open" : "close"] the access panel.") + return if(open) @@ -47,19 +53,22 @@ if(open) wires.Interact(user) else - user << "You can't reach the wiring." + to_chat(user, "You can't reach the wiring.") + return // Air tank. if(istype(W,/obj/item/weapon/tank)) //Todo, some kind of check for suits without integrated air supplies. if(air_supply) - user << "\The [src] already has a tank installed." + to_chat(user, "\The [src] already has a tank installed.") + return user.unEquip(W) air_supply = W W.forceMove(src) - user << "You slot [W] into [src] and tighten the connecting valve." + to_chat(user, "You slot [W] into [src] and tighten the connecting valve.") + return // Check if this is a hardsuit upgrade or a modification. @@ -68,23 +77,27 @@ if(istype(src.loc,/mob/living/carbon/human)) var/mob/living/carbon/human/H = src.loc if(H.back == src) - user << "You can't install a hardsuit module while the suit is being worn." + to_chat(user, "You can't install a hardsuit module while the suit is being worn.") + return 1 if(!installed_modules) installed_modules = list() if(installed_modules.len) for(var/obj/item/rig_module/installed_mod in installed_modules) if(!installed_mod.redundant && istype(installed_mod,W)) - user << "The hardsuit already has a module of that class installed." + to_chat(user, "The hardsuit already has a module of that class installed.") + return 1 var/obj/item/rig_module/mod = W - user << "You begin installing \the [mod] into \the [src]." + to_chat(user, "You begin installing \the [mod] into \the [src].") + if(!do_after(user,40, target = src)) return if(!user || !W) return - user << "You install \the [mod] into \the [src]." + to_chat(user, "You install \the [mod] into \the [src].") + user.unEquip(mod) installed_modules |= mod mod.forceMove(src) @@ -94,7 +107,8 @@ else if(!cell && istype(W,/obj/item/weapon/stock_parts/cell)) - user << "You jack \the [W] into \the [src]'s battery mount." + to_chat(user, "You jack \the [W] into \the [src]'s battery mount.") + user.unEquip(W) W.forceMove(src) src.cell = W @@ -103,14 +117,16 @@ else if(istype(W,/obj/item/weapon/wrench)) if(!air_supply) - user << "There is not tank to remove." + to_chat(user, "There is not tank to remove.") + return if(user.r_hand && user.l_hand) air_supply.forceMove(get_turf(user)) else user.put_in_hands(air_supply) - user << "You detach and remove \the [air_supply]." + to_chat(user, "You detach and remove \the [air_supply].") + air_supply = null return @@ -127,7 +143,8 @@ if(istype(src.loc,/mob/living/carbon/human) && to_remove != "cell") var/mob/living/carbon/human/H = src.loc if(H.back == src) - user << "You can't remove an installed device while the hardsuit is being worn." + to_chat(user, "You can't remove an installed device while the hardsuit is being worn.") + return switch(to_remove) @@ -135,7 +152,8 @@ if("cell") if(cell) - user << "You detatch \the [cell] from \the [src]'s battery mount." + to_chat(user, "You detatch \the [cell] from \the [src]'s battery mount.") + for(var/obj/item/rig_module/module in installed_modules) module.deactivate() if(user.r_hand && user.l_hand) @@ -144,7 +162,8 @@ cell.forceMove(user.put_in_hands(cell)) cell = null else - user << "There is nothing loaded in that mount." + to_chat(user, "There is nothing loaded in that mount.") + if("system module") @@ -155,7 +174,8 @@ possible_removals[module.name] = module if(!possible_removals.len) - user << "There are no installed modules to remove." + to_chat(user, "There are no installed modules to remove.") + return var/removal_choice = input("Which module would you like to remove?") as null|anything in possible_removals @@ -163,7 +183,8 @@ return var/obj/item/rig_module/removed = possible_removals[removal_choice] - user << "You detatch \the [removed] from \the [src]." + to_chat(user, "You detatch \the [removed] from \the [src].") + removed.forceMove(get_turf(src)) removed.removed() installed_modules -= removed @@ -192,5 +213,6 @@ req_one_access.Cut() locked = 0 subverted = 1 - user << "You short out the access protocol for the suit." + to_chat(user, "You short out the access protocol for the suit.") + return 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index ba3501c8c9e..41f58657611 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -22,7 +22,9 @@ /obj/item/clothing/head/helmet/space/new_rig/attack_self(mob/user) if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." //To prevent some lighting anomalities. + to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. + + return toggle_light(user) diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index 6f1711b7b90..acd84334bac 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -17,21 +17,24 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_power_cost(usr)) return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!check_suit_access(usr)) return if(!visor) - usr << "The hardsuit does not have a configurable visor." + to_chat(usr, "The hardsuit does not have a configurable visor.") + return var/mob/M = usr @@ -51,7 +54,8 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_suit_access(usr)) @@ -87,7 +91,8 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_suit_access(usr)) @@ -107,7 +112,8 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_suit_access(usr)) @@ -127,7 +133,8 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_suit_access(usr)) @@ -150,7 +157,8 @@ set src = usr.contents if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_suit_access(usr)) @@ -176,11 +184,13 @@ return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!visor) - usr << "The hardsuit does not have a configurable visor." + to_chat(usr, "The hardsuit does not have a configurable visor.") + return var/mob/M = usr @@ -191,7 +201,8 @@ visor.activate() if(!visor.active) - usr << "The visor is suffering a hardware fault and cannot be configured." + to_chat(usr, "The visor is suffering a hardware fault and cannot be configured.") + return visor.engage() @@ -207,15 +218,18 @@ return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!speech) - usr << "The hardsuit does not have a speech synthesiser." + to_chat(usr, "The hardsuit does not have a speech synthesiser.") + return var/mob/M = usr @@ -238,11 +252,13 @@ return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return var/mob/M = usr @@ -258,11 +274,13 @@ if(!istype(module)) selected_module = null - usr << "Primary system is now: deselected." + to_chat(usr, "Primary system is now: deselected.") + return selected_module = module - usr << "Primary system is now: [selected_module.interface_name]." + to_chat(usr, "Primary system is now: [selected_module.interface_name].") + /obj/item/weapon/rig/verb/toggle_module() @@ -278,11 +296,13 @@ return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return var/mob/M = usr @@ -300,10 +320,12 @@ return if(module.active) - usr << "You attempt to deactivate \the [module.interface_name]." + to_chat(usr, "You attempt to deactivate \the [module.interface_name].") + module.deactivate() else - usr << "You attempt to activate \the [module.interface_name]." + to_chat(usr, "You attempt to activate \the [module.interface_name].") + module.activate() /obj/item/weapon/rig/verb/engage_module() @@ -317,11 +339,13 @@ return if(!(flags & NODROP)) - usr << "The suit is not active." + to_chat(usr, "The suit is not active.") + return if(!istype(wearer) || !wearer.back == src) - usr << "The hardsuit is not being worn." + to_chat(usr, "The hardsuit is not being worn.") + return if(!check_power_cost(usr, 0, 0, 0, 0)) @@ -341,5 +365,6 @@ if(!istype(module)) return - usr << "You attempt to engage the [module.interface_name]." + to_chat(usr, "You attempt to engage the [module.interface_name].") + module.engage() \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 8776cb6ace9..7abf3efdf1b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -174,11 +174,13 @@ /obj/item/clothing/suit/armor/reactive/attack_self(mob/user as mob) src.active = !( src.active ) if (src.active) - user << "\blue The reactive armor is now active." + to_chat(user, "\blue The reactive armor is now active.") + src.icon_state = "reactive" src.item_state = "reactive" else - user << "\blue The reactive armor is now inactive." + to_chat(user, "\blue The reactive armor is now inactive.") + src.icon_state = "reactiveoff" src.item_state = "reactiveoff" src.add_fingerprint(user) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 5cf32d35a12..a926b54499e 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -553,10 +553,12 @@ /obj/item/clothing/suit/advanced_protective_suit/ui_action_click() if(on) on = 0 - usr << "You turn the suit's special processes off." + to_chat(usr, "You turn the suit's special processes off.") + else on = 1 - usr << "You turn the suit's special processes on." + to_chat(usr, "You turn the suit's special processes on.") + processing_objects.Add(src) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 8328726487b..3d12a9ff290 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -23,7 +23,8 @@ loc = has_suit has_suit.overlays += inv_overlay - user << "You attach [src] to [has_suit]." + to_chat(user, "You attach [src] to [has_suit].") + src.add_fingerprint(user) /obj/item/clothing/accessory/proc/on_removed(mob/user as mob) @@ -38,7 +39,8 @@ // This code lets you put accessories on other people by attacking their sprite with the accessory if(istype(H)) if(H.wear_suit && H.wear_suit.flags_inv & HIDEJUMPSUIT) - user << "[H]'s body is covered, and you cannot attach \the [src]." + to_chat(user, "[H]'s body is covered, and you cannot attach \the [src].") + return 1 var/obj/item/clothing/under/U = H.w_uniform if(istype(U)) @@ -47,7 +49,8 @@ user.visible_message("[user] puts a [src.name] on [H]'s [U.name]!", "You finish putting a [src.name] on [H]'s [U.name].") U.attackby(src, user) else - user << "[H] is not wearing anything to attach \the [src] to." + to_chat(user, "[H] is not wearing anything to attach \the [src] to.") + return 1 return ..() @@ -203,7 +206,8 @@ /obj/item/clothing/accessory/holobadge/attack_self(mob/user as mob) if(!stored_name) - user << "Waving around a badge before swiping an ID would be pretty pointless." + to_chat(user, "Waving around a badge before swiping an ID would be pretty pointless.") + return if(isliving(user)) user.visible_message("\red [user] displays their NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.") @@ -220,22 +224,26 @@ id_card = pda.id if(access_security in id_card.access || emagged) - user << "You imprint your ID details onto the badge." + to_chat(user, "You imprint your ID details onto the badge.") + stored_name = id_card.registered_name name = "holobadge ([stored_name])" desc = "This glowing blue badge marks [stored_name] as THE LAW." else - user << "[src] rejects your insufficient access rights." + to_chat(user, "[src] rejects your insufficient access rights.") + return ..() /obj/item/clothing/accessory/holobadge/emag_act(user as mob) if (emagged) - user << "\red [src] is already cracked." + to_chat(user, "\red [src] is already cracked.") + return else emagged = 1 - user << "\red You swipe the card and crack the holobadge security checks." + to_chat(user, "\red You swipe the card and crack the holobadge security checks.") + return /obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/M, mob/living/user) @@ -376,11 +384,13 @@ if(!istype(W)) return ..() if(access_id) - user << "There is already \a [access_id] clipped onto \the [src]" + to_chat(user, "There is already \a [access_id] clipped onto \the [src]") + user.drop_item() W.forceMove(src) access_id = W - user << "\The [W] clips onto \the [src] snugly." + to_chat(user, "\The [W] clips onto \the [src] snugly.") + /obj/item/clothing/accessory/petcollar/GetAccess() return access_id ? access_id.GetAccess() : ..() @@ -388,7 +398,8 @@ /obj/item/clothing/accessory/petcollar/examine(mob/user) ..() if(access_id) - user << "There is \icon[access_id] \a [access_id] clipped onto it." + to_chat(user, "There is \icon[access_id] \a [access_id] clipped onto it.") + /obj/item/clothing/accessory/petcollar/equipped(mob/living/simple_animal/user) if(istype(user)) diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index cc9e37cecd7..44fdc31ed57 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -27,16 +27,19 @@ /obj/item/clothing/accessory/holster/proc/holster(obj/item/I, mob/user as mob) if(holstered) - user << "There is already a [holstered] holstered here!" + to_chat(user, "There is already a [holstered] holstered here!") + return if (!istype(I, /obj/item/weapon/gun)) - user << "Only guns can be holstered!" + to_chat(user, "Only guns can be holstered!") + return var/obj/item/weapon/gun/W = I if (!can_holster(W)) - user << "This [W] won't fit in the [src]!" + to_chat(user, "This [W] won't fit in the [src]!") + return holstered = W @@ -50,7 +53,8 @@ return if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj)) - user << "You need an empty hand to draw the [holstered]!" + to_chat(user, "You need an empty hand to draw the [holstered]!") + else if(user.a_intent == I_HARM) usr.visible_message("\red [user] draws the [holstered], ready to shoot!", \ @@ -81,9 +85,11 @@ /obj/item/clothing/accessory/holster/examine(mob/user) ..(user) if (holstered) - user << "A [holstered] is holstered here." + to_chat(user, "A [holstered] is holstered here.") + else - user << "It is empty." + to_chat(user, "It is empty.") + /obj/item/clothing/accessory/holster/on_attached(obj/item/clothing/under/S, mob/user as mob) ..() @@ -110,11 +116,13 @@ H = locate() in S.accessories if (!H) - usr << "Something is very wrong." + to_chat(usr, "Something is very wrong.") + if(!H.holstered) if(!istype(usr.get_active_hand(), /obj/item/weapon/gun)) - usr << "You need your gun equiped to holster it." + to_chat(usr, "You need your gun equiped to holster it.") + return var/obj/item/weapon/gun/W = usr.get_active_hand() H.holster(W, usr) diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index bd69d9776d6..aa5ebdb78f5 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -62,7 +62,8 @@ if (has_suit) //if we are part of a suit hold.open(user) else - user << "You empty [src]." + to_chat(user, "You empty [src].") + var/turf/T = get_turf(src) hold.hide_from(usr) for(var/obj/item/I in hold.contents) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 978ed6374a4..70b6ef113f9 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -23,14 +23,17 @@ attackby(obj/item/clothing/under/U as obj, mob/user as mob, params) ..() if(istype(U, /obj/item/clothing/under/chameleon)) - user << "\red Nothing happens." + to_chat(user, "\red Nothing happens.") + return if(istype(U, /obj/item/clothing/under)) if(src.clothing_choices.Find(U)) - user << "\red Pattern is already recognised by the suit." + to_chat(user, "\red Pattern is already recognised by the suit.") + return src.clothing_choices += U - user << "\red Pattern absorbed by the suit." + to_chat(user, "\red Pattern absorbed by the suit.") + emp_act(severity) @@ -52,7 +55,8 @@ set src in usr if(icon_state == "psyche") - usr << "\red Your suit is malfunctioning" + to_chat(usr, "\red Your suit is malfunctioning") + return var/obj/item/clothing/under/A diff --git a/code/modules/computer3/bios.dm b/code/modules/computer3/bios.dm index 17ed0c4789f..8c05ad5338a 100644 --- a/code/modules/computer3/bios.dm +++ b/code/modules/computer3/bios.dm @@ -24,22 +24,26 @@ if(istype(user,/mob/living/silicon)) if(!program.ai_allowed) - user << "\blue You are forbidden from accessing this program." + to_chat(user, "\blue You are forbidden from accessing this program.") + return 0 else if(program.human_controls) if(!ishuman(user)) - user << "\red Your body can't work the controls!" + to_chat(user, "\red Your body can't work the controls!") + return 0 if(user.restrained()) - user << "\red You need a free hand!" + to_chat(user, "\red You need a free hand!") + return 0 if(!in_range(src,user)) // telekinesis check if(ishuman(user) && istype(user.get_active_hand(),/obj/item/tk_grab)) if(program.human_controls) - user << "\red It's too complicated to work at a distance!" + to_chat(user, "\red It's too complicated to work at a distance!") + return 0 add_fingerprint(user) user.set_machine(src) @@ -115,7 +119,8 @@ switch(errorcode) if(PROG_CRASH) if(usr) - usr << "\red The program crashed!" + to_chat(usr, "\red The program crashed!") + usr << browse(null,"\ref[src]") Reset() @@ -148,7 +153,8 @@ else if(usr) - usr << "\red The program crashed!" + to_chat(usr, "\red The program crashed!") + usr << browse(null,"\ref[src]") testing("computer/Crash() - unknown error code [errorcode]") Reset() diff --git a/code/modules/computer3/buildandrepair.dm b/code/modules/computer3/buildandrepair.dm index 8c8a31bf9bc..158d057451d 100644 --- a/code/modules/computer3/buildandrepair.dm +++ b/code/modules/computer3/buildandrepair.dm @@ -82,46 +82,54 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You wrench the frame into place." + to_chat(user, "\blue You wrench the frame into place.") + src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) - user << "The welding tool must be on to complete this task." + to_chat(user, "The welding tool must be on to complete this task.") + return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return - user << "\blue You deconstruct the frame." + to_chat(user, "\blue You deconstruct the frame.") + new /obj/item/stack/sheet/metal( src.loc, 5 ) qdel(src) if(1) if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) - user << "\blue You unfasten the frame." + to_chat(user, "\blue You unfasten the frame.") + src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) var/obj/item/weapon/circuitboard/B = P if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) - user << "\blue You place the circuit board inside the frame." + to_chat(user, "\blue You place the circuit board inside the frame.") + src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else - user << "\red This frame does not accept circuit boards of this type!" + to_chat(user, "\red This frame does not accept circuit boards of this type!") + if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You screw the circuit board into place." + to_chat(user, "\blue You screw the circuit board into place.") + src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the circuit board." + to_chat(user, "\blue You remove the circuit board.") + src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -129,7 +137,8 @@ if(2) if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You unfasten the circuit board." + to_chat(user, "\blue You unfasten the circuit board.") + src.state = 1 src.icon_state = "1" @@ -138,10 +147,12 @@ playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(10, target = src)) battery.loc = loc - user << "\blue You remove [battery]." + to_chat(user, "\blue You remove [battery].") + battery = null else - user << "\red There's no battery to remove!" + to_chat(user, "\red There's no battery to remove!") + if(istype(P, /obj/item/weapon/stock_parts/cell)) if(!battery) @@ -149,9 +160,11 @@ if(do_after(5, target = src)) battery = P P.loc = src - user << "\blue You insert [battery]." + to_chat(user, "\blue You insert [battery].") + else - user << "\red There's already \an [battery] in [src]!" + to_chat(user, "\red There's already \an [battery] in [src]!") + if(istype(P, /obj/item/stack/cable_coil)) @@ -161,16 +174,19 @@ if(P) P:amount -= 5 if(!P:amount) qdel(P) - user << "\blue You add cables to the frame." + to_chat(user, "\blue You add cables to the frame.") + src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if(components.len) - user << "There are parts in the way!" + to_chat(user, "There are parts in the way!") + return playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) - user << "\blue You remove the cables." + to_chat(user, "\blue You remove the cables.") + src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -185,19 +201,22 @@ if(do_after(user, 20, target = src)) if(P) P:use(2) - user << "\blue You put in the glass panel." + to_chat(user, "\blue You put in the glass panel.") + src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "\blue You remove the glass panel." + to_chat(user, "\blue You remove the glass panel.") + src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "\blue You connect the monitor." + to_chat(user, "\blue You connect the monitor.") + var/obj/machinery/computer3/B = new src.circuit.build_path ( src.loc, built=1 ) /*if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -220,7 +239,8 @@ */ /obj/structure/computer3frame/proc/remove_peripheral(var/obj/item/I = null) if(!components || !components.len) - usr << "\red There are no components in [src] to take out!" + to_chat(usr, "\red There are no components in [src] to take out!") + return 0 if(!I) I = input(usr, "Remove which component?","Remove component", null) as null|obj in components @@ -259,44 +279,51 @@ else warning("Erronous component in computerframe/remove_peripheral: [I]") I.loc = loc - usr << "\blue You remove [I]" + to_chat(usr, "\blue You remove [I]") + return 1 return 0 /obj/structure/computer3frame/proc/insert_peripheral(var/obj/item/I) if(components.len >= max_components) - usr << "There isn't room in [src] for another component!" + to_chat(usr, "There isn't room in [src] for another component!") + return 0 switch(I.type) if(/obj/item/part/computer/storage/hdd) if(hdd) - usr << "There is already \an [hdd] in [src]!" + to_chat(usr, "There is already \an [hdd] in [src]!") + return 0 hdd = I components += hdd hdd.loc = src if(/obj/item/part/computer/storage/removable) if(floppy) - usr << "There is already \an [floppy] in [src]!" + to_chat(usr, "There is already \an [floppy] in [src]!") + return 0 floppy = I components += floppy floppy.loc = src if(/obj/item/part/computer/networking/radio) if(radio) - usr << "There is already \an [radio] in [src]!" + to_chat(usr, "There is already \an [radio] in [src]!") + return 0 radio = I components += radio radio.loc = src if(/obj/item/part/computer/networking/cameras) if(camnet) - usr << "There is already \an [camnet] in [src]!" + to_chat(usr, "There is already \an [camnet] in [src]!") + return 0 camnet = I components += camnet camnet.loc = src if(/obj/item/part/computer/networking) if(net) - usr << "There is already \an [net] in [src]!" + to_chat(usr, "There is already \an [net] in [src]!") + diff --git a/code/modules/computer3/component.dm b/code/modules/computer3/component.dm index 442ccce8193..4e0e0ac6807 100644 --- a/code/modules/computer3/component.dm +++ b/code/modules/computer3/component.dm @@ -77,11 +77,13 @@ emag_act(user as mob) if(!writer) - usr << "You insert \the card, and the computer grinds, sparks, and beeps. After a moment, the card ejects itself." + to_chat(usr, "You insert \the card, and the computer grinds, sparks, and beeps. After a moment, the card ejects itself.") + computer.emagged = 1 return 1 else - usr << "You are unable to insert \the card, as the reader slot is occupied" + to_chat(usr, "You are unable to insert \the card, as the reader slot is occupied") + return 0 attackby(var/obj/item/I as obj, var/mob/user as mob, params) @@ -98,30 +100,39 @@ return 0 // This shouldn't happen, just in case.. if(slot == 2 && !dualslot) - usr << "This device has only one card slot" + to_chat(usr, "This device has only one card slot") + return 0 var/mob/living/L = usr switch(slot) if(1) if(equip_to_reader(card, L)) - usr << "You insert the card into reader slot" + to_chat(usr, "You insert the card into reader slot") + else - usr << "There is already something in the reader slot." + to_chat(usr, "There is already something in the reader slot.") + if(2) if(equip_to_writer(card, L)) - usr << "You insert the card into writer slot" + to_chat(usr, "You insert the card into writer slot") + else - usr << "There is already something in the reader slot." + to_chat(usr, "There is already something in the reader slot.") + if(3) if(equip_to_reader(card, L)) - usr << "You insert the card into reader slot" + to_chat(usr, "You insert the card into reader slot") + else if (equip_to_writer(card, L) && dualslot) - usr << "You insert the card into writer slot" + to_chat(usr, "You insert the card into writer slot") + else if (dualslot) - usr << "There is already something in both slots." + to_chat(usr, "There is already something in both slots.") + else - usr << "There is already something in the reader slot." + to_chat(usr, "There is already something in the reader slot.") + // Usage of insert() preferred, as it also tells result to the user. proc/equip_to_reader(var/obj/item/weapon/card/card, var/mob/living/L) @@ -147,35 +158,47 @@ switch(slot) if(1) if (remove_reader(L)) - L << "You remove the card from reader slot" + to_chat(L, "You remove the card from reader slot") + else - L << "There is no card in the reader slot" + to_chat(L, "There is no card in the reader slot") + if(2) if (remove_writer(L)) - L << "You remove the card from writer slot" + to_chat(L, "You remove the card from writer slot") + else - L << "There is no card in the writer slot" + to_chat(L, "There is no card in the writer slot") + if(3) if (remove_reader(L)) if (remove_writer(L)) - L << "You remove cards from both slots" + to_chat(L, "You remove cards from both slots") + else - L << "You remove the card from reader slot" + to_chat(L, "You remove the card from reader slot") + else if(remove_writer(L)) - L << "You remove the card from writer slot" + to_chat(L, "You remove the card from writer slot") + else - L << "There are no cards in both slots" + to_chat(L, "There are no cards in both slots") + if(4) if (!remove_reader(L)) if (remove_writer(L)) - L << "You remove the card from writer slot" + to_chat(L, "You remove the card from writer slot") + else if (!dualslot) - L << "There is no card in the reader slot" + to_chat(L, "There is no card in the reader slot") + else - L << "There are no cards in both slots" + to_chat(L, "There are no cards in both slots") + else - L << "You remove the card from reader slot" + to_chat(L, "You remove the card from reader slot") + proc/remove_reader(var/mob/living/L) @@ -239,7 +262,8 @@ if(slot == 1) // 1: writer if(writer != null) - usr << "There's already a card in that slot!" + to_chat(usr, "There's already a card in that slot!") + return 0 var/mob/living/L = usr L.drop_item() @@ -248,7 +272,8 @@ return 1 else if(slot == 2) // 2: reader if(reader != null) - usr << "There's already a card in that slot!" + to_chat(usr, "There's already a card in that slot!") + return 0 var/mob/living/L = usr L.drop_item() @@ -257,7 +282,8 @@ return 1 else // 0: auto if(reader && writer) - usr << "Both slots are full!" + to_chat(usr, "Both slots are full!") + return 0 var/mob/living/L = usr L.drop_item() diff --git a/code/modules/computer3/computer.dm b/code/modules/computer3/computer.dm index 3e4d8116fac..9f286241560 100644 --- a/code/modules/computer3/computer.dm +++ b/code/modules/computer3/computer.dm @@ -77,11 +77,13 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + to_chat(usr, "\red You can't do that.") + return if(!Adjacent(usr)) - usr << "You can't reach it." + to_chat(usr, "You can't reach it.") + return Reset() @@ -365,7 +367,8 @@ os.attack_hand(user) return - user << "\The [src] won't boot!" + to_chat(user, "\The [src] won't boot!") + attack_ai(var/mob/user as mob) // copypasta because server racks lose attack_hand() if(stat) @@ -390,7 +393,8 @@ os.attack_hand(user) return - user << "\The [src] won't boot!" + to_chat(user, "\The [src] won't boot!") + interact() if(stat) diff --git a/code/modules/computer3/computers/atmos_alert.dm b/code/modules/computer3/computers/atmos_alert.dm index 6596b76d7c7..3b48d0fb2c6 100644 --- a/code/modules/computer3/computers/atmos_alert.dm +++ b/code/modules/computer3/computers/atmos_alert.dm @@ -97,14 +97,16 @@ var/removing_zone = href_list["priority_clear"] for(var/zone in priority_alarms) if(ckey(zone) == removing_zone) - usr << "\green Priority Alert for area [zone] cleared." + to_chat(usr, "\green Priority Alert for area [zone] cleared.") + priority_alarms -= zone if("minor_clear" in href_list) var/removing_zone = href_list["minor_clear"] for(var/zone in minor_alarms) if(ckey(zone) == removing_zone) - usr << "\green Minor Alert for area [zone] cleared." + to_chat(usr, "\green Minor Alert for area [zone] cleared.") + minor_alarms -= zone computer.updateUsrDialog() diff --git a/code/modules/computer3/computers/camera.dm b/code/modules/computer3/computers/camera.dm index 6dce48393db..6500fe6f405 100644 --- a/code/modules/computer3/computers/camera.dm +++ b/code/modules/computer3/computers/camera.dm @@ -316,7 +316,8 @@ if(key) interact() else - usr << "The screen turns to static." + to_chat(usr, "The screen turns to static.") + return // Atlantis: Required for camnetkeys to work. diff --git a/code/modules/computer3/computers/cloning.dm b/code/modules/computer3/computers/cloning.dm index 49ed2a04b84..61d1f25ab83 100644 --- a/code/modules/computer3/computers/cloning.dm +++ b/code/modules/computer3/computers/cloning.dm @@ -79,14 +79,16 @@ proc/RecordsList() var/dat = "

Current records

" - dat += topic_link(src,"menu=1","<< Back") + "

" + to_chat(dat += topic_link(src,"menu=1",", Back") + "

") + for(var/datum/data/record/R in records) dat += "

[R.fields["name"]]

Scan ID [R.fields["id"]] " + topic_link(src,"view_rec=\ref[R]","View Record") return dat proc/ShowRecord() var/dat = "

Selected Record

" - dat += topic_link(src,"menu=2","<< Back") + "

" + to_chat(dat += topic_link(src,"menu=2",", Back") + "

") + if (!active_record) dat += "Record not found." diff --git a/code/modules/computer3/computers/communications.dm b/code/modules/computer3/computers/communications.dm index 727496b7653..ec4482ee28f 100644 --- a/code/modules/computer3/computers/communications.dm +++ b/code/modules/computer3/computers/communications.dm @@ -60,7 +60,8 @@ if(!interactable() || !computer.radio || ..(href,href_list) ) return if (!(computer.z in config.station_levels)) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") + return if("main" in href_list) @@ -103,15 +104,18 @@ feedback_inc("alert_comms_blue",1) tmp_alertlevel = 0 else: - usr << "You are not authorized to do this." + to_chat(usr, "You are not authorized to do this.") + tmp_alertlevel = 0 state = STATE_DEFAULT else - usr << "You need to swipe your ID." + to_chat(usr, "You need to swipe your ID.") + if("announce" in href_list) if(authenticated==2) if(message_cooldown) - usr << "Please allow at least one minute to pass between announcements" + to_chat(usr, "Please allow at least one minute to pass between announcements") + return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") if(!input || !interactable()) @@ -192,13 +196,15 @@ return if(authenticated==2) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !interactable()) return Centcomm_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") + log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 spawn(600)//10 minute cooldown @@ -209,20 +215,23 @@ if("MessageSyndicate" in href_list) if((authenticated==2) && (computer.emagged)) if(centcomm_message_cooldown) - usr << "Arrays recycling. Please stand by." + to_chat(usr, "Arrays recycling. Please stand by.") + return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !interactable()) return Syndicate_announce(input, usr) - usr << "Message transmitted." + to_chat(usr, "Message transmitted.") + log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 spawn(600)//10 minute cooldown centcomm_message_cooldown = 0 if("RestoreBackup" in href_list) - usr << "Backup routing data restored!" + to_chat(usr, "Backup routing data restored!") + computer.emagged = 0 computer.updateDialog() diff --git a/code/modules/computer3/computers/law.dm b/code/modules/computer3/computers/law.dm index 1520f889ee5..099c9453ced 100644 --- a/code/modules/computer3/computers/law.dm +++ b/code/modules/computer3/computers/law.dm @@ -17,15 +17,18 @@ opened = !opened if(opened) - usr << "\blue The access panel is now open." + to_chat(usr, "\blue The access panel is now open.") + else - usr << "\blue The access panel is now closed." + to_chat(usr, "\blue The access panel is now closed.") + return attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params) if (user.z > 6) - user << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") + return if(istype(module, /obj/item/weapon/aiModule)) module.install(src) @@ -35,18 +38,22 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(src.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return src.current = select_active_ai(user) if (!src.current) - usr << "No active AIs detected." + to_chat(usr, "No active AIs detected.") + else - usr << "[src.current.name] selected for law changes." + to_chat(usr, "[src.current.name] selected for law changes.") + return @@ -67,16 +74,20 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) - usr << "The upload computer has no power!" + to_chat(usr, "The upload computer has no power!") + return if(src.stat & BROKEN) - usr << "The upload computer is broken!" + to_chat(usr, "The upload computer is broken!") + return src.current = freeborg() if (!src.current) - usr << "No free cyborgs detected." + to_chat(usr, "No free cyborgs detected.") + else - usr << "[src.current.name] selected for law changes." + to_chat(usr, "[src.current.name] selected for law changes.") + return diff --git a/code/modules/computer3/computers/medical.dm b/code/modules/computer3/computers/medical.dm index 1be7c672827..2094eee9856 100644 --- a/code/modules/computer3/computers/medical.dm +++ b/code/modules/computer3/computers/medical.dm @@ -50,7 +50,8 @@ if(!interactable()) return if (computer.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") + return var/dat diff --git a/code/modules/computer3/computers/message.dm b/code/modules/computer3/computers/message.dm index 27e47684d9c..427c2283808 100644 --- a/code/modules/computer3/computers/message.dm +++ b/code/modules/computer3/computers/message.dm @@ -220,10 +220,12 @@ proc/BruteForce(mob/usr as mob) if(isnull(linkedServer)) - usr << "Could not complete brute-force: Linked Server Disconnected!" + to_chat(usr, "Could not complete brute-force: Linked Server Disconnected!") + else var/currentKey = src.linkedServer.decryptkey - usr << "Brute-force completed! The key is '[currentKey]'." + to_chat(usr, "Brute-force completed! The key is '[currentKey]'.") + src.hacking = 0 src.active_state = normal_icon src.screen = 0 // Return the screen back to normal @@ -414,7 +416,9 @@ O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*")) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - H << "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" + to_chat(H, "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" + + log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") @@ -428,7 +432,9 @@ O.show_message(text("\icon[customrecepient] *[customrecepient.ttone]*")) if( customrecepient.loc && ishuman(customrecepient.loc) ) var/mob/living/carbon/human/H = customrecepient.loc - H << "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)" + to_chat(H, "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)" + + log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") @@ -443,7 +449,8 @@ if(auth) src.screen = 4 - //usr << href_list["select"] +// to_chat(usr, href_list["select"]) + if ("back" in href_list) src.screen = 0 diff --git a/code/modules/computer3/computers/prisoner.dm b/code/modules/computer3/computers/prisoner.dm index f9a4c6f45d5..85c6f0c9562 100644 --- a/code/modules/computer3/computers/prisoner.dm +++ b/code/modules/computer3/computers/prisoner.dm @@ -94,7 +94,8 @@ if( istype(I) && I.imp_in) var/mob/living/carbon/R = I.imp_in log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]") - R << "\green You hear a voice in your head saying: '[warning]'" + to_chat(R, "\green You hear a voice in your head saying: '[warning]'") + interact() return diff --git a/code/modules/computer3/computers/prisonshuttle.dm b/code/modules/computer3/computers/prisonshuttle.dm index e45f32337e2..aedcaaeb07b 100644 --- a/code/modules/computer3/computers/prisonshuttle.dm +++ b/code/modules/computer3/computers/prisonshuttle.dm @@ -46,29 +46,34 @@ var/prison_shuttle_timeleft = 0 A.anchored = 1 if (src.stat & BROKEN) - user << "\blue The broken glass falls out." + to_chat(user, "\blue The broken glass falls out.") + new /obj/item/trash/shard( src.loc ) A.state = 3 A.icon_state = "3" else - user << "\blue You disconnect the monitor." + to_chat(user, "\blue You disconnect the monitor.") + A.state = 4 A.icon_state = "4" del(src) else if(istype(I,/obj/item/card/emag) && (!hacked)) hacked = 1 - user << "\blue You disable the lock." + to_chat(user, "\blue You disable the lock.") + else return src.attack_hand(user) attack_hand(var/mob/user as mob) if(!src.allowed(user) && (!hacked)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return if(prison_break) - user << "\red Unable to locate shuttle." + to_chat(user, "\red Unable to locate shuttle.") + return if(..()) return @@ -100,11 +105,13 @@ var/prison_shuttle_timeleft = 0 if (href_list["sendtodock"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + to_chat(usr, "\red The prison shuttle is unable to leave.") + return if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") + src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_prison = 1 @@ -114,11 +121,13 @@ var/prison_shuttle_timeleft = 0 else if (href_list["sendtostation"]) if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + to_chat(usr, "\red The prison shuttle is unable to leave.") + return if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") - usr << "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds." + to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") + src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_station = 1 @@ -186,7 +195,8 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + to_chat(usr, "\red The prison shuttle is unable to leave.") + return var/area/start_location = locate(/area/shuttle/prison/prison) @@ -215,7 +225,8 @@ var/prison_shuttle_timeleft = 0 if (prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return if (!prison_can_move()) - usr << "\red The prison shuttle is unable to leave." + to_chat(usr, "\red The prison shuttle is unable to leave.") + return var/area/start_location = locate(/area/shuttle/prison/station) diff --git a/code/modules/computer3/computers/robot.dm b/code/modules/computer3/computers/robot.dm index 98eea82f9c2..3e404ff1200 100644 --- a/code/modules/computer3/computers/robot.dm +++ b/code/modules/computer3/computers/robot.dm @@ -125,7 +125,8 @@ src.temp = null else - usr << "\red Access Denied." + to_chat(usr, "\red Access Denied.") + if ("stop" in href_list) src.temp = {" @@ -159,7 +160,8 @@ if(choice == "Confirm") if(R && istype(R)) if(R.mind && R.mind.special_role && R.emagged) - R << "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered." + to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") + R.ResetSecurityCodes() else @@ -167,7 +169,8 @@ log_game("\blue [key_name_admin(usr)] detonated [R.name]!") R.self_destruct() else - usr << "\red Access Denied." + to_chat(usr, "\red Access Denied.") + if ("stopbot" in href_list) if(computer.allowed(usr)) @@ -182,14 +185,17 @@ if (R.lockcharge) // R.cell.charge = R.lockcharge R.lockcharge = !R.lockcharge - R << "Your lockdown has been lifted!" + to_chat(R, "Your lockdown has been lifted!") + else R.lockcharge = !R.lockcharge // R.cell.charge = 0 - R << "You have been locked down!" + to_chat(R, "You have been locked down!") + else - usr << "\red Access Denied." + to_chat(usr, "\red Access Denied.") + if ("magbot" in href_list) if(computer.allowed(usr)) diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm index 46968ea8639..a312f49a423 100644 --- a/code/modules/computer3/computers/scanconsole.dm +++ b/code/modules/computer3/computers/scanconsole.dm @@ -358,7 +358,8 @@ proc/ui_menu() if(!viable) return "No viable occupant detected." - var/dat = topic_link(src,"mode=0","<< Main Menu") + "
" + to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") + dat += "

Modify Unique Identifier

" dat += "
Unique Identifier:
[getblockstring(ui=1)]

" @@ -372,7 +373,8 @@ proc/se_menu() if(!viable) return "No viable occupant detected." - var/dat = topic_link(src,"mode=0","<< Main Menu") + "
" + to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") + dat += "

Modify Structural Enzymes

" dat += "
Structural Enzymes: [getblockstring(ui=0)]

" dat += "Selected Block: " + block_plus_minus("seblock",se_block,1,MAX_SEBLOCK) + "

" @@ -382,7 +384,8 @@ return dat proc/emitter_menu() - var/dat = topic_link(src,"mode=0","<< Main Menu") + "
" + to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") + dat += "

Radiation Emitter Settings

" if (viable) dat += topic_link(src,"pulse","Pulse Radiation") @@ -741,7 +744,8 @@ human_occupant.reagents.add_reagent("inaprovaline", REJUVENATORS_INJECT) else human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline"))) - //usr << text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline")) +// to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline"))) + //////////////////////////////////////////////////////// if (href_list["strucmenuplus"]) diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm index 3c6560d6aa9..047ff3c4359 100644 --- a/code/modules/computer3/computers/security.dm +++ b/code/modules/computer3/computers/security.dm @@ -58,7 +58,8 @@ return if (computer.z > 6) - usr << "\red Unable to establish a connection: \black You're too far away from the station!" + to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") + return var/dat diff --git a/code/modules/computer3/computers/shuttle.dm b/code/modules/computer3/computers/shuttle.dm index 37c5291bada..9fbaa113bab 100644 --- a/code/modules/computer3/computers/shuttle.dm +++ b/code/modules/computer3/computers/shuttle.dm @@ -19,16 +19,19 @@ var/obj/item/device/pda/pda = W W = pda.id if (!W:access) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return var/list/cardaccess = W:access if(!istype(cardaccess, /list) || !cardaccess.len) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return if(!(access_heads in W:access)) //doesn't have this access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") @@ -41,11 +44,13 @@ if (src.auth_need - src.authorized.len > 0) message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[user.ckey] has authorized early shuttle launch") - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) + else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!") + emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -54,10 +59,12 @@ if("Repeal") src.authorized -= W:registered_name - world << text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len) + to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) + if("Abort") - world << "\blue All authorizations to shorting time for shuttle launch have been revoked!" + to_chat(world, "\blue All authorizations to shorting time for shuttle launch have been revoked!") + src.authorized.len = 0 src.authorized = list( ) return @@ -69,7 +76,8 @@ if(!emagged && emergency_shuttle.location == 1) switch(choice) if("Launch") - world << "\blue Alert: Shuttle launch time shortened to 10 seconds!" + to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!") + emergency_shuttle.settimeleft( 10 ) emagged = 1 if("Cancel") diff --git a/code/modules/computer3/computers/specops_shuttle.dm b/code/modules/computer3/computers/specops_shuttle.dm index 409246b9c8a..c863150f38f 100644 --- a/code/modules/computer3/computers/specops_shuttle.dm +++ b/code/modules/computer3/computers/specops_shuttle.dm @@ -58,7 +58,8 @@ var/specops_shuttle_timeleft = 0 if (specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") + return //Begin Marauder launchpad. @@ -153,7 +154,8 @@ var/specops_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") + /proc/specops_can_move() if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0 @@ -170,17 +172,20 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") + else return attack_hand(user) /obj/machinery/computer3/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return if (sent_strike_team == 0) - usr << "\red The strike team has not yet deployed." + to_chat(usr, "\red The strike team has not yet deployed.") + return if(..()) @@ -214,17 +219,20 @@ var/specops_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return - usr << "\blue Central Command will not allow the Special Operations shuttle to return." + to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.") + return else if (href_list["sendtostation"]) if(specops_shuttle_at_station || specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return if (!specops_can_move()) - usr << "\red The Special Operations shuttle is unable to leave." + to_chat(usr, "\red The Special Operations shuttle is unable to leave.") + return - usr << "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") + temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/modules/computer3/computers/syndicate_shuttle.dm b/code/modules/computer3/computers/syndicate_shuttle.dm index 1b4d35456c7..855ae3c02a2 100644 --- a/code/modules/computer3/computers/syndicate_shuttle.dm +++ b/code/modules/computer3/computers/syndicate_shuttle.dm @@ -47,7 +47,8 @@ /obj/machinery/computer3/syndicate_station/attack_hand(mob/user as mob) if(!allowed(user)) - user << "\red Access Denied" + to_chat(user, "\red Access Denied") + return user.set_machine(src) diff --git a/code/modules/computer3/computers/syndicate_specops_shuttle.dm b/code/modules/computer3/computers/syndicate_specops_shuttle.dm index 2e9b4bc1842..c97785300fa 100644 --- a/code/modules/computer3/computers/syndicate_specops_shuttle.dm +++ b/code/modules/computer3/computers/syndicate_specops_shuttle.dm @@ -58,7 +58,8 @@ var/syndicate_elite_shuttle_timeleft = 0 if (syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!syndicate_elite_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") + return sleep(600) @@ -166,7 +167,8 @@ var/syndicate_elite_shuttle_timeleft = 0 for(var/turf/T in get_area_turfs(end_location) ) var/mob/M = locate(/mob) in T - M << "\red You have arrived to [station_name]. Commence operation!" + to_chat(M, "\red You have arrived to [station_name]. Commence operation!") + /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 @@ -183,17 +185,20 @@ var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/card/emag)) - user << "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals." + to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") + else return attack_hand(user) /obj/machinery/computer3/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) - user << "\red Access Denied." + to_chat(user, "\red Access Denied.") + return // if (sent_syndicate_strike_team == 0) -// usr << "\red The strike team has not yet deployed." +// to_chat(usr, "\red The strike team has not yet deployed.") + // return if(..()) @@ -226,17 +231,20 @@ var/syndicate_elite_shuttle_timeleft = 0 if (href_list["sendtodock"]) if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return - usr << "\blue The Syndicate will not allow the Elite Squad shuttle to return." + to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.") + return else if (href_list["sendtostation"]) if(syndicate_elite_shuttle_at_station || syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return if (!specops_can_move()) - usr << "\red The Syndicate Elite shuttle is unable to leave." + to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") + return - usr << "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds." + to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") + temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm index 037b505d779..5d5ba843b0b 100644 --- a/code/modules/computer3/laptop.dm +++ b/code/modules/computer3/laptop.dm @@ -35,22 +35,26 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + to_chat(usr, "\red You can't do that.") + return if(!Adjacent(usr)) - usr << "You can't reach it." + to_chat(usr, "You can't reach it.") + return if(!istype(loc,/turf)) - usr << "[src] is too bulky! You'll have to set it down." + to_chat(usr, "[src] is too bulky! You'll have to set it down.") + return if(!stored_computer) if(contents.len) for(var/obj/O in contents) O.forceMove(loc) - usr << "\The [src] crumbles to pieces." + to_chat(usr, "\The [src] crumbles to pieces.") + spawn(5) qdel(src) return @@ -61,13 +65,15 @@ stored_computer.stat &= ~MAINT stored_computer.update_icon() loc = null - usr << "You open \the [src]." + to_chat(usr, "You open \the [src].") + spawn(5) stored_computer.manipulating = 0 qdel(src) else - usr << "\red You are already opening the computer!" + to_chat(usr, "\red You are already opening the computer!") + AltClick() @@ -95,7 +101,8 @@ var/obj/item/part/computer/cardslot/C = locate() in src.contents if(!C) - usr << "There is no card port on the laptop." + to_chat(usr, "There is no card port on the laptop.") + return var/obj/item/weapon/card/id/card @@ -104,10 +111,12 @@ else if(C.writer) card = C.writer else - usr << "There is nothing to remove from the laptop card port." + to_chat(usr, "There is nothing to remove from the laptop card port.") + return - usr << "You remove [card] from the laptop." + to_chat(usr, "You remove [card] from the laptop.") + C.remove(card) @@ -135,11 +144,13 @@ set src in view(1) if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) - usr << "\red You can't do that." + to_chat(usr, "\red You can't do that.") + return if(!Adjacent(usr)) - usr << "You can't reach it." + to_chat(usr, "You can't reach it.") + return if(istype(loc,/obj/item/device/laptop)) @@ -150,7 +161,8 @@ return if(stat&BROKEN) - usr << "\The [src] is broken! You can't quite get it closed." + to_chat(usr, "\The [src] is broken! You can't quite get it closed.") + return if(!portable) @@ -161,7 +173,8 @@ portable.forceMove(loc) forceMove(portable) stat |= MAINT - usr << "You close \the [src]." + to_chat(usr, "You close \the [src].") + auto_use_power() if(stat&MAINT) diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm index 7e4a0f1769e..4bce2cf7ca4 100644 --- a/code/modules/computer3/lapvend.dm +++ b/code/modules/computer3/lapvend.dm @@ -56,7 +56,8 @@ usr.drop_item() L.loc = src vendmode = 3 - usr << "You slot your [L.name] into \The [src.name]" + to_chat(usr, "You slot your [L.name] into \The [src.name]") + else ..() @@ -262,11 +263,14 @@ network = 0 power = 0 else - usr << "\icon[src]You don't have that much money!" + to_chat(usr, "\icon[src]You don't have that much money!") + else - usr << "\icon[src]Unable to access account. Check security settings and try again." + to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") + else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support." + to_chat(usr, "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support.") + /obj/machinery/lapvend/proc/total() var/total = 0 @@ -405,6 +409,8 @@ power = 0 else - usr << "\icon[src]Unable to access account. Check security settings and try again." + to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") + else - usr << "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support." \ No newline at end of file + to_chat(usr, "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support.") + diff --git a/code/modules/computer3/storage.dm b/code/modules/computer3/storage.dm index 3fe8279fad7..e8a5b4aac8b 100644 --- a/code/modules/computer3/storage.dm +++ b/code/modules/computer3/storage.dm @@ -116,16 +116,19 @@ attackby(obj/O as obj, mob/user as mob, params) if(inserted && istype(O,/obj/item/weapon/pen)) - usr << "You use [O] to carefully pry [inserted] out of [src]." + to_chat(usr, "You use [O] to carefully pry [inserted] out of [src].") + eject_disk(forced = 1) return if(istype(O,/obj/item/weapon/disk/file)) if(inserted) - usr << "There's already a disk in [src]!" + to_chat(usr, "There's already a disk in [src]!") + return - usr << "You insert [O] into [src]." + to_chat(usr, "You insert [O] into [src].") + usr.drop_item() O.loc = src inserted = O diff --git a/code/modules/computer3/upload/programs.dm b/code/modules/computer3/upload/programs.dm index bcf45159b69..5e86666c8b2 100644 --- a/code/modules/computer3/upload/programs.dm +++ b/code/modules/computer3/upload/programs.dm @@ -8,6 +8,7 @@ if(!interactable() || istype(usr,/mob/living/silicon)) return 0 if(!computer.net) - usr << "An indecipherable set of code flicks across the screen. Nothing else happens." + to_chat(usr, "An indecipherable set of code flicks across the screen. Nothing else happens.") + return var/list/results = computer.net.get_machines \ No newline at end of file diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 095dfcbe360..6223a663755 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -20,7 +20,8 @@ /obj/item/weaponcrafting/receiver/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/pipe)) - user << "You attach the shotgun barrel to the receiver. The pins seem loose." + to_chat(user, "You attach the shotgun barrel to the receiver. The pins seem loose.") + var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction user.unEquip(src) user.put_in_hands(I) @@ -42,7 +43,8 @@ var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 user.unEquip(src) user.put_in_hands(C) - user << "You screw the pins into place, securing the pipe to the receiver." + to_chat(user, "You screw the pins into place, securing the pipe to the receiver.") + qdel(src) /obj/item/weaponcrafting/ishotgunconstruction2 @@ -53,7 +55,8 @@ /obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weaponcrafting/stock)) - user << "You attach the stock to the receiver-barrel assembly." + to_chat(user, "You attach the stock to the receiver-barrel assembly.") + var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 user.unEquip(src) user.put_in_hands(I) @@ -75,9 +78,11 @@ var/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/W = new /obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised user.unEquip(src) user.put_in_hands(W) - user << "You tie the wrapping paper around the stock and the barrel to secure it." + to_chat(user, "You tie the wrapping paper around the stock and the barrel to secure it.") + qdel(src) else - user << "You need at least five feet of wrapping paper to secure the stock." + to_chat(user, "You need at least five feet of wrapping paper to secure the stock.") + return diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm index b43c4cb89ce..8fdaaffaba0 100644 --- a/code/modules/crafting/table.dm +++ b/code/modules/crafting/table.dm @@ -203,15 +203,18 @@ return if(href_list["make"]) if(!check_table_space()) - usr << "The table is too crowded." + to_chat(usr, "The table is too crowded.") + return var/datum/table_recipe/TR = locate(href_list["make"]) busy = 1 interact(usr) if(construct_item(usr, TR)) - usr << "[TR.name] constructed." + to_chat(usr, "[TR.name] constructed.") + else - usr << "Construction failed." + to_chat(usr, "Construction failed.") + busy = 0 interact(usr) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index b3cf1793f4f..79817543530 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -28,29 +28,35 @@ /obj/item/device/fluff/tattoo_gun/attack(mob/living/carbon/M as mob, mob/user as mob) if(user.a_intent == "harm") user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!") - M << "[user] stabs you with the [src]!
You feel a tiny prick!" + to_chat(M, "[user] stabs you with the [src]!
You feel a tiny prick!") + return if(used) - user << "The [src] is out of ink." + to_chat(user, "The [src] is out of ink.") + return if(!istype(M, /mob/living/carbon/human)) - user << "You don't think tattooing [M] is the best idea." + to_chat(user, "You don't think tattooing [M] is the best idea.") + return var/mob/living/carbon/human/target = M if(istype(target.species, /datum/species/machine)) - user << "[target] has no skin, how do you expect to tattoo them?" + to_chat(user, "[target] has no skin, how do you expect to tattoo them?") + return if(target.m_style != "None") - user << "[target] already has body markings, any more would look silly!" + to_chat(user, "[target] already has body markings, any more would look silly!") + return if(target == user) - user << "You use the [src] to apply a [tattoo_name] to yourself!" + to_chat(user, "You use the [src] to apply a [tattoo_name] to yourself!") + else user.visible_message("[user] begins to apply a [tattoo_name] [target] with the [src].", "You begin to tattoo [target] with the [src]!") @@ -127,7 +133,8 @@ C.regenerate_icons() C.name = "Detective Sax" C.visible_message("[C] suddenly winks into existence at [user]'s feet!") - user << "[src] crumbles to dust in your hands!" + to_chat(user, "[src] crumbles to dust in your hands!") + qdel(src) /obj/item/weapon/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad @@ -227,15 +234,19 @@ switch(icon_state) if("Kluysfluff1") src.icon_state = "Kluysfluff2" - usr << "The fibre unfolds into a jacket." + to_chat(usr, "The fibre unfolds into a jacket.") + if("Kluysfluff2") src.icon_state = "Kluysfluff3" - usr << "The fibre unfolds into a coat." + to_chat(usr, "The fibre unfolds into a coat.") + if("Kluysfluff3") src.icon_state = "Kluysfluff1" - usr << "The fibre gets sucked back into its holder." + to_chat(usr, "The fibre gets sucked back into its holder.") + else - usr << "You attempt to hit the button but can't." + to_chat(usr, "You attempt to hit the button but can't.") + return usr.update_inv_wear_suit() @@ -284,10 +295,12 @@ if(src.icon_state == "jane_sid_suit_down") src.item_color = "jane_sid_suit" - usr << "You zip up \the [src]." + to_chat(usr, "You zip up \the [src].") + else src.item_color = "jane_sid_suit_down" - usr << "You unzip and roll down \the [src]." + to_chat(usr, "You unzip and roll down \the [src].") + src.icon_state = "[item_color]" src.item_state = "[item_color]" @@ -370,12 +383,14 @@ if(adjusted) icon_state = initial(icon_state) item_state = initial(item_state) - usr << "You untransform \the [src]." + to_chat(usr, "You untransform \the [src].") + adjusted = 0 else icon_state += "_open" item_state += "_open" - usr << "You transform \the [src]." + to_chat(usr, "You transform \the [src].") + adjusted = 1 usr.update_inv_head() diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 909abc1bbdc..9dc4dc7f6ff 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -45,13 +45,15 @@ if(S.contents.len < S.storage_slots) Item.loc = M.back ok = 1 - M << "Your [Item.name] has been added to your [M.back.name]." + to_chat(M, "Your [Item.name] has been added to your [M.back.name].") + if(ok == 0) for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob. if (S.contents.len < S.storage_slots) Item.loc = S ok = 1 - M << "Your [Item.name] has been added to your [S.name]." + to_chat(M, "Your [Item.name] has been added to your [S.name].") + break if(description) Item.desc = description diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm index e2cf4ba6931..ec2c7d12eaa 100644 --- a/code/modules/detective_work/evidence.dm +++ b/code/modules/detective_work/evidence.dm @@ -22,15 +22,18 @@ return if(istype(I, /obj/item/weapon/evidencebag)) - user << "You find putting an evidence bag in another evidence bag to be slightly absurd." + to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") + return 1 //now this is podracing if(I.w_class > 3) - user << "[I] won't fit in [src]." + to_chat(user, "[I] won't fit in [src].") + return if(contents.len) - user << "[src] already has something inside it." + to_chat(user, "[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. @@ -77,7 +80,8 @@ desc = "An empty evidence bag." else - user << "[src] is empty." + to_chat(user, "[src] is empty.") + icon_state = "evidenceobj" return diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 370c224ce52..75bed197992 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -17,7 +17,8 @@ /obj/item/device/detective_scanner/attack_self(var/mob/user) if(log.len && !scanning) scanning = 1 - user << "Printing report, please wait..." + to_chat(user, "Printing report, please wait...") + playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) spawn(100) @@ -32,13 +33,15 @@ if(ismob(loc)) var/mob/M = loc M.put_in_hands(P) - M << "Report printed. Log cleared." + to_chat(M, "Report printed. Log cleared.") + // Clear the logs log = list() scanning = 0 else - user << "The scanner has no logs or is in use." + to_chat(user, "The scanner has no logs or is in use.") + /obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob) return @@ -59,7 +62,8 @@ scanning = 1 user.visible_message("\The [user] points the [src.name] at \the [A] and performs a forensic scan.") - user << "You scan \the [A]. The scanner is now analysing the results..." + to_chat(user, "You scan \the [A]. The scanner is now analysing the results...") + // GATHER INFORMATION @@ -152,10 +156,12 @@ if(!found_something) add_log("# No forensic traces found #", 0) // Don't display this to the holder user if(holder) - holder << "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!" + to_chat(holder, "Unable to locate any fingerprints, materials, fibers, or blood on \the [target_name]!") + else if(holder) - holder << "You finish scanning \the [target_name]." + to_chat(holder, "You finish scanning \the [target_name].") + add_log("---------------------------------------------------------", 0) scanning = 0 @@ -165,7 +171,8 @@ if(scanning) if(broadcast && ismob(loc)) var/mob/M = loc - M << msg + to_chat(M, msg) + log += "  [msg]" else CRASH("[src] \ref[src] is adding a log when it was never put in scanning mode!") diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index 2f359cd2a39..f3d7a2805bc 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -112,7 +112,8 @@ log transactions T.time = worldtime2text() authenticated_account.transaction_log.Add(T) - user << "You insert [C] into [src]." + to_chat(user, "You insert [C] into [src].") + src.attack_hand(user) qdel(I) else @@ -120,7 +121,8 @@ log transactions /obj/machinery/atm/attack_hand(mob/user as mob) if(istype(user, /mob/living/silicon)) - user << "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005." + to_chat(user, "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.") + return if(get_dist(src,user) <= 1) //check to see if the user has low security enabled @@ -225,7 +227,8 @@ log transactions var/target_account_number = text2num(href_list["target_acc_number"]) var/transfer_purpose = href_list["purpose"] if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount)) - usr << "\icon[src]Funds transfer successful." + to_chat(usr, "\icon[src]Funds transfer successful.") + authenticated_account.money -= transfer_amount //create an entry in the account transaction log @@ -238,10 +241,12 @@ log transactions T.amount = "([transfer_amount])" authenticated_account.transaction_log.Add(T) else - usr << "\icon[src]Funds transfer failed." + to_chat(usr, "\icon[src]Funds transfer failed.") + else - usr << "\icon[src]You don't have enough funds to do that!" + to_chat(usr, "\icon[src]You don't have enough funds to do that!") + if("view_screen") view_screen = text2num(href_list["view_screen"]) if("change_security_level") @@ -275,11 +280,13 @@ log transactions T.time = worldtime2text() failed_account.transaction_log.Add(T) else - usr << "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining." + to_chat(usr, "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") + previous_account_number = tried_account_num playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else - usr << "\red \icon[src] incorrect pin/account combination entered." + to_chat(usr, "\red \icon[src] incorrect pin/account combination entered.") + number_incorrect_tries = 0 else playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -295,7 +302,8 @@ log transactions T.time = worldtime2text() authenticated_account.transaction_log.Add(T) - usr << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + to_chat(usr, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") + previous_account_number = tried_account_num if("withdrawal") @@ -308,7 +316,8 @@ log transactions //remove the money if(amount > 10000) // prevent crashes - usr << "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'" + to_chat(usr, "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'") + amount = 10000 authenticated_account.money -= amount withdraw_arbitrary_sum(amount) @@ -323,11 +332,13 @@ log transactions T.time = worldtime2text() authenticated_account.transaction_log.Add(T) else - usr << "\icon[src]You don't have enough funds to do that!" + to_chat(usr, "\icon[src]You don't have enough funds to do that!") + if("balance_statement") if(authenticated_account) if(world.timeofday < lastprint + PRINT_DELAY) - usr << "The [src.name] flashes an error on its display." + to_chat(usr, "The [src.name] flashes an error on its display.") + return lastprint = world.timeofday playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) @@ -391,7 +402,8 @@ log transactions if(I) authenticated_account = attempt_account_access(I.associated_account_number) if(authenticated_account) - human_user << "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'" + to_chat(human_user, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") + //create a transaction log entry var/datum/transaction/T = new() diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index 729ae67acce..f67aba1e6e2 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -111,9 +111,11 @@ var/obj/item/weapon/card/I = O scan_card(I) else - usr << "\icon[src]Unable to connect to linked account." + to_chat(usr, "\icon[src]Unable to connect to linked account.") + else - usr << "\icon[src]Unable to connect to accounts database." + to_chat(usr, "\icon[src]Unable to connect to accounts database.") + else ..() @@ -130,7 +132,8 @@ alert("That is not a valid code!") print_reference() else - usr << "\icon[src]Incorrect code entered." + to_chat(usr, "\icon[src]Incorrect code entered.") + if("change_id") var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code")) if(attempt_code == access_code) @@ -139,7 +142,8 @@ eftpos_name = name + " EFTPOS scanner" print_reference() else - usr << "\icon[src]Incorrect code entered." + to_chat(usr, "\icon[src]Incorrect code entered.") + if("link_account") if(!linked_db) reconnect_database() @@ -148,7 +152,8 @@ var/attempt_pin = input("Enter pin code", "Account pin") as num linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1) else - usr << "\icon[src]Unable to connect to accounts database." + to_chat(usr, "\icon[src]Unable to connect to accounts database.") + if("trans_purpose") var/purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose") as text|null if(purpose) @@ -168,7 +173,8 @@ else if(linked_account) transaction_locked = 1 else - usr << "\icon[src] No account connected to send transactions to." + to_chat(usr, "\icon[src] No account connected to send transactions to.") + if("scan_card") //attempt to connect to a new db, and if that doesn't work then fail if(!linked_db) @@ -178,7 +184,8 @@ if (istype(I, /obj/item/weapon/card)) scan_card(I) else - usr << "\icon[src]Unable to link accounts." + to_chat(usr, "\icon[src]Unable to link accounts.") + if("reset") //reset the access code - requires HoP/captain access var/obj/item/I = usr.get_active_hand() @@ -186,10 +193,12 @@ var/obj/item/weapon/card/id/C = I if(access_cent_commander in C.access || access_hop in C.access || access_captain in C.access) access_code = 0 - usr << "\icon[src]Access code reset to 0." + to_chat(usr, "\icon[src]Access code reset to 0.") + else if (istype(I, /obj/item/weapon/card/emag)) access_code = 0 - usr << "\icon[src]Access code reset to 0." + to_chat(usr, "\icon[src]Access code reset to 0.") + src.attack_self(usr) @@ -233,11 +242,14 @@ T.time = worldtime2text() linked_account.transaction_log.Add(T) else - usr << "\icon[src]You don't have that much money!" + to_chat(usr, "\icon[src]You don't have that much money!") + else - usr << "\icon[src]Unable to access account. Check security settings and try again." + to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") + else - usr << "\icon[src]EFTPOS is not connected to an account." + to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") + else ..() diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm index c1e1f83f27b..e16a475d468 100644 --- a/code/modules/economy/POS.dm +++ b/code/modules/economy/POS.dm @@ -403,7 +403,8 @@ var/const/POS_HEADER = {" src.attack_hand(usr) return if(usr != logged_in) - usr << "\red [logged_in.name] is already logged in. You cannot use this machine until they log out." + to_chat(usr, "\red [logged_in.name] is already logged in. You cannot use this machine until they log out.") + return if("act" in href_list) switch(href_list["act"]) @@ -431,7 +432,8 @@ var/const/POS_HEADER = {" for(var/list/line in splittext(href_list["csv"],"\n")) var/list/cells = splittext(line,",") if(cells.len<2) - usr << "\red The CSV must have at least two columns: Product Name, followed by Price (as a number)." + to_chat(usr, "\red The CSV must have at least two columns: Product Name, followed by Price (as a number).") + src.attack_hand(usr) return var/line_item/LI = new @@ -445,7 +447,8 @@ var/const/POS_HEADER = {" if("Save Settings") var/datum/money_account/new_linked_account = get_money_account(text2num(href_list["payableto"]),z) if(!new_linked_account) - usr << "\red Unable to link new account." + to_chat(usr, "\red Unable to link new account.") + else linked_account = new_linked_account screen=POS_SCREEN_SETTINGS diff --git a/code/modules/economy/utils.dm b/code/modules/economy/utils.dm index a23308b9219..c2148deb9b5 100644 --- a/code/modules/economy/utils.dm +++ b/code/modules/economy/utils.dm @@ -48,7 +48,8 @@ /datum/money_account/proc/charge(var/transaction_amount,var/datum/money_account/dest,var/transaction_purpose, var/terminal_name="", var/terminal_id=0, var/dest_name = "UNKNOWN") if(suspended) - usr << "Unable to access source account: account suspended." + to_chat(usr, "Unable to access source account: account suspended.") + return 0 if(transaction_amount <= money) @@ -88,5 +89,6 @@ transaction_log.Add(T) return 1 else - usr << "Insufficient funds in account." + to_chat(usr, "Insufficient funds in account.") + return 0 \ No newline at end of file diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 3ec9b6d2e46..9a77a6d08ff 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -7,9 +7,12 @@ "#4nd%;f4y6,>?%-BZZZZZZZT") for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts. - A << "
" - A << "[alert]" - A << "
" + to_chat(A, "
") + + to_chat(A, "[alert]") + + to_chat(A, "
") + if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. command_announcement.Announce(alert) @@ -23,8 +26,11 @@ command_announcement.Announce("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT", new_sound = 'sound/misc/interference.ogg') else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) - A << "
" - A << "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT" - A << "
" + to_chat(A, "
") + + to_chat(A, "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") + + to_chat(A, "
") + for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 7ddb6470282..06a40d81fdb 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -73,7 +73,8 @@ if(!report_at_round_end) return - world << "


Random Events This Round:" + to_chat(world, "


Random Events This Round:") + for(var/datum/event/E in active_events|finished_events) var/datum/event_meta/EM = E.event_meta if(EM.name == "Nothing") @@ -87,7 +88,8 @@ else message += "and ran to completion." - world << message + to_chat(world, message) + /datum/event_manager/proc/GetInteractWindow() var/html = "Refresh" diff --git a/code/modules/events/holidays/Holidays.dm b/code/modules/events/holidays/Holidays.dm index 38ea6d63ac6..363cd7017e0 100644 --- a/code/modules/events/holidays/Holidays.dm +++ b/code/modules/events/holidays/Holidays.dm @@ -140,8 +140,10 @@ var/global/Holiday = null //Run at the start of a round /proc/Holiday_Game_Start() if(Holiday) - world << "and..." - world << "

Happy [Holiday] Everybody!

" + to_chat(world, "and...") + + to_chat(world, "

Happy [Holiday] Everybody!

") + switch(Holiday) //special holidays if("Easter") //do easter stuff diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 980319a1979..6a6d2c91469 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -27,9 +27,12 @@ var/message = generate_ion_law(ionMessage) if(message) M.add_ion_law(message) - M << "
" - M << "[message] ...LAWS UPDATED" - M << "
" + to_chat(M, "
") + + to_chat(M, "[message] ...LAWS UPDATED") + + to_chat(M, "
") + if(botEmagChance) for(var/mob/living/simple_animal/bot/bot in machines) diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index b1a6c522081..77f2717831a 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -50,7 +50,8 @@ for(var/obj/machinery/message_server/MS in world) MS.send_rc_message("Engineering", my_department, rc_message, "", "", 2) for(var/mob/living/silicon/ai/A in player_list) - A << "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department]." + to_chat(A, "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].") + else log_to_dd("ERROR: Could not initate grey-tide. Unable to find suitable containment area.") diff --git a/code/modules/events/undead.dm b/code/modules/events/undead.dm index c6aa04ba00f..b2a0f166735 100644 --- a/code/modules/events/undead.dm +++ b/code/modules/events/undead.dm @@ -37,4 +37,5 @@ /datum/event/undead/announce() for(var/mob/living/M in player_list) - M << "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!" + to_chat(M, "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!") + diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index 612c991b938..65db943ae6e 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -39,7 +39,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi throw_range = 7 suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw - viewers(user) << "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.") + return(OXYLOSS) /obj/item/weapon/fishfood @@ -65,7 +66,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi attack_verb = list("scrubbed", "brushed", "scraped") suicide_act(mob/user) - viewers(user) << "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide." + to_chat(viewers(user), "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.") + return(BRUTELOSS|FIRELOSS) ////////////////////////////////////////////// @@ -133,7 +135,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/shark/attackby(var/obj/item/O, var/mob/user as mob) if(istype(O, /obj/item/weapon/wirecutters)) - user << "You rip out the teeth of \the [src.name]!" + to_chat(user, "You rip out the teeth of \the [src.name]!") + new /obj/item/weapon/fish/toothless_shark(get_turf(src)) new /obj/item/weapon/shard/shark_teeth(get_turf(src)) qdel(src) @@ -166,7 +169,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/catfish/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) - user << "You carefully clean and gut \the [src.name]." + to_chat(user, "You carefully clean and gut \the [src.name].") + new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src)) new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src)) qdel(src) @@ -185,7 +189,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/salmon/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) - user << "You carefully clean and gut \the [src.name]." + to_chat(user, "You carefully clean and gut \the [src.name].") + new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src)) new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src)) qdel(src) @@ -201,7 +206,8 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/babycarp/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) - user << "You carefully clean and gut \the [src.name]." + to_chat(user, "You carefully clean and gut \the [src.name].") + new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall. qdel(src) return diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index ba02098e30e..754d6d80fc6 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -310,7 +310,8 @@ src.visible_message("A new [type] has hatched in \the [src]!") //Null type fish are dud eggs, give a message to inform the player else - usr << "The eggs disolve in the water. They were duds!" + to_chat(usr, "The eggs disolve in the water. They were duds!") + /obj/machinery/fishtank/proc/select_egg_type() var/fish = pick(fish_list) //Select a fish from the fish in the tank @@ -340,7 +341,8 @@ /obj/machinery/fishtank/proc/harvest_fish(var/mob/user) if(!fish_count) //Can't catch non-existant fish! - usr << "There are no fish in \the [src] to catch!" + to_chat(usr, "There are no fish in \the [src] to catch!") + return var/caught_fish @@ -496,7 +498,8 @@ //Finally, report the full examine_message constructed from the above reports - user << "[examine_message]" + to_chat(user, "[examine_message]") + return examine_message ////////////////////////////// @@ -523,7 +526,8 @@ kill_fish() //Kill a random fish M.health = M.maxHealth //Eating fish heals the predator else - usr << "There are no fish in [src]!" + to_chat(usr, "There are no fish in [src]!") + else attack_generic(M, M.harm_intent_damage) else if(istype(M, /mob/living/simple_animal/hostile/bear)) @@ -541,7 +545,8 @@ kill_fish() //Kill a random fish M.health = M.maxHealth //Eating fish heals the predator else - usr << "There are no fish in [src]!" + to_chat(usr, "There are no fish in [src]!") + else attack_generic(M, M.harm_intent_damage) else @@ -606,14 +611,17 @@ if(user.a_intent == I_HELP) if(W.isOn()) if(cur_health < max_health) - usr << "You repair some of the cracks on \the [src]." + to_chat(usr, "You repair some of the cracks on \the [src].") + cur_health += 20 check_health() else - usr << "There is no damage to fix!" + to_chat(usr, "There is no damage to fix!") + else if(cur_health < max_health) - usr << "[W.name] must on to repair this damage." + to_chat(usr, "[W.name] must on to repair this damage.") + else user.changeNext_move(CLICK_CD_MELEE) hit(W.force) @@ -622,7 +630,8 @@ if(O.is_open_container()) if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(lid_switch) - usr << "Open the lid on \the [src] first!" + to_chat(usr, "Open the lid on \the [src] first!") + return var/obj/item/weapon/reagent_containers/glass/C = O //Containers with any reagents will get dumped in @@ -640,7 +649,8 @@ C.reagents.clear_reagents() else if(water_level == water_capacity) - usr << "[src] is already full!" + to_chat(usr, "[src] is already full!") + return else message = "The filtration process purifies the water, raising the water level." @@ -656,7 +666,8 @@ //Empty containers will scoop out water, filling the container as much as possible from the water_level else if(water_level == 0) - usr << "[src] is empty!" + to_chat(usr, "[src] is empty!") + else if(water_level >= C.volume) //Enough to fill the container completely C.reagents.add_reagent("fishwater", C.volume) @@ -671,23 +682,27 @@ //Wrenches can deconstruct empty tanks, but not tanks with any water. Kills any fish left inside and destroys any unharvested eggs in the process if(istype(O, /obj/item/weapon/wrench)) if(water_level == 0) - usr << "Now disassembling [src]." + to_chat(usr, "Now disassembling [src].") + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) destroy(1) else - usr << "[src] must be empty before you disassemble it!" + to_chat(usr, "[src] must be empty before you disassemble it!") + return //Fish eggs else if(istype(O, /obj/item/fish_eggs)) var/obj/item/fish_eggs/egg = O //Don't add eggs if there is no water (they kinda need that to live) if(water_level == 0) - usr << "[src] has no water; [egg.name] won't hatch without water!" + to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!") + else //Don't add eggs if the tank already has the max number of fish if(fish_count >= max_fish) - usr << "[src] can't hold any more fish." + to_chat(usr, "[src] can't hold any more fish.") + else add_fish(egg.fish_type) qdel(egg) @@ -703,9 +718,11 @@ user.visible_message("[user.name] feeds the fish in \the [src]. The fish look excited!", "You feed the fish in \the [src]. They look excited!") food_level += 10 else - usr << "[src] already has plenty of food in it. You decide to not add more." + to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.") + else - usr << "[src] doesn't have any water in it. You should fill it with water first." + to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.") + check_food_level() return //Fish egg scoop @@ -723,7 +740,8 @@ //Tank brush if(istype(O, /obj/item/weapon/tank_brush)) if(filth_level == 0) - usr << "[src] is already spotless!" + to_chat(usr, "[src] is already spotless!") + else filth_level = 0 user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.") diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index a6c8ee86e5b..1a04faede2a 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -20,7 +20,8 @@ mob/living/carbon/proc/dream() for(var/i = rand(1,4),i > 0, i--) var/dream_image = pick(dreams) dreams -= dream_image - src << "... [dream_image] ..." + to_chat(src, "... [dream_image] ...") + sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index d07474786ab..2c57b030ede 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -243,11 +243,13 @@ Gunshots/explosions/opening doors/less rare audio (done) sleep(10) if(!xeno) return var/xeno_name = xeno.name - target << "[xeno_name] begins climbing into the ventilation system..." + to_chat(target, "[xeno_name] begins climbing into the ventilation system...") + sleep(10) if(!xeno) return qdel(xeno) - target << "[xeno_name] scrambles into the ventilation ducts!" + to_chat(target, "[xeno_name] scrambles into the ventilation ducts!") + qdel(src) /obj/effect/hallucination/singularity_scare @@ -295,29 +297,41 @@ Gunshots/explosions/opening doors/less rare audio (done) switch(rand(1,5)) if(1) //Laser fight for(var/i=0,i[my_target] flails around wildly.", \ "[my_target] has attacked [src]!") @@ -433,7 +448,8 @@ Gunshots/explosions/opening doors/less rare audio (done) step_away(src,my_target,2) if(prob(30)) for(var/mob/O in oviewers(world.view , my_target)) - O << "[my_target] stumbles around." + to_chat(O, "[my_target] stumbles around.") + /obj/effect/fake_attacker/New(loc,var/mob/living/carbon/T) ..() @@ -459,7 +475,8 @@ Gunshots/explosions/opening doors/less rare audio (done) else if(src.dir == WEST) qdel(src.currentimage) src.currentimage = new /image(left,src) - my_target << currentimage + to_chat(my_target, currentimage) + /obj/effect/fake_attacker/proc/attack_loop() @@ -476,7 +493,8 @@ Gunshots/explosions/opening doors/less rare audio (done) if(prob(15)) src.do_attack_animation(my_target) if(weapon_name) - my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) + to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))) + my_target.show_message("[src.name] has attacked [my_target] with [weapon_name]!", 1) my_target.staminaloss += 30 if(prob(20)) @@ -485,7 +503,8 @@ Gunshots/explosions/opening doors/less rare audio (done) if(!locate(/obj/effect/overlay) in my_target.loc) fake_blood(my_target) else - my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')) + to_chat(my_target, sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))) + my_target.show_message("[src.name] has punched [my_target]!", 1) my_target.staminaloss += 30 if(prob(33)) @@ -503,7 +522,8 @@ Gunshots/explosions/opening doors/less rare audio (done) var/obj/effect/overlay/O = new/obj/effect/overlay(target.loc) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) - target << I + to_chat(target, I) + spawn(300) qdel(O) return @@ -565,13 +585,15 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite person = H people += H if(person) //Basic talk - target << target.hear_say(pick(speak_messages),language = pick(person.languages),speaker = person) + to_chat(target, target.hear_say(pick(speak_messages),language = pick(person.languages),speaker = person)) + else // Radio talk var/list/humans = list() for(var/mob/living/carbon/human/H in living_mob_list) humans += H person = pick(humans) - target << target.hear_radio(pick(radio_messages),language = pick(person.languages),speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ") + to_chat(target, target.hear_radio(pick(radio_messages),language = pick(person.languages),speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ")) + qdel(src) /obj/effect/hallucination/message @@ -588,7 +610,8 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite "You feel faint.", \ "You hear a strange, alien voice in your head...[pick("Hiss","Ssss")]", \ "You can see...everything!") - target << chosen + to_chat(target, chosen) + qdel(src) /mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines @@ -615,29 +638,51 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite new /obj/effect/hallucination/message(src.loc,src) if("sounds") //Strange audio - //src << "Strange Audio" +// to_chat(src, "Strange Audio") + switch(rand(1,18)) - if(1) src << 'sound/machines/airlock.ogg' + if(1) + to_chat(src, 'sound/machines/airlock.ogg') + if(2) - if(prob(50))src << 'sound/effects/Explosion1.ogg' - else src << 'sound/effects/Explosion2.ogg' - if(3) src << 'sound/effects/explosionfar.ogg' - if(4) src << 'sound/effects/Glassbr1.ogg' - if(5) src << 'sound/effects/Glassbr2.ogg' - if(6) src << 'sound/effects/Glassbr3.ogg' - if(7) src << 'sound/machines/twobeep.ogg' - if(8) src << 'sound/machines/windowdoor.ogg' + if(prob(50)) + to_chat(src, 'sound/effects/Explosion1.ogg') + else + to_chat(src, 'sound/effects/Explosion2.ogg') + + if(3) + to_chat(src, 'sound/effects/explosionfar.ogg') + + if(4) + to_chat(src, 'sound/effects/Glassbr1.ogg') + + if(5) + to_chat(src, 'sound/effects/Glassbr2.ogg') + + if(6) + to_chat(src, 'sound/effects/Glassbr3.ogg') + + if(7) + to_chat(src, 'sound/machines/twobeep.ogg') + + if(8) + to_chat(src, 'sound/machines/windowdoor.ogg') + if(9) //To make it more realistic, I added two gunshots (enough to kill) - src << 'sound/weapons/Gunshot.ogg' + to_chat(src, 'sound/weapons/Gunshot.ogg') spawn(rand(10,30)) - src << 'sound/weapons/Gunshot.ogg' - if(10) src << 'sound/weapons/smash.ogg' + to_chat(src, 'sound/weapons/Gunshot.ogg') + + if(10) + to_chat(src, 'sound/weapons/smash.ogg') + if(11) //Same as above, but with tasers. - src << 'sound/weapons/Taser.ogg' + to_chat(src, 'sound/weapons/Taser.ogg') spawn(rand(10,30)) - src << 'sound/weapons/Taser.ogg' + to_chat(src, 'sound/weapons/Taser.ogg') + //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source @@ -646,30 +691,39 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - src << pick(creepyasssounds) + to_chat(src, pick(creepyasssounds)) + if(13) - src << "You feel a tiny prick!" + to_chat(src, "You feel a tiny prick!") + if(14) - src << "

Priority Announcement

" - src << "

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

" - src << sound('sound/AI/shuttledock.ogg') + to_chat(src, "

Priority Announcement

") + to_chat(src, "

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

") + to_chat(src, sound('sound/AI/shuttledock.ogg')) + if(15) - src << 'sound/items/Welder.ogg' + to_chat(src, 'sound/items/Welder.ogg') + if(16) - src << 'sound/items/Screwdriver.ogg' + to_chat(src, 'sound/items/Screwdriver.ogg') + if(17) - src << 'sound/weapons/saberon.ogg' + to_chat(src, 'sound/weapons/saberon.ogg') + if(18) - src << 'sound/weapons/saberoff.ogg' + to_chat(src, 'sound/weapons/saberoff.ogg') + if("hudscrew") //Screwy HUD - //src << "Screwy HUD" +// to_chat(src, "Screwy HUD") + hal_screwyhud = pick(1,2,3,3,4,4) spawn(rand(100,250)) hal_screwyhud = 0 if("items") //Strange items - //src << "Traitor Items" +// to_chat(src, "Traitor Items") + if(!halitem) halitem = new var/list/slots_free = list(ui_lhand,ui_rhand) @@ -715,7 +769,8 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite qdel(halitem) if("dangerflash") //Flashes of danger - //src << "Danger Flash" +// to_chat(src, "Danger Flash") + if(!halimage) var/list/possible_points = list() for(var/turf/simulated/floor/F in view(src,world.view)) @@ -725,13 +780,16 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite switch(rand(1,3)) if(1) - //src << "Space" +// to_chat(src, "Space") + halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER) if(2) - //src << "Fire" +// to_chat(src, "Fire") + halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER) if(3) - //src << "C4" +// to_chat(src, "C4") + halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01) diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm index 76f67e47fb8..05722cd2085 100644 --- a/code/modules/food/cooker.dm +++ b/code/modules/food/cooker.dm @@ -35,11 +35,13 @@ // check if you can put it in the machine /obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user) if(on) - user << "[src] is still active!" + to_chat(user, "[src] is still active!") + return 0 if(istype(check, /obj/item/weapon/reagent_containers/food/snacks)) return 1 - user << "You can only process food!" + to_chat(user, "You can only process food!") + return 0 /obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto) @@ -61,7 +63,8 @@ /obj/machinery/cooker/proc/burn(mob/user, obj/item/weapon/reagent_containers/props) var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src)) setRegents(props, burnt) - user << "You smell burning coming from the [src]!" + to_chat(user, "You smell burning coming from the [src]!") + var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() // burning things makes smoke! smoke.set_up(5, 0, src) smoke.start() @@ -80,7 +83,8 @@ /obj/machinery/cooker/proc/putIn(obj/item/tocook, mob/chef) icon_state = onicon - chef << "You put [tocook] into [src]." + to_chat(chef, "You put [tocook] into [src].") + on = 1 chef.drop_item() tocook.loc = src @@ -98,7 +102,8 @@ if(!burns) if(istype(I, /obj/item/weapon/reagent_containers/food/snacks)) if(checkCooked(I)) - user << "That is already [thiscooktype], it would do nothing!" + to_chat(user, "That is already [thiscooktype], it would do nothing!") + return putIn(I, user) sleep(cooktime) diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index ccab1b11afc..1631456beec 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -324,12 +324,15 @@ /obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params) if(src.contents.len > sandwich_limit) - user << "If you put anything else in or on [src] it's going to make a mess." + to_chat(user, "If you put anything else in or on [src] it's going to make a mess.") + return if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks)) - user << "\The [I] isn't exactly something that you would want to eat." + to_chat(user, "\The [I] isn't exactly something that you would want to eat.") + return - user << "You add [I] to [src]." + to_chat(user, "You add [I] to [src].") + if(istype(I, /obj/item/weapon/reagent_containers/)) var/obj/item/weapon/reagent_containers/F = I F.reagents.trans_to(src, F.reagents.total_volume) @@ -386,7 +389,8 @@ ..(user) var/whatsinside = pick(ingredients) - user << " You think you can see [whatsinside] in there." + to_chat(user, " You think you can see [whatsinside] in there.") + /* /obj/item/weapon/reagent_containers/food/snacks/customizable/attack(mob/M as mob, mob/user as mob, def_zone) //SNOOOOOOOWFLAAAAAAAAAAAAAAAAAKES @@ -402,7 +406,8 @@ H = M if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable. - H << "\red You lacerate your mouth on a [shard.name] in the sandwich!" + to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!") + H.adjustBruteLoss(5) //TODO: Target head if human. ..() */ diff --git a/code/modules/food/icecream_vat.dm b/code/modules/food/icecream_vat.dm index eae35e2df0e..44303927248 100644 --- a/code/modules/food/icecream_vat.dm +++ b/code/modules/food/icecream_vat.dm @@ -32,14 +32,17 @@ /obj/machinery/icemachine/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "A container is already inside [src]." + to_chat(user, "A container is already inside [src].") + return if(!user.drop_item()) - user << "\The [I] is stuck to you!" + to_chat(user, "\The [I] is stuck to you!") + return beaker = I I.forceMove(src) - user << "You add [I] to [src]" + to_chat(user, "You add [I] to [src]") + updateUsrDialog() return if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/icecream)) @@ -51,7 +54,8 @@ I.name += " with sprinkles" I.desc += ". This also has sprinkles." else - user << "This [I] already has sprinkles." + to_chat(user, "This [I] already has sprinkles.") + /obj/machinery/icemachine/proc/validexchange(reag) @@ -59,7 +63,8 @@ return 1 else if(reagents.total_volume < 500) - usr << "[src] vibrates for a moment, apparently accepting the unknown liquid." + to_chat(usr, "[src] vibrates for a moment, apparently accepting the unknown liquid.") + playsound(loc, 'sound/machines/twobeep.ogg', 10, 1) return 1 diff --git a/code/modules/food/oven.dm b/code/modules/food/oven.dm index 3ed9cb3888f..616065f0abc 100644 --- a/code/modules/food/oven.dm +++ b/code/modules/food/oven.dm @@ -17,7 +17,8 @@ /obj/machinery/cooking/attackby(obj/item/I, mob/user, params) if(on) - user << "The machine is already running." + to_chat(user, "The machine is already running.") + return else var/obj/item/F = I @@ -26,7 +27,8 @@ if(!C) return else - user << "You put [F] into [src] for cooking." + to_chat(user, "You put [F] into [src] for cooking.") + user.drop_item() F.loc = src on = TRUE diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm index f6675365f8d..f7ea60a7db7 100644 --- a/code/modules/garbage_collection/garbage_collector.dm +++ b/code/modules/garbage_collection/garbage_collector.dm @@ -142,7 +142,8 @@ var/global/datum/controller/process/garbage_collector/garbageCollector #endif garbageCollector.addTrash(D) else - // world << "WARNING GC DID NOT GET A RETURN VALUE FOR [D], [D.type]!" +// to_chat(world, "WARNING GC DID NOT GET A RETURN VALUE FOR [D], [D.type]!") + garbageCollector.addTrash(D) diff --git a/code/modules/garbage_collection/gc_testing.dm b/code/modules/garbage_collection/gc_testing.dm index f571a00c791..2d2a3801759 100644 --- a/code/modules/garbage_collection/gc_testing.dm +++ b/code/modules/garbage_collection/gc_testing.dm @@ -9,7 +9,8 @@ return garbageCollector.del_everything = !garbageCollector.del_everything - // world << "GC: qdel turned [garbageCollector.del_everything ? "off" : "on"]." +// to_chat(world, "GC: qdel turned [garbageCollector.del_everything ? "off" : "on"].") + log_admin("[key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].") message_admins("\blue [key_name_admin(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].", 1) @@ -44,12 +45,15 @@ return if(!gc_hard_del_types || !gc_hard_del_types.len) - usr << "No hard del()'d types found." + to_chat(usr, "No hard del()'d types found.") + return - usr << "Types hard del()'d by the GC:" + to_chat(usr, "Types hard del()'d by the GC:") + for(var/A in gc_hard_del_types) - usr << "[A]" + to_chat(usr, "[A]") + // Profiling stuff var/global/del_profiling = 0 @@ -169,7 +173,7 @@ var/global/list/ghdels_profiled = list() if(usr && usr.client) usr.client.running_find_references = null running_find_references = null - + /client/verb/purge_all_destroyed_objects() set category = "Debug" if(garbageCollector) @@ -190,4 +194,3 @@ var/global/list/ghdels_profiled = list() if(!running_find_references) find_references(remove_from_queue = FALSE) #endif - \ No newline at end of file diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm index 43d7cf2a464..5f13c6d9aa6 100644 --- a/code/modules/holiday/holiday.dm +++ b/code/modules/holiday/holiday.dm @@ -317,7 +317,8 @@ begin_day += 31 begin_month-- //begins in march, ends in april -// world << "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]" +// to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]") + return ..() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 8aa79cd6484..94e5ea0c8f5 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -28,7 +28,8 @@ if(!plant_controller) sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") + qdel(src) return @@ -83,7 +84,8 @@ if(!plant_controller) sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") + qdel(src) return @@ -182,7 +184,8 @@ return M.stop_pulling() - M << "You slipped on the [name]!" + to_chat(M, "You slipped on the [name]!") + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) @@ -202,7 +205,8 @@ var/obj/item/stack/cable_coil/C = W if(C.use(5)) //TODO: generalize this. - user << "You add some cable to the [src.name] and slide it inside the battery casing." + to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.") + var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(get_turf(user)) if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) @@ -219,21 +223,24 @@ qdel(src) return else if(seed.kitchen_tag == "potato") - user << "You slice \the [src] into sticks." + to_chat(user, "You slice \the [src] into sticks.") + reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) qdel(src) return else if(seed.kitchen_tag == "carrot") - user << "You slice \the [src] into sticks." + to_chat(user, "You slice \the [src] into sticks.") + reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) qdel(src) return else if(seed.kitchen_tag == "watermelon") - user << "You slice \the [src] into large slices." + to_chat(user, "You slice \the [src] into large slices.") + reagents_per_slice = reagents.total_volume/5 for(var/i=0,i<5,i++) slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src)) @@ -241,7 +248,8 @@ qdel(src) return else if(seed.kitchen_tag == "soybeans") - user << "You roughly chop up \the [src]." + to_chat(user, "You roughly chop up \the [src].") + reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) @@ -259,7 +267,8 @@ if(G.amount>=G.max_amount) continue G.attackby(NG, user) - user << "You add the newly-formed wood to the stack. It now contains [NG.amount] planks." + to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.") + qdel(src) return else if(istype(W, /obj/item/weapon/rollingpaper)) @@ -283,10 +292,12 @@ src.reagents.trans_to(J, J.chem_volume) qdel(W) user.put_in_active_hand(J) - user << "\blue You roll the [src] into a rolling paper." + to_chat(user, "\blue You roll the [src] into a rolling paper.") + qdel(src) else - user << "\red You can't roll a smokable from the [src]." + to_chat(user, "\red You can't roll a smokable from the [src].") + ..() @@ -347,12 +358,14 @@ return if(reagents && reagents.total_volume <= 0) //used-up fruit will be destroyed if(user) - user << "\The [src] has dried out and crumbles to dust." + to_chat(user, "\The [src] has dried out and crumbles to dust.") + //user.drop_from_inventory(src) qdel(src) else if(prob(35)) //fruit that still has reagents has a chance of breaking each time it stings on hit if(user) - user << "\The [src] has fallen to bits." + to_chat(user, "\The [src] has fallen to bits.") + //user.drop_from_inventory(src) qdel(src) @@ -378,7 +391,8 @@ return if(user.a_intent == I_DISARM && seed.get_trait(TRAIT_SPREAD) > 0) //Using disarm so we can tell if you want to plant or convert non-final plants - user << "You plant the [src.name]." + to_chat(user, "You plant the [src.name].") + new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) new /obj/effect/plant(get_turf(user), src.seed) qdel(src) @@ -390,13 +404,15 @@ if("comfrey") var/obj/item/stack/medical/bruise_pack/comfrey/poultice = new /obj/item/stack/medical/bruise_pack/comfrey(user.loc) poultice.heal_brute = potency - user << "You mash the leaves into a poultice." + to_chat(user, "You mash the leaves into a poultice.") + qdel(src) return if("aloe") var/obj/item/stack/medical/ointment/aloe/poultice = new /obj/item/stack/medical/ointment/aloe(user.loc) poultice.heal_burn = potency - user << "You mash the petals into a poultice." + to_chat(user, "You mash the petals into a poultice.") + qdel(src) return if("grass") @@ -410,7 +426,8 @@ if(NG.amount>=NG.max_amount) continue NG.attackby(G, user) - user << "You add the newly-formed grass to the stack. It now contains [G.amount] tiles." + to_chat(user, "You add the newly-formed grass to the stack. It now contains [G.amount] tiles.") + qdel(src) return if("sunflower") @@ -424,7 +441,8 @@ if(prob(10)) user.say("PRAISE THE SUN!") else - user << "PRAISE THE SUN!" + to_chat(user, "PRAISE THE SUN!") + user.unEquip(src) user.put_in_hands(NF) qdel(src) @@ -432,7 +450,8 @@ if("nettle") var/obj/item/weapon/grown/nettle/nettle = new /obj/item/weapon/grown/nettle(user.loc) nettle.force = round((5 + potency / 5), 1) - user << "You straighten up the plant." + to_chat(user, "You straighten up the plant.") + user.unEquip(src) user.put_in_hands(nettle) qdel(src) @@ -440,41 +459,52 @@ if("deathnettle") var/obj/item/weapon/grown/nettle/death/DN = new /obj/item/weapon/grown/nettle/death(user.loc) DN.force = round((5 + potency / 2.5), 1) - user << "You straighten up the plant." + to_chat(user, "You straighten up the plant.") + user.unEquip(src) user.put_in_hands(DN) qdel(src) return if("cashpod") - user << "You crack open the cash pod..." + to_chat(user, "You crack open the cash pod...") + var/value = round(seed.get_trait(TRAIT_POTENCY)) user.unEquip(src) switch(value) if(0) - user << "It's empty! What a waste..." + to_chat(user, "It's empty! What a waste...") + if(1 to 10) - user << "It has a space dollar inside. Woo." + to_chat(user, "It has a space dollar inside. Woo.") + new /obj/item/weapon/spacecash(get_turf(user)) if(11 to 20) - user << "It has 10 space dollars inside!" + to_chat(user, "It has 10 space dollars inside!") + new /obj/item/weapon/spacecash/c10(get_turf(user)) if(21 to 30) - user << "It has 20 space dollars inside! Cool!" + to_chat(user, "It has 20 space dollars inside! Cool!") + new /obj/item/weapon/spacecash/c20(get_turf(user)) if(31 to 40) - user << "It has 50 space dollars inside! Nice!" + to_chat(user, "It has 50 space dollars inside! Nice!") + new /obj/item/weapon/spacecash/c50(get_turf(user)) if(41 to 50) - user << "It has 100 space dollars inside! Sweet!" + to_chat(user, "It has 100 space dollars inside! Sweet!") + new /obj/item/weapon/spacecash/c100(get_turf(user)) if(51 to 60) - user << "It has 200 space dollars inside! Awesome!" + to_chat(user, "It has 200 space dollars inside! Awesome!") + new /obj/item/weapon/spacecash/c200(get_turf(user)) if(61 to 80) - user << "It has 500 space dollars inside! CHA-CHING!" + to_chat(user, "It has 500 space dollars inside! CHA-CHING!") + new /obj/item/weapon/spacecash/c500(get_turf(user)) else - user << "It has 1000 space dollars inside! JACKPOT!" + to_chat(user, "It has 1000 space dollars inside! JACKPOT!") + new /obj/item/weapon/spacecash/c1000(get_turf(user)) qdel(src) return @@ -507,5 +537,6 @@ O.update_icon() //update power meters and such batteries_recharged = 1 if(batteries_recharged) - usr << "Battery has recovered." + to_chat(usr, "Battery has recovered.") + ..() \ No newline at end of file diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index c806bf0b8c1..3592e5091d5 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -65,7 +65,8 @@ user.UpdateDamageIcon() else C.take_organ_damage(0,force) - C << "The nettle burns your bare hand!" + to_chat(C, "The nettle burns your bare hand!") + return 1 /obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) @@ -73,7 +74,8 @@ if(force > 0) force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off else - usr << "All the leaves have fallen off the nettle from violent whacking." + to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.") + usr.unEquip(src) qdel(src) @@ -90,11 +92,13 @@ if(..()) if(prob(50)) user.Paralyse(5) - user << "You are stunned by the Deathnettle when you try picking it up!" + to_chat(user, "You are stunned by the Deathnettle when you try picking it up!") + /obj/item/weapon/grown/nettle/death/afterattack(mob/living/carbon/M, mob/user) if(istype(M, /mob/living)) - M << "You are stunned by the powerful acid of the Deathnettle!" + to_chat(M, "You are stunned by the powerful acid of the Deathnettle!") + add_logs(M, user, "attacked", src) M.eye_blurry += force/7 @@ -118,7 +122,8 @@ /obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/knife)) - user << "You use [W] to fashion a pipe out of the corn cob!" + to_chat(user, "You use [W] to fashion a pipe out of the corn cob!") + new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) qdel(src) return @@ -149,8 +154,10 @@ throw_range = 20 /obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob) - M << " [user] smacks you with a [name]!FLOWER POWER" - user << " Your [name]'s FLOWER POWER strikes [M]" + to_chat(M, " [user] smacks you with a [name]!FLOWER POWER") + + to_chat(user, " Your [name]'s FLOWER POWER strikes [M]") + // Novaflower @@ -167,13 +174,17 @@ throw_range = 20 /obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) - M << "[user] smacks you with a [name]!FLOWER POWER" - user << " Your [name]'s FLOWER POWER strikes [M]" + to_chat(M, "[user] smacks you with a [name]!FLOWER POWER") + + to_chat(user, " Your [name]'s FLOWER POWER strikes [M]") + if(istype(M, /mob/living)) - M << "You are heated by the warmth of the of the [name]!" + to_chat(M, "You are heated by the warmth of the of the [name]!") + M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob) if(!user.gloves) - user << "The [name] burns your bare hand!" + to_chat(user, "The [name] burns your bare hand!") + user.adjustFireLoss(rand(1,5)) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 896eb886060..46945d792f6 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -120,15 +120,19 @@ if(get_trait(TRAIT_CARNIVOROUS)) if(get_trait(TRAIT_CARNIVOROUS) == 2) if(affecting) - target << "\The [fruit]'s thorns pierce your [affecting.name] greedily!" + to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!") + else - target << "\The [fruit]'s thorns pierce your flesh greedily!" + to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!") + damage = get_trait(TRAIT_POTENCY)/2 else if(affecting) - target << "\The [fruit]'s thorns dig deeply into your [affecting.name]!" + to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!") + else - target << "\The [fruit]'s thorns dig deeply into your flesh!" + to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!") + damage = get_trait(TRAIT_POTENCY)/5 else return @@ -187,7 +191,8 @@ if(!protection_needed) //properly protected, good job! return - target << "You are stung by \the [fruit]!" + to_chat(target, "You are stung by \the [fruit]!") + for(var/rid in chems) var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5)) target.reagents.add_reagent(rid,injecting) @@ -713,9 +718,13 @@ return if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample) - if(istype(user)) user << "You fail to harvest anything useful." + if(istype(user)) + to_chat(user, "You fail to harvest anything useful.") + else - if(istype(user)) user << "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name]." + if(istype(user)) + to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].") + //This may be a new line. Update the global if it is. if(name == "new line" || !(name in plant_controller.seeds)) diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm index 7e373bfd2a6..211a738f57d 100644 --- a/code/modules/hydroponics/seed_controller.dm +++ b/code/modules/hydroponics/seed_controller.dm @@ -13,11 +13,13 @@ if(!holder) return if(!plant_controller || !plant_controller.gene_tag_list) - usr << "Gene tags not set." + to_chat(usr, "Gene tags not set.") + return for(var/gene_tag in plant_controller.gene_tag_list) - usr << "[gene_tag]" + to_chat(usr, "[gene_tag]") + var/global/datum/controller/plants/plant_controller // Set in New(). @@ -144,7 +146,9 @@ var/global/datum/controller/plants/plant_controller // Set in New(). /client/proc/list_plant_sprites() if(!plant_controller || !plant_controller.plant_sprites || !plant_controller.plant_sprites.len) - world << "Cannot list plant sprites, plant controller or plant sprites list may not be initialized." + to_chat(world, "Cannot list plant sprites, plant controller or plant sprites list may not be initialized.") + for(var/base in plant_controller.plant_sprites) - world << "[base] : [plant_controller.plant_sprites[base]] growth states" \ No newline at end of file + to_chat(world, "[base] : [plant_controller.plant_sprites[base]] growth states") + diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 3f01f903763..0fafc331621 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -17,7 +17,8 @@ if(genes.len) var/choice = alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", "No", "Yes") if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src))) - user << "You wipe the disk data." + to_chat(user, "You wipe the disk data.") + name = initial(name) desc = initial(name) genes = list() @@ -82,21 +83,25 @@ /obj/machinery/botany/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/seeds)) if(seed) - user << "There is already a seed loaded." + to_chat(user, "There is already a seed loaded.") + return var/obj/item/seeds/S =W if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0) - user << "That seed is not compatible with our genetics technology." + to_chat(user, "That seed is not compatible with our genetics technology.") + else user.drop_item(W) W.loc = src seed = W - user << "You load [W] into [src]." + to_chat(user, "You load [W] into [src].") + return if(istype(W,/obj/item/weapon/screwdriver)) open = !open - user << "You [open ? "open" : "close"] the maintenance panel." + to_chat(user, "You [open ? "open" : "close"] the maintenance panel.") + return if(open) @@ -106,24 +111,28 @@ if(istype(W,/obj/item/weapon/disk/botany)) if(loaded_disk) - user << "There is already a data disk loaded." + to_chat(user, "There is already a data disk loaded.") + return else var/obj/item/weapon/disk/botany/B = W if(B.genes && B.genes.len) if(!disk_needs_genes) - user << "That disk already has gene data loaded." + to_chat(user, "That disk already has gene data loaded.") + return else if(disk_needs_genes) - user << "That disk does not have any gene data loaded." + to_chat(user, "That disk does not have any gene data loaded.") + return user.drop_item(W) W.loc = src loaded_disk = W - user << "You load [W] into [src]." + to_chat(user, "You load [W] into [src].") + return ..() diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 568af7a89ec..728a67e34e2 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -62,7 +62,8 @@ var/global/list/plant_seed_sprites = list() /obj/item/seeds/examine(mob/user) ..(user) if(seed && !seed.roundstart) - user << "It's tagged as variety #[seed.uid]." + to_chat(user, "It's tagged as variety #[seed.uid].") + /obj/item/seeds/cutting name = "cuttings" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index ad8cc8fa281..4032d9b0ff4 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -215,12 +215,14 @@ if (loaded) user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].") else - user << "There are no seeds in \the [O.name]." + to_chat(user, "There are no seeds in \the [O.name].") + return else if(istype(O, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + /obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj) if (istype(O.loc, /mob)) diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index c169711ef83..cdbf594abdb 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -92,7 +92,8 @@ if(!plant_controller) sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) - world << "Plant controller does not exist and [src] requires it. Aborting." + to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") + qdel(src) return @@ -243,7 +244,8 @@ if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) if(!seed) - user << "There is nothing to take a sample from." + to_chat(user, "There is nothing to take a sample from.") + return seed.harvest(user,0,1) health -= (rand(3,5)*10) diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index fbdc534c4e4..ec264a71115 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -52,6 +52,7 @@ //entangling people if(victim.loc == src.loc) - victim << "Tendrils [pick("wind", "tangle", "tighten")] around you!" + to_chat(victim, "Tendrils [pick("wind", "tangle", "tighten")] around you!") + can_buckle = 1 buckle_mob(victim) \ No newline at end of file diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 4eda71ebfd1..58ba48a6aaa 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -163,7 +163,9 @@ return if(closed_system) - if(user) user << "You can't harvest from the plant while the lid is shut." + if(user) + to_chat(user, "You can't harvest from the plant while the lid is shut.") + return if(user) @@ -196,7 +198,8 @@ if(!user || !dead) return if(closed_system) - user << "You can't remove the dead plant while the lid is shut." + to_chat(user, "You can't remove the dead plant while the lid is shut.") + return seed = null @@ -208,7 +211,8 @@ yield_mod = 0 mutation_mod = 0 - user << "You remove the dead plant." + to_chat(user, "You remove the dead plant.") + check_health() return @@ -336,11 +340,13 @@ set src in view(1) if(labelled) - usr << "You remove the label." + to_chat(usr, "You remove the label.") + labelled = null update_icon() else - usr << "There is no label to remove." + to_chat(usr, "There is no label to remove.") + return /obj/machinery/portable_atmospherics/hydroponics/verb/setlight() @@ -351,7 +357,8 @@ var/new_light = input("Specify a light level.") as null|anything in list(0,1,2,3,4,5,6,7,8,9,10) if(new_light) tray_light = new_light - usr << "You set the tray to a light level of [tray_light] lumens." + to_chat(usr, "You set the tray to a light level of [tray_light] lumens.") + /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity() //Make sure various values are sane. @@ -398,7 +405,8 @@ if(istype(O, /obj/item/weapon/crowbar)) if(anchored==2) - user << "Unscrew the hoses first!" + to_chat(user, "Unscrew the hoses first!") + return default_deconstruction_crowbar(O, 1) @@ -410,11 +418,13 @@ var/obj/item/weapon/reagent_containers/glass/C = O //Check if container is empty if(!C.reagents.total_volume) - user << "\red [C] is empty." + to_chat(user, "\red [C] is empty.") + return //Container not empty, transfer contents to tray var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the solution to [src]." + to_chat(user, "\blue You transfer [trans] units of the solution to [src].") + check_level_sanity() process_reagents() @@ -427,7 +437,8 @@ toxins += P.toxicity pestlevel -= P.pest_kill_str weedlevel -= P.weed_kill_str - user << "You spray [src] with [O]." + to_chat(user, "You spray [src] with [O].") + playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -440,7 +451,8 @@ user.drop_item(O) toxins += W.toxicity weedlevel -= W.weed_kill_str - user << "You spray [src] with [O]." + to_chat(user, "You spray [src] with [O].") + playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -453,7 +465,8 @@ //Check if there is a plant in the tray if(seed) if(!S.reagents.total_volume) - user << "\red [S] is empty." + to_chat(user, "\red [S] is empty.") + return //Container not empty, transfer contents to tray S.reagents.trans_to(src, S.amount_per_transfer_from_this) @@ -462,20 +475,23 @@ check_level_sanity() update_icon() else - user << "There's nothing in [src] to spray!" + to_chat(user, "There's nothing in [src] to spray!") + else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY if(anchored) if(anchored == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 1 - user << "You unscrew the [src]'s hoses." + to_chat(user, "You unscrew the [src]'s hoses.") + panel_open = 0 else if(anchored == 1) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 2 - user << "You screw in the [src]'s hoses." + to_chat(user, "You screw in the [src]'s hoses.") + panel_open = 1 for(var/obj/machinery/portable_atmospherics/hydroponics/h in range(1,src)) @@ -485,15 +501,18 @@ if(istype(O, /obj/item/weapon/wirecutters) || istype(O, /obj/item/weapon/scalpel)) if(!seed) - user << "There is nothing to take a sample from in \the [src]." + to_chat(user, "There is nothing to take a sample from in \the [src].") + return if(sampled) - user << "You have already sampled from this plant." + to_chat(user, "You have already sampled from this plant.") + return if(dead) - user << "The plant is dead." + to_chat(user, "The plant is dead.") + return // Create a sample. @@ -518,14 +537,17 @@ if(seed) return ..() else - user << "There's no plant to inject." + to_chat(user, "There's no plant to inject.") + return 1 else if(seed) //Leaving this in in case we want to extract from plants later. - user << "You can't get any extract out of this plant." + to_chat(user, "You can't get any extract out of this plant.") + else - user << "There's nothing to draw something from." + to_chat(user, "There's nothing to draw something from.") + return 1 else if (istype(O, /obj/item/seeds)) @@ -536,11 +558,13 @@ user.drop_item(O) if(!S.seed) - user << "The packet seems to be empty. You throw it away." + to_chat(user, "The packet seems to be empty. You throw it away.") + qdel(O) return - user << "You plant the [S.seed.seed_name] [S.seed.seed_noun]." + to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].") + seed = S.seed //Grab the seed datum. dead = 0 age = 1 @@ -554,7 +578,8 @@ check_health() else - user << "\The [src] already has seeds in it!" + to_chat(user, "\The [src] already has seeds in it!") + else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe @@ -563,7 +588,8 @@ weedlevel = 0 update_icon() else - user << "This plot is completely devoid of weeds. It doesn't need uprooting." + to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") + else if (istype(O, /obj/item/weapon/storage/bag/plants)) @@ -583,12 +609,14 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + else if(istype(O, /obj/item/apiary)) if(seed) - user << "[src] is already occupied!" + to_chat(user, "[src] is already occupied!") + else user.drop_item() qdel(O) @@ -600,7 +628,8 @@ qdel(src) else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) - user << "\blue There is alreadu a tank loaded into the [src]." + to_chat(user, "\blue There is alreadu a tank loaded into the [src].") + return var/obj/item/weapon/tank/T = O user.drop_item() @@ -635,26 +664,34 @@ ..(user) if(!seed) - user << "[src] is empty." + to_chat(user, "[src] is empty.") + return - user << "[seed.display_name] are growing here." + to_chat(user, "[seed.display_name] are growing here.") + if(!Adjacent(user)) return - user << "Water: [round(waterlevel,0.1)]/[maxwater]" - user << "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]" + to_chat(user, "Water: [round(waterlevel,0.1)]/[maxwater]") + + to_chat(user, "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]") + if(weedlevel >= 5) - user << "\The [src] is infested with weeds!" + to_chat(user, "\The [src] is infested with weeds!") + if(pestlevel >= 5) - user << "\The [src] is infested with tiny worms!" + to_chat(user, "\The [src] is infested with tiny worms!") + if(dead) - user << "The plant is dead." + to_chat(user, "The plant is dead.") + else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2)) - user << "The plant looks unhealthy." + to_chat(user, "The plant looks unhealthy.") + if(mechanical) var/turf/T = loc @@ -682,7 +719,8 @@ light_available = 5 light_string = "a light level of [light_available] lumens" - user << "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K." + to_chat(user, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K.") + /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb() set name = "Toggle Tray Lid" @@ -695,7 +733,8 @@ return closed_system = !closed_system - user << "You [closed_system ? "close" : "open"] the tray's lid." + to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.") + update_icon() /obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb() @@ -709,9 +748,11 @@ return if(!holding) - usr << "\red There is no tank loaded into [src] to eject." + to_chat(usr, "\red There is no tank loaded into [src] to eject.") + if(istype(holding, /obj/item/weapon/tank)) - usr << "\blue You eject [holding.name] from [src]." + to_chat(usr, "\blue You eject [holding.name] from [src].") + holding.loc = loc holding = null \ No newline at end of file diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm index f21ac2765df..836952ed88d 100644 --- a/code/modules/hydroponics/trays/tray_apiary.dm +++ b/code/modules/hydroponics/trays/tray_apiary.dm @@ -35,10 +35,12 @@ else if(istype(Proj ,/obj/item/projectile/energy/florayield)) if(!yieldmod) yieldmod += 1 - //world << "Yield increased by 1, from 0, to a total of [myseed.yield]" +// to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]") + else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2... yieldmod += 1 - //world << "Yield increased by 1, to a total of [myseed.yield]" +// to_chat(world, "Yield increased by 1, to a total of [myseed.yield]") + else ..() return @@ -46,56 +48,69 @@ /obj/machinery/apiary/attackby(var/obj/item/O as obj, var/mob/user as mob) if(istype(O, /obj/item/queen_bee)) if(health > 0) - user << "\red There is already a queen in there." + to_chat(user, "\red There is already a queen in there.") + else health = 10 nutrilevel += 10 user.drop_item() qdel(O) - user << "\blue You carefully insert the queen into [src], she gets busy making a hive." + to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.") + bees_in_hive = 0 else if(istype(O, /obj/item/beezeez)) beezeez += 100 nutrilevel += 10 user.drop_item() if(health > 0) - user << "\blue You insert [O] into [src]. A relaxed humming appears to pick up." + to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.") + else - user << "\blue You insert [O] into [src]. Now it just needs some bees." + to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.") + qdel(O) else if(istype(O, /obj/item/weapon/minihoe)) if(health > 0) - user << "\red You begin to dislodge the apiary from the tray, the bees don't like that." + to_chat(user, "\red You begin to dislodge the apiary from the tray, the bees don't like that.") + angry_swarm(user) else - user << "\blue You begin to dislodge the dead apiary from the tray." + to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.") + if(do_after(user, 50, target = src)) new hydrotray_type(src.loc) new /obj/item/apiary(src.loc) - user << "\red You dislodge the apiary from the tray." + to_chat(user, "\red You dislodge the apiary from the tray.") + qdel(src) else if(istype(O, /obj/item/weapon/bee_net)) var/obj/item/weapon/bee_net/N = O if(N.caught_bees > 0) - user << "\blue You empty the bees into the apiary." + to_chat(user, "\blue You empty the bees into the apiary.") + bees_in_hive += N.caught_bees N.caught_bees = 0 else - user << "\blue There are no more bees in the net." + to_chat(user, "\blue There are no more bees in the net.") + else if(istype(O, /obj/item/weapon/reagent_containers/glass)) var/obj/item/weapon/reagent_containers/glass/G = O if(harvestable_honey > 0) if(health > 0) - user << "\red You begin to harvest the honey. The bees don't seem to like it." + to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.") + angry_swarm(user) else - user << "\blue You begin to harvest the honey." + to_chat(user, "\blue You begin to harvest the honey.") + if(do_after(user,50, target = src)) G.reagents.add_reagent("honey",harvestable_honey) harvestable_honey = 0 - user << "\blue You successfully harvest the honey." + to_chat(user, "\blue You successfully harvest the honey.") + else - user << "\blue There is no honey left to harvest." + to_chat(user, "\blue There is no honey left to harvest.") + else angry_swarm(user) ..() @@ -236,5 +251,6 @@ if(toxic > 0) H.reagents.add_reagent("toxin", toxic) - usr << "\blue You harvest the honeycomb from the hive. There is a wild buzzing!" + to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!") + angry_swarm(usr) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index a25eaec652b..bb4bde2da23 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -29,7 +29,8 @@ /obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) if(!last_data) - user << "There is no scan data to print." + to_chat(user, "There is no scan data to print.") + return playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) @@ -99,7 +100,8 @@ grown_reagents = H.reagents if(!grown_seed) - user << "[src] can tell you nothing about \the [target]." + to_chat(user, "[src] can tell you nothing about \the [target].") + return form_title = "[grown_seed.seed_name] (#[grown_seed.uid])" @@ -344,7 +346,8 @@ /obj/item/weapon/scythe/tele/attack_self(mob/user as mob) extend = !extend if(extend) - user << "With a flick of the wrist, you extend the scythe. It's reaping time!" + to_chat(user, "With a flick of the wrist, you extend the scythe. It's reaping time!") + icon_state = "tscythe1" item_state = "scythe0" slot_flags &= ~SLOT_BELT @@ -355,7 +358,8 @@ //Extend sound (blade unsheath) playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org else - user << "You collapse the scythe, folding it for easy storage." + to_chat(user, "You collapse the scythe, folding it for easy storage.") + icon_state = "tscythe0" item_state = "tscythe0" //no sprite in other words slot_flags |= SLOT_BELT diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index ceab49c8e2f..746c0eba6f2 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -30,7 +30,8 @@ if(!seed.growth_stages) seed.update_growth_stages() if(!seed.growth_stages) - world << "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value." + to_chat(world, "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.") + return var/overlay_stage = 1 if(age >= seed.get_trait(TRAIT_MATURATION)) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index c3c0ca4eef1..f3ac43660bc 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -54,11 +54,13 @@ var/list/karma_spenders = list() set category = "Special Verbs" if(!ticker || !player_list.len) - usr << "\red You can't award karma until the game has started." + to_chat(usr, "\red You can't award karma until the game has started.") + return if(ticker.current_state == GAME_STATE_PREGAME) - usr << "\red You can't award karma until the game has started." + to_chat(usr, "\red You can't award karma until the game has started.") + return var/list/karma_list = list("Cancel") @@ -68,7 +70,8 @@ var/list/karma_spenders = list() karma_list += M if(!karma_list.len || karma_list.len == 1) - usr << "\red There's no-one to spend your karma on." + to_chat(usr, "\red There's no-one to spend your karma on.") + return var/pickedmob = input("Who would you like to award Karma to?", "Award Karma", "Cancel") as null|mob in karma_list @@ -77,7 +80,8 @@ var/list/karma_spenders = list() return if(!istype(pickedmob, /mob)) - usr << "\red That's not a mob." + to_chat(usr, "\red That's not a mob.") + return spend_karma(pickedmob) @@ -88,37 +92,46 @@ var/list/karma_spenders = list() set category = "Special Verbs" if(!M) - usr << "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing." + to_chat(usr, "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing.") + return if(!istype(M, /mob)) - usr << "\red That's not a mob." + to_chat(usr, "\red That's not a mob.") + return if(!M.client) - usr << "\red That mob has no client connected at the moment." + to_chat(usr, "\red That mob has no client connected at the moment.") + return if(src.client.karma_spent) - usr << "\red You've already spent your karma for the round." + to_chat(usr, "\red You've already spent your karma for the round.") + return for(var/a in karma_spenders) if(a == src.key) - usr << "\red You've already spent your karma for the round." + to_chat(usr, "\red You've already spent your karma for the round.") + return if(M.key == src.key) - usr << "\red You can't spend karma on yourself!" + to_chat(usr, "\red You can't spend karma on yourself!") + return if(M.client.address == src.client.address) message_admins("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!") log_game("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!") - usr << "\red The karma system is not available to multi-accounters." + to_chat(usr, "\red The karma system is not available to multi-accounters.") + var/choice = input("Give [M.name] good karma?", "Karma") in list("Good", "Cancel") if(!choice || choice == "Cancel") return if(choice == "Good" && !(src.client.karma_spent)) if(src.client.karma_spent) - usr << "\red You've already spent your karma for the round." + to_chat(usr, "\red You've already spent your karma for the round.") + return M.client.karma += 1 - usr << "[choice] karma spent on [M.name]." + to_chat(usr, "[choice] karma spent on [M.name].") + src.client.karma_spent = 1 karma_spenders.Add(src.key) if(M.client.karma <= -2 || M.client.karma >= 2) @@ -140,13 +153,15 @@ var/list/karma_spenders = list() set desc = "Reports how much karma you have accrued." var/currentkarma=verify_karma() - usr << {"
You have [currentkarma] available."} + to_chat(usr, {"
You have [currentkarma] available."}) + return /client/proc/verify_karma() var/currentkarma=0 if(!dbcon.IsConnected()) - usr << "\red Unable to connect to karma database. Please try again later.
" + to_chat(usr, "\red Unable to connect to karma database. Please try again later.
") + return else var/DBQuery/query = dbcon.NewQuery("SELECT karma, karmaspent FROM [format_table_name("karmatotals")] WHERE byondkey='[src.key]'") @@ -159,10 +174,12 @@ var/list/karma_spenders = list() karmaspent = query.item[2] currentkarma = (text2num(totalkarma) - text2num(karmaspent)) /* if(totalkarma) - usr << {"
You have [currentkarma] available.
+ to_chat(usr, {"
You have [currentkarma] available.
) + You've gained [totalkarma] total karma in your time here.
"} else - usr << "Your total karma is: 0
"*/ + to_chat(usr, "Your total karma is: 0
")*/ + return currentkarma /client/verb/karmashop() @@ -265,7 +282,8 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during whitelist logging (adding new key). Error: \[[err]\]\n") return else - usr << "You have unlocked [job]." + to_chat(usr, "You have unlocked [job].") + message_admins("[key_name(usr)] has unlocked [job].") karmacharge(cost) @@ -281,11 +299,13 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during whitelist logging (updating existing entry). Error : \[[err]\]\n") return else - usr << "You have unlocked [job]." + to_chat(usr, "You have unlocked [job].") + message_admins("[key_name(usr)] has unlocked [job].") karmacharge(cost) else - usr << "You already have this job unlocked!" + to_chat(usr, "You already have this job unlocked!") + return /client/proc/DB_species_unlock(var/species,var/cost) @@ -305,7 +325,8 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during whitelist logging (adding new key). Error : \[[err]\]\n") return else - usr << "You have unlocked [species]." + to_chat(usr, "You have unlocked [species].") + message_admins("[key_name(usr)] has unlocked [species].") karmacharge(cost) @@ -321,11 +342,13 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during whitelist logging (updating existing entry). Error: \[[err]\]\n") return else - usr << "You have unlocked [species]." + to_chat(usr, "You have unlocked [species].") + message_admins("[key_name(usr)] has unlocked [species].") karmacharge(cost) else - usr << "You already have this species unlocked!" + to_chat(usr, "You already have this species unlocked!") + return /client/proc/karmacharge(var/cost,var/refund = 0) @@ -345,7 +368,8 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during karmaspent updating (updating existing entry). Error: \[[err]\]\n") return else - usr << "You have been [refund ? "refunded" : "charged"] [cost] karma." + to_chat(usr, "You have been [refund ? "refunded" : "charged"] [cost] karma.") + message_admins("[key_name(usr)] has been [refund ? "refunded" : "charged"] [cost] karma.") return @@ -371,7 +395,8 @@ You've gained [totalkarma] total karma in your time here.
"} else if(name == "Nanotrasen Recruiter") cost = 10 else - usr << "\red That job is not refundable." + to_chat(usr, "\red That job is not refundable.") + return var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'") @@ -392,7 +417,8 @@ You've gained [totalkarma] total karma in your time here.
"} else if(type == "species") typelist = splittext(dbspecies,",") else - usr << "\red Type [type] is not a valid column." + to_chat(usr, "\red Type [type] is not a valid column.") + if(name in typelist) typelist -= name @@ -404,14 +430,17 @@ You've gained [totalkarma] total karma in your time here.
"} message_admins("SQL ERROR during whitelist logging (updating existing entry). Error: \[[err]\]\n") return else - usr << "You have been refunded [cost] karma for [type] [name]." + to_chat(usr, "You have been refunded [cost] karma for [type] [name].") + message_admins("[key_name(usr)] has been refunded [cost] karma for [type] [name].") karmacharge(text2num(cost),1) else - usr << "\red You have not bought [name]." + to_chat(usr, "\red You have not bought [name].") + else - usr << "\red Your ckey ([dbckey]) was not found." + to_chat(usr, "\red Your ckey ([dbckey]) was not found.") + /client/proc/checkpurchased(var/name = null) // If the first parameter is null, return a full list of purchases var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'") diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 962470c4cf1..64384fb7dcb 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -32,7 +32,8 @@ O.loc = src update_icon() else if(istype(O, /obj/item/weapon/wrench)) - user << "\blue Now disassembling bookcase" + to_chat(user, "\blue Now disassembling bookcase") + playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) new /obj/item/stack/sheet/wood(get_turf(src)) @@ -160,19 +161,22 @@ /obj/item/weapon/book/attack_self(var/mob/user as mob) if(carved) if(store) - user << "[store] falls out of [title]!" + to_chat(user, "[store] falls out of [title]!") + store.loc = get_turf(src.loc) store = null return else - user << "The pages of [title] have been cut out!" + to_chat(user, "The pages of [title] have been cut out!") + return if(src.dat) user << browse("Penned by [author].
" + "[dat]", "window=book") user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") onclose(user, "book") else - user << "This book is completely blank!" + to_chat(user, "This book is completely blank!") + /obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(carved) @@ -181,24 +185,29 @@ user.drop_item() W.loc = src store = W - user << "You put [W] in [title]." + to_chat(user, "You put [W] in [title].") + return else - user << "[W] won't fit in [title]." + to_chat(user, "[W] won't fit in [title].") + return else - user << "There's already something in [title]!" + to_chat(user, "There's already something in [title]!") + return if(istype(W, /obj/item/weapon/pen)) if(unique) - user << "These pages don't seem to take the ink well. Looks like you can't modify it." + to_chat(user, "These pages don't seem to take the ink well. Looks like you can't modify it.") + return var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel") switch(choice) if("Title") var/newtitle = reject_bad_text(stripped_input(usr, "Write a new title:")) if(!newtitle) - usr << "The title is invalid." + to_chat(usr, "The title is invalid.") + return else src.name = newtitle @@ -206,14 +215,16 @@ if("Contents") var/content = strip_html(input(usr, "Write your book's contents (HTML NOT allowed):"),8192) as message|null if(!content) - usr << "The content is invalid." + to_chat(usr, "The content is invalid.") + return else src.dat += content if("Author") var/newauthor = stripped_input(usr, "Write the author's name:") if(!newauthor) - usr << "The name is invalid." + to_chat(usr, "The name is invalid.") + return else src.author = newauthor @@ -222,37 +233,46 @@ else if(istype(W, /obj/item/weapon/barcodescanner)) var/obj/item/weapon/barcodescanner/scanner = W if(!scanner.computer) - user << "[W]'s screen flashes: 'No associated computer found!'" + to_chat(user, "[W]'s screen flashes: 'No associated computer found!'") + else switch(scanner.mode) if(0) scanner.book = src - user << "[W]'s screen flashes: 'Book stored in buffer.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer.'") + if(1) scanner.book = src scanner.computer.buffer_book = src.name - user << "[W]'s screen flashes: 'Book stored in buffer. Book title stored in associated computer buffer.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book title stored in associated computer buffer.'") + if(2) scanner.book = src for(var/datum/borrowbook/b in scanner.computer.checkouts) if(b.bookname == src.name) scanner.computer.checkouts.Remove(b) - user << "[W]'s screen flashes: 'Book stored in buffer. Book has been checked in.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book has been checked in.'") + return - user << "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'") + if(3) scanner.book = src for(var/obj/item/weapon/book in scanner.computer.inventory) if(book == src) - user << "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'") + return scanner.computer.inventory.Add(src) - user << "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'" + to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") + else if(istype(W, /obj/item/weapon/kitchen/knife) || istype(W, /obj/item/weapon/wirecutters)) if(carved) return - user << "You begin to carve out [title]." + to_chat(user, "You begin to carve out [title].") + if(do_after(user, 30, target = src)) - user << "You carve out the pages from [title]! You didn't want to read it anyway." + to_chat(user, "You carve out the pages from [title]! You didn't want to read it anyway.") + carved = 1 return else @@ -277,7 +297,8 @@ mode += 1 if(mode > 3) mode = 0 - user << "[src] Status Display:" + to_chat(user, "[src] Status Display:") + var/modedesc switch(mode) if(0) @@ -290,9 +311,13 @@ modedesc = "Scan book to local buffer, attempt to add book to general inventory." else modedesc = "ERROR" - user << " - Mode [mode] : [modedesc]" + to_chat(user, " - Mode [mode] : [modedesc]") + if(src.computer) - user << "Computer has been associated with this unit." + to_chat(user, "Computer has been associated with this unit.") + else - user << "No associated computer found. Only local scans will function properly." - user << "\n" \ No newline at end of file + to_chat(user, "No associated computer found. Only local scans will function properly.") + + to_chat(user, "\n") + diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 3f93963a796..c65c82445e0 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -147,7 +147,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f dat += "7. Access the Forbidden Lore Vault
" if(src.arcanecheckout) new /obj/item/weapon/tome(src.loc) - 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 dusty old tome sitting on the desk. You don't really remember printing it." + 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 dusty old tome sitting on the desk. You don't really remember printing it.") + user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2) src.arcanecheckout = 0 if(1) @@ -244,7 +245,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(istype(W, /obj/item/weapon/barcodescanner)) var/obj/item/weapon/barcodescanner/scanner = W scanner.computer = src - user << "[scanner]'s associated machine has been set to [src]." + to_chat(user, "[scanner]'s associated machine has been set to [src].") + for (var/mob/V in hearers(src)) V.show_message("[src] lets out a low, short blip.", 2) else @@ -481,7 +483,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f set desc = "Permamently deletes a book from the database." set category = "Admin" if(!src.holder) - src << "Only administrators may use this command." + to_chat(src, "Only administrators may use this command.") + return var/isbn = input("ISBN number?", "Delete Book") as num | null diff --git a/code/modules/media/broadcast/receivers/radio.dm b/code/modules/media/broadcast/receivers/radio.dm index 095550197e3..1d155f186bf 100644 --- a/code/modules/media/broadcast/receivers/radio.dm +++ b/code/modules/media/broadcast/receivers/radio.dm @@ -14,7 +14,8 @@ /obj/machinery/media/receiver/boombox/attack_hand(var/mob/user) if(stat & (NOPOWER|BROKEN)) - usr << "\red You don't see anything to mess with." + to_chat(usr, "\red You don't see anything to mess with.") + return user.set_machine(src) interact(user) @@ -59,7 +60,8 @@ media_frequency = newfreq connect_frequency() else - usr << "\red Invalid FM frequency. (90.0, 200.0)" + to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)") + updateDialog() diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm index 55bb10eaf7d..c732e5bce96 100644 --- a/code/modules/media/broadcast/transmitters/broadcast.dm +++ b/code/modules/media/broadcast/transmitters/broadcast.dm @@ -135,7 +135,8 @@ media_frequency = newfreq connect_frequency() else - usr << "\red Invalid FM frequency. (90.0, 200.0)" + to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)") + /obj/machinery/media/transmitter/broadcast/process() if(stat & (NOPOWER|BROKEN)) @@ -160,23 +161,27 @@ var/datum/gas_mixture/removed = env.remove(transfer_moles) - //world << "got [transfer_moles] moles at [removed.temperature]" +// to_chat(world, "got [transfer_moles] moles at [removed.temperature]") + if(removed) var/heat_capacity = removed.heat_capacity() - //world << "heating ([heat_capacity])" +// to_chat(world, "heating ([heat_capacity])") + if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE if(removed.temperature < MAX_TEMP + T0C) removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE else removed.temperature = max(removed.temperature - heating_power/heat_capacity, TCMB) - //world << "now at [removed.temperature]" +// to_chat(world, "now at [removed.temperature]") + env.merge(removed) - //world << "turf now at [env.temperature]" +// to_chat(world, "turf now at [env.temperature]") + /* // Checks heat from the environment and applies any integrity damage var/datum/gas_mixture/environment = loc.return_air() diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm index a6b27dcd1e7..6337dccdb34 100644 --- a/code/modules/media/jukebox.dm +++ b/code/modules/media/jukebox.dm @@ -115,7 +115,8 @@ var/global/loopModeNames=list( /obj/machinery/media/jukebox/attack_hand(var/mob/user) if(stat & NOPOWER) - usr << "\red You don't see anything to mess with." + to_chat(usr, "\red You don't see anything to mess with.") + return if(stat & BROKEN && playlist!=null) user.visible_message("\red [user.name] smacks the side of \the [src.name].","\red You hammer the side of \the [src.name].") @@ -180,7 +181,8 @@ var/global/loopModeNames=list( /obj/machinery/media/jukebox/Topic(href, href_list) ..() if(emagged) - usr << "\red You touch the bluescreened menu. Nothing happens. You feel dumber." + to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.") + return if (href_list["power"]) @@ -190,7 +192,8 @@ var/global/loopModeNames=list( if (href_list["playlist"]) if(!check_reload()) - usr << "\red You must wait 60 seconds between playlist reloads." + to_chat(usr, "\red You must wait 60 seconds between playlist reloads.") + return playlist_id=href_list["playlist"] last_reload=world.time diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 3753f358500..8aa525ac896 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -81,7 +81,8 @@ if(vlc.attachEvent) { #ifdef DEBUG_MEDIAPLAYER -#define MP_DEBUG(x) owner << x +to_chat(#define MP_DEBUG(x) owner, x) + #warning Please comment out #define DEBUG_MEDIAPLAYER before committing. #else #define MP_DEBUG(x) @@ -137,7 +138,8 @@ if(vlc.attachEvent) { if(M && M.playing) targetURL = M.media_url targetStartTime = M.media_start_time - //owner << "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s." +// to_chat(owner, "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.") + //else // testing("M is not playing or null.") @@ -155,7 +157,8 @@ if(vlc.attachEvent) { set desc = "Set jukebox volume" if(!media || !istype(media)) - usr << "You have no media datum to change, if you're not in the lobby tell an admin." + to_chat(usr, "You have no media datum to change, if you're not in the lobby tell an admin.") + return var/value = input("Choose your Jukebox volume.", "Jukebox volume", media.get_volume()) value = round(max(0, min(100, value))) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index 7b7f6eded45..bd5f8b338d0 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -64,29 +64,35 @@ /obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob) if(locked) - user << "The crate is locked with a Deca-code lock." + to_chat(user, "The crate is locked with a Deca-code lock.") + var/input = input(usr, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as num if(in_range(src, user)) input = Clamp(input, 0, 10) if (input == code) - user << "The crate unlocks!" + to_chat(user, "The crate unlocks!") + locked = 0 overlays.Cut() overlays += greenlight else if (input == null || input > max || input < min) - user << "You leave the crate alone." + to_chat(user, "You leave the crate alone.") + else - user << "A red light flashes." + to_chat(user, "A red light flashes.") + lastattempt = input attempts-- if (attempts == 0) - user << "The crate's anti-tamper system activates!" + to_chat(user, "The crate's anti-tamper system activates!") + var/turf/T = get_turf(src.loc) explosion(T, -1, -1, 1, 1) qdel(src) return else - user << "You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out." + to_chat(user, "You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.") + return else return ..() @@ -94,21 +100,28 @@ /obj/structure/closet/crate/secure/loot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(locked) if (istype(W, /obj/item/weapon/card/emag)) - user << "The crate unlocks!" + to_chat(user, "The crate unlocks!") + locked = 0 if (istype(W, /obj/item/device/multitool)) - user << "DECA-CODE LOCK REPORT:" + to_chat(user, "DECA-CODE LOCK REPORT:") + if (attempts == 1) - user << "* Anti-Tamper Bomb will activate on next failed access attempt." + to_chat(user, "* Anti-Tamper Bomb will activate on next failed access attempt.") + else - user << "* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts." + to_chat(user, "* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.") + if (lastattempt == null) - user << " has been made to open the crate thus far." + to_chat(user, " has been made to open the crate thus far.") + return // hot and cold if (code > lastattempt) - user << "* Last access attempt lower than expected code." + to_chat(user, "* Last access attempt lower than expected code.") + else - user << "* Last access attempt higher than expected code." + to_chat(user, "* Last access attempt higher than expected code.") + else ..() else ..() diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index e40e9ff77ed..70fd5738c2d 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -102,15 +102,18 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/CC = W if(string_attached) - user << "There already is a string attached to this coin." + to_chat(user, "There already is a string attached to this coin.") + return if (CC.use(1)) overlays += image('icons/obj/items.dmi',"coin_string_overlay") string_attached = 1 - user << "You attach a string to the coin." + to_chat(user, "You attach a string to the coin.") + else - user << "You need one length of cable to attach a string to the coin." + to_chat(user, "You need one length of cable to attach a string to the coin.") + return else if(istype(W,/obj/item/weapon/wirecutters)) @@ -123,7 +126,8 @@ CC.update_icon() overlays = list() string_attached = null - user << "You detach the string from the coin." + to_chat(user, "You detach the string from the coin.") + else if(istype(W,/obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.welding && WT.remove_fuel(0, user)) @@ -134,7 +138,8 @@ "uranium" = /obj/item/clothing/gloves/ring/uranium) var/typekey = typelist[cmineral] if(ispath(typekey)) - user << "\blue You make [src] into a ring." + to_chat(user, "\blue You make [src] into a ring.") + new typekey(get_turf(loc)) qdel(src) else ..() diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index 383285a20f4..a4e4c6e9eb7 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -209,7 +209,8 @@ inserted_id.mining_points += points points = 0 else - usr << "Required access not found." + to_chat(usr, "Required access not found.") + else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) @@ -217,7 +218,9 @@ return I.loc = src inserted_id = I - else usr << "No valid ID." + else + to_chat(usr, "No valid ID.") + if(href_list["release"]) if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user. if(!(text2path(href_list["release"]) in stack_list)) return @@ -231,7 +234,8 @@ if(inp.amount < 1) stack_list -= text2path(href_list["release"]) else - usr << "Required access not found." + to_chat(usr, "Required access not found.") + if(href_list["plasteel"]) if(check_access(inserted_id) || allowed(usr)) if(!(/obj/item/stack/sheet/metal in stack_list)) return @@ -247,7 +251,8 @@ plasmastack.amount -= plasteelout.amount unload_mineral(plasteelout) else - usr << "Required access not found." + to_chat(usr, "Required access not found.") + if(href_list["plasglass"]) if(check_access(inserted_id) || allowed(usr)) if(!(/obj/item/stack/sheet/glass in stack_list)) return @@ -263,7 +268,8 @@ plasmastack.amount -= plasglassout.amount unload_mineral(plasglassout) else - usr << "Required access not found." + to_chat(usr, "Required access not found.") + updateUsrDialog() return @@ -414,7 +420,9 @@ return I.loc = src inserted_id = I - else usr << "No valid ID." + else + to_chat(usr, "No valid ID.") + if(href_list["purchase"]) if(istype(inserted_id)) var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) @@ -495,15 +503,18 @@ if(points) var/obj/item/weapon/card/id/C = I C.mining_points += points - user << "You transfer [points] points to [C]." + to_chat(user, "You transfer [points] points to [C].") + points = 0 else - user << "There's no points left on [src]." + to_chat(user, "There's no points left on [src].") + ..() /obj/item/weapon/card/mining_point_card/examine(mob/user) ..(user) - user << "There's [points] points on the card." + to_chat(user, "There's [points] points on the card.") + /**********************Jaunter**********************/ @@ -522,7 +533,8 @@ /obj/item/device/wormhole_jaunter/attack_self(mob/user as mob) var/turf/device_turf = get_turf(user) if(!device_turf||device_turf.z==2||device_turf.z>=7) - user << "You're having difficulties getting the [src.name] to work." + to_chat(user, "You're having difficulties getting the [src.name] to work.") + return else user.visible_message("[user.name] activates the [src.name]!") @@ -532,7 +544,8 @@ if(T.z == ZLEVEL_STATION) L += B if(!L.len) - user << "The [src.name] failed to create a wormhole." + to_chat(user, "The [src.name] failed to create a wormhole.") + return var/chosen_beacon = pick(L) var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon) @@ -603,10 +616,12 @@ /obj/item/weapon/resonator/attack_self(mob/user as mob) if(burst_time == 50) burst_time = 30 - user << "You set the resonator's fields to detonate after 3 seconds." + to_chat(user, "You set the resonator's fields to detonate after 3 seconds.") + else burst_time = 50 - user << "You set the resonator's fields to detonate after 5 seconds." + to_chat(user, "You set the resonator's fields to detonate after 5 seconds.") + /obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) @@ -643,11 +658,13 @@ if(creator) for(var/mob/living/L in src.loc) add_logs(L, creator, "used a resonator field on", object="resonator") - L << "The [src.name] ruptured with you in it!" + to_chat(L, "The [src.name] ruptured with you in it!") + L.adjustBruteLoss(resonance_damage) else for(var/mob/living/L in src.loc) - L << "The [src.name] ruptured with you in it!" + to_chat(L, "The [src.name] ruptured with you in it!") + L.adjustBruteLoss(resonance_damage) qdel(src) @@ -723,16 +740,20 @@ var/obj/item/weapon/weldingtool/W = I if(W.welding && !stat) if(stance != HOSTILE_STANCE_IDLE) - user << "[src] is moving around too much to repair!" + to_chat(user, "[src] is moving around too much to repair!") + return if(maxHealth == health) - user << "[src] is at full integrity." + to_chat(user, "[src] is at full integrity.") + else health += 10 - user << "You repair some of the armor on [src]." + to_chat(user, "You repair some of the armor on [src].") + return if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner)) - user << "You instruct [src] to drop any collected ore." + to_chat(user, "You instruct [src] to drop any collected ore.") + DropOre() return ..() @@ -754,10 +775,12 @@ switch(search_objects) if(0) SetCollectBehavior() - M << "[src] has been set to search and store loose ore." + to_chat(M, "[src] has been set to search and store loose ore.") + if(2) SetOffenseBehavior() - M << "[src] has been set to attack hostile wildlife." + to_chat(M, "[src] has been set to attack hostile wildlife.") + return ..() @@ -864,10 +887,12 @@ icon_state = "lazarus_empty" return else - user << "[src] is only effective on the dead." + to_chat(user, "[src] is only effective on the dead.") + return else - user << "[src] is only effective on lesser beings." + to_chat(user, "[src] is only effective on lesser beings.") + return /obj/item/weapon/lazarus_injector/emag_act() @@ -881,9 +906,11 @@ /obj/item/weapon/lazarus_injector/examine(mob/user) ..(user) if(!loaded) - user << "[src] is empty." + to_chat(user, "[src] is empty.") + if(malfunctioning) - user << "The display on [src] seems to be flickering." + to_chat(user, "The display on [src] seems to be flickering.") + /**********************Mining Scanner**********************/ @@ -989,8 +1016,10 @@ /obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user) var/obj/item/organ/internal/hivelord_core/C = M if(!istype(C, /obj/item/organ/internal/hivelord_core)) - user << "The stabilizer only works on hivelord cores." + to_chat(user, "The stabilizer only works on hivelord cores.") + return ..() C.preserved = 1 - user << "You inject the hivelord core with the stabilizer. It will no longer go inert." + to_chat(user, "You inject the hivelord core with the stabilizer. It will no longer go inert.") + qdel(src) \ No newline at end of file diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 07233a2f6fd..03782a96f7f 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -18,10 +18,12 @@ if(href_list["move"]) var/obj/docking_port/mobile/M = shuttle_master.getShuttle("laborcamp") if(!M) - usr << "Cannot locate shuttle!" + to_chat(usr, "Cannot locate shuttle!") + return 0 var/obj/docking_port/stationary/S = M.get_docked() if(S && S.name == "laborcamp_away") - usr << "Shuttle is already at the outpost!" + to_chat(usr, "Shuttle is already at the outpost!") + return 0 ..() \ No newline at end of file diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index b5a14e9caa5..ab1759d844f 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -72,7 +72,8 @@ /obj/machinery/mineral/labor_claim_console/proc/emag(mob/user as mob) if(!emagged) emagged = 1 - user << "PZZTTPFFFT" + to_chat(user, "PZZTTPFFFT") + @@ -88,30 +89,38 @@ if(href_list["choice"] == "claim") inserted_id.points += machine.points machine.points = 0 - src << "Points transferred." + to_chat(src, "Points transferred.") + else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand() if(istype(I)) usr.drop_item() I.loc = src inserted_id = I - else usr << "Invalid ID." + else + to_chat(usr, "Invalid ID.") + if(check_auth()) //Sanity check against hef spoofs if(href_list["choice"] == "station") if(!alone_in_area(get_area(src), usr)) - usr << "Prisoners are only allowed to be released while alone." + to_chat(usr, "Prisoners are only allowed to be released while alone.") + else switch(shuttle_master.moveShuttle("laborcamp","laborcamp_home")) if(1) - usr << "Shuttle not found" + to_chat(usr, "Shuttle not found") + if(2) - usr << "Shuttle already at station" + to_chat(usr, "Shuttle already at station") + if(3) - usr << "No permission to dock could be granted." + to_chat(usr, "No permission to dock could be granted.") + else var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval." announcer.autosay(message, "Labor Camp Controller", "Security") - usr << "Shuttle received message and will be sent shortly." + to_chat(usr, "Shuttle received message and will be sent shortly.") + if(href_list["choice"] == "release") if(alone_in_area(get_area(loc), usr)) @@ -120,9 +129,11 @@ if(release_door && release_door.density) release_door.open() else - usr << "Prisoners can only be released while docked with the station." + to_chat(usr, "Prisoners can only be released while docked with the station.") + else - usr << "Prisoners are only allowed to be released while alone." + to_chat(usr, "Prisoners are only allowed to be released while alone.") + src.updateUsrDialog() return @@ -168,11 +179,16 @@ if(istype(I, /obj/item/weapon/card/id)) if(istype(I, /obj/item/weapon/card/id/prisoner)) var/obj/item/weapon/card/id/prisoner/prisoner_id = I - user << "ID: [prisoner_id.registered_name]" - user << "Points Collected:[prisoner_id.points]" - user << "Point Quota: [prisoner_id.goal]" - user << "Collect points by bringing smelted minerals to the Labor Shuttle stacking machine. Reach your quota to earn your release." + 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.") + else - user << "Error: Invalid ID" + to_chat(user, "Error: Invalid ID") + return ..() diff --git a/code/modules/mining/manufacturing.dm b/code/modules/mining/manufacturing.dm index d74386828df..5d66474b5fb 100644 --- a/code/modules/mining/manufacturing.dm +++ b/code/modules/mining/manufacturing.dm @@ -177,7 +177,8 @@ usr.machine = src if (href_list["download"]) - if(!src.dl_list) usr << "\red This unit is not capable of downloading any additional schematics." + to_chat(if(!src.dl_list) usr, "\red This unit is not capable of downloading any additional schematics.") + else var/amtdl = 0 //var/dontload = 0 @@ -191,8 +192,10 @@ src.download += new S.type(src) amtdl++ else dontload = 0*/ - if (amtdl) usr << "\blue [amtdl] new schematics downloaded from Robotics Research Database." - else usr << "\red No new schematics currently available in Robotics Research Database." + to_chat(if (amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.") + + to_chat(else usr, "\red No new schematics currently available in Robotics Research Database.") + if (href_list["delete"]) var/operation = text2num(href_list["delete"]) @@ -201,15 +204,19 @@ for(var/datum/manufacture/D in src.diskload) src.diskload-= D amtgone++ - if (amtgone) usr << "\blue Cleared [amtgone] schematics from database." - else usr << "\red No disk-loaded schematics detected in database." + to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.") + + to_chat(else usr, "\red No disk-loaded schematics detected in database.") + if(operation == 2) // Clear Download Schematics var/amtgone = 0 for(var/datum/manufacture/D in src.download) src.download-= D amtgone++ - if (amtgone) usr << "\blue Cleared [amtgone] schematics from database." - else usr << "\red No downloaded schematics detected in database." + to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.") + + to_chat(else usr, "\red No downloaded schematics detected in database.") + if (href_list["eject"]) var/operation = text2num(href_list["eject"]) @@ -228,7 +235,8 @@ if(10) ejecting = /obj/item/weapon/ore/hydrogen if(11) ejecting = /obj/item/weapon/ore/fabric else - usr << "\red Error. Unknown ore type." + to_chat(usr, "\red Error. Unknown ore type.") + return sleep(3) ejectamt = input(usr,"How many units do you want to eject?","Eject Materials") as num @@ -249,7 +257,8 @@ if (istype(O,I.cost2)) A2++ if (istype(O,I.cost3)) A3++ if (A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3) - usr << "\red Insufficient materials to manufacture that item." + to_chat(usr, "\red Insufficient materials to manufacture that item.") + return // Consume Mats var/C1 = I.amount1 @@ -337,7 +346,8 @@ if(istype(W,/obj/item/clothing/suit/space/)) new /obj/item/weapon/ore/fabric(src) load = 2 else if(istype(W, /obj/item/weapon/disk/data/schematic)) - if (!src.acceptdisk) user << "\red This unit is unable to accept disks." + to_chat(if (!src.acceptdisk) user, "\red This unit is unable to accept disks.") + else var/amtload = 0 var/dontload = 0 @@ -354,19 +364,24 @@ src.diskload += new WS.type(src) amtload++ else dontload = 0 - if (amtload) user << "\blue [amtload] new schematics downloaded from disk." - else user << "\red No new schematics available on disk." + to_chat(if (amtload) user, "\blue [amtload] new schematics downloaded from disk.") + + to_chat(else user, "\red No new schematics available on disk.") + else if (istype(W, /obj/item/weapon/storage/bag/ore)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, W), 1) var/amtload = 0 for (var/obj/item/weapon/ore/M in W.contents) M.loc = src amtload++ - if (amtload) user << "\blue [amtload] pieces of ore loaded from [W]!" - else user << "\red No ore loaded!" + to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [W]!") + + to_chat(else user, "\red No ore loaded!") + else if(istype(W, /obj/item/weapon/card/emag)) src.hacked = 1 - user << "\blue You remove the [src]'s product locks!" + to_chat(user, "\blue You remove the [src]'s product locks!") + else ..() if (load == 1) @@ -391,8 +406,10 @@ for (var/obj/item/weapon/ore/M in O.contents) M.loc = src amtload++ - if (amtload) user << "\blue [amtload] pieces of ore loaded from [O]!" - else user << "\red No ore loaded!" + to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [O]!") + + to_chat(else user, "\red No ore loaded!") + else if (istype(O, /obj/item/weapon/ore/)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing ore into []!", user, src), 1) var/staystill = user.loc @@ -400,7 +417,8 @@ M.loc = src sleep(3) if (user.loc != staystill) break - user << "\blue You finish stuffing ore into [src]!" + to_chat(user, "\blue You finish stuffing ore into [src]!") + /*else if (istype(O, /obj/item/weapon/plant/wheat/metal)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing [O] into []!", user, src), 1) var/staystill = user.loc @@ -409,7 +427,8 @@ del M sleep(3) if (user.loc != staystill) break - user << "\blue You finish stuffing [O] into [src]!"*/ + to_chat(user, "\blue You finish stuffing [O] into [src]!"*/) + else ..() src.updateUsrDialog() diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index f9b4228e792..d3fdb6fb3b0 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -219,17 +219,20 @@ /obj/item/device/mobcapsule/proc/capture(var/mob/target, var/mob/U as mob) var/mob/living/simple_animal/T = target if(captured) - U << "Capture failed!: The capsule already has a mob registered to it!" + to_chat(U, "Capture failed!: The capsule already has a mob registered to it!") + else if(istype(T) && "neutral" in T.faction) T.forceMove(src) T.name = "[U.name]'s [initial(T.name)]" T.cancel_camera() name = "Lazarus Capsule: [initial(T.name)]" - U << "You placed a [T.name] inside the Lazarus Capsule!" + to_chat(U, "You placed a [T.name] inside the Lazarus Capsule!") + captured = T else - U << "You can't capture that mob!" + to_chat(U, "You can't capture that mob!") + /obj/item/device/mobcapsule/throw_impact(atom/A, mob/user) ..() diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index fe31649e6d3..9ed15e58cef 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -361,7 +361,8 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/attackby(var/obj/item/weapon/pickaxe/P as obj, mob/user as mob, params) if (!user.IsAdvancedToolUser()) - usr << "You don't have the dexterity to do this!" + to_chat(usr, "You don't have the dexterity to do this!") + return if (istype(P, /obj/item/weapon/pickaxe)) @@ -372,12 +373,14 @@ var/global/list/rockTurfEdgeCache if(last_act+P.digspeed > world.time)//prevents message spam return last_act = world.time - user << "You start picking..." + to_chat(user, "You start picking...") + P.playDigSound() if(do_after(user, P.digspeed, target = src)) if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay - user << "You finish cutting into the rock." + to_chat(user, "You finish cutting into the rock.") + P.update_icon() gets_drilled(user) feedback_add_details("pick_used_mining","[P.name]") @@ -407,10 +410,12 @@ var/global/list/rockTurfEdgeCache ..() /turf/simulated/mineral/attack_alien(var/mob/living/carbon/alien/M) - M << "You start digging into the rock..." + to_chat(M, "You start digging into the rock...") + playsound(src, 'sound/effects/break_stone.ogg', 50, 1) if(do_after(M, 40, target = src)) - M << "You tunnel into the rock." + to_chat(M, "You tunnel into the rock.") + gets_drilled() /turf/simulated/mineral/Bumped(AM as mob|obj) @@ -475,14 +480,17 @@ var/global/list/rockTurfEdgeCache return if (dug) - user << "This area has already been dug!" + to_chat(user, "This area has already been dug!") + return - user << "You start digging..." + to_chat(user, "You start digging...") + sleep(20) if ((user.loc == T && user.get_active_hand() == W)) - user << "You dig a hole." + to_chat(user, "You dig a hole.") + gets_dug() return @@ -493,14 +501,17 @@ var/global/list/rockTurfEdgeCache return if (dug) - user << "This area has already been dug!" + to_chat(user, "This area has already been dug!") + return - user << "You start digging..." + to_chat(user, "You start digging...") + sleep(P.digspeed) if ((user.loc == T && user.get_active_hand() == W)) - user << "You dig a hole." + to_chat(user, "You dig a hole.") + gets_dug() return diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 51d28af42dd..e07b4641300 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -124,7 +124,8 @@ usr.set_machine(src) src.add_fingerprint(usr) if(processing==1) - usr << "The machine is processing." + to_chat(usr, "The machine is processing.") + return if(href_list["choose"]) chosen = href_list["choose"] diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 079a75341d6..5f7e34f4463 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -67,13 +67,15 @@ var/obj/item/weapon/coin/C = W if(!user.drop_item()) return - user << "You add the [C.name] into the bag." + to_chat(user, "You add the [C.name] into the bag.") + contents += C if (istype(W, /obj/item/weapon/moneybag)) var/obj/item/weapon/moneybag/C = W for (var/obj/O in C.contents) contents += O; - user << "You empty the [C.name] into the bag." + to_chat(user, "You empty the [C.name] into the bag.") + return /obj/item/weapon/moneybag/Topic(href, href_list) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index 056432c1892..f6bd12a4c2e 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -13,7 +13,8 @@ new refined_type(get_turf(src.loc)) qdel(src) else if(W.isOn()) - user << "Not enough fuel to smelt [src]." + to_chat(user, "Not enough fuel to smelt [src].") + ..() /obj/item/weapon/ore/Crossed(AM as mob|obj) @@ -64,7 +65,8 @@ materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) /obj/item/weapon/ore/glass/attack_self(mob/living/user as mob) - user << "You use the sand to make sandstone." + to_chat(user, "You use the sand to make sandstone.") + var/sandAmt = 1 for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor sandAmt += 1 @@ -94,7 +96,8 @@ if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/W = I if(W.welding) - user << "You can't hit a high enough temperature to smelt [src] properly!" + to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!") + else ..() diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 166c05e10c6..4a30f138982 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -19,7 +19,8 @@ S.hide_from(usr) for(var/obj/item/weapon/ore/O in S.contents) S.remove_from_storage(O, src) //This will move the item to this item's contents - user << "You empty the satchel into the box." + to_chat(user, "You empty the satchel into the box.") + return /obj/structure/ore_box/attack_hand(mob/user as mob) @@ -91,7 +92,8 @@ for (var/obj/item/weapon/ore/O in contents) contents -= O O.loc = src.loc - usr << "You empty the box." + to_chat(usr, "You empty the box.") + src.updateUsrDialog() return @@ -106,25 +108,29 @@ obj/structure/ore_box/ex_act(severity, target) set src in view(1) if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes. - usr << "You are physically incapable of emptying the ore box." + to_chat(usr, "You are physically incapable of emptying the ore box.") + return if( usr.stat || usr.restrained() ) return if(!Adjacent(usr)) //You can only empty the box if you can physically reach it - usr << "You cannot reach the ore box." + to_chat(usr, "You cannot reach the ore box.") + return add_fingerprint(usr) if(contents.len < 1) - usr << "The ore box is empty." + to_chat(usr, "The ore box is empty.") + return for (var/obj/item/weapon/ore/O in contents) contents -= O O.loc = src.loc - usr << "You empty the ore box." + to_chat(usr, "You empty the ore box.") + return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 46a40f6a1bf..161bb8666c7 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -201,9 +201,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp show_stat_station_time() if(ticker) if(ticker.mode) - //world << "DEBUG: ticker not null" +// to_chat(world, "DEBUG: ticker not null") + if(ticker.mode.name == "AI malfunction") - //world << "DEBUG: malf mode ticker test" +// to_chat(world, "DEBUG: malf mode ticker test") + if(ticker.mode:malf_mode_declared) stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]") show_stat_emergency_shuttle_eta() @@ -213,13 +215,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Re-enter Corpse" if(!client) return if(!can_reenter_corpse) - src << "You've given up your right to respawn!" + to_chat(src, "You've given up your right to respawn!") + return if(!(mind && mind.current && can_reenter_corpse)) - src << "You have no body." + to_chat(src, "You have no body.") + return if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients - usr << "Another consciousness is in your body...It is resisting you." + to_chat(usr, "Another consciousness is in your body...It is resisting you.") + return if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). var/turf/T = get_turf(mind.current) @@ -230,7 +235,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp found_astral_rune = 1 break if(!found_astral_rune) - usr << "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you." + to_chat(usr, "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.") + return mind.current.ajourn=0 @@ -247,10 +253,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source) if(message) - src << "[message]" - src << "(Click to re-enter)" + to_chat(src, "[message]") + + to_chat(src, "(Click to re-enter)") + if(sound) - src << sound(sound) + to_chat(src, sound(sound)) + /mob/dead/observer/proc/show_me_the_hud(hud_index) var/datum/atom_hud/H = huds[hud_index] @@ -270,16 +279,20 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp switch(data_hud_seen) //give new huds if(0) show_me_the_hud(DATA_HUD_SECURITY_BASIC) - src << "Security HUD set." + to_chat(src, "Security HUD set.") + if(DATA_HUD_SECURITY_BASIC) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) - src << "Medical HUD set." + to_chat(src, "Medical HUD set.") + if(DATA_HUD_MEDICAL_ADVANCED) show_me_the_hud(DATA_HUD_DIAGNOSTIC) - src << "Diagnostic HUD set." + to_chat(src, "Diagnostic HUD set.") + if(DATA_HUD_DIAGNOSTIC) data_hud_seen = 0 - src << "HUDs disabled." + to_chat(src, "HUDs disabled.") + /mob/dead/observer/verb/toggle_antagHUD() @@ -287,13 +300,15 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set name = "Toggle AntagHUD" set desc = "Toggles AntagHUD allowing you to see who is the antagonist" if(!config.antag_hud_allowed && !client.holder) - src << "\red Admins have disabled this for this round." + to_chat(src, "\red Admins have disabled this for this round.") + return if(!client) return var/mob/dead/observer/M = src if(jobban_isbanned(M, "AntagHUD")) - src << "\red You have been banned from using this feature" + to_chat(src, "\red You have been banned from using this feature") + return if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0)) var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No") @@ -313,10 +328,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp else H.remove_hud_from(usr) if(!M.antagHUD) - usr << "AntagHud Toggled ON" + to_chat(usr, "AntagHud Toggled ON") + M.antagHUD = 1 else - usr << "AntagHud Toggled OFF" + to_chat(usr, "AntagHud Toggled OFF") + M.antagHUD = 0 /mob/dead/observer/proc/dead_tele(A in ghostteleportlocs) @@ -325,7 +342,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set desc= "Teleport to a location" if(!isobserver(usr)) - usr << "Not when you're not dead!" + to_chat(usr, "Not when you're not dead!") + return usr.verbs -= /mob/dead/observer/proc/dead_tele @@ -340,7 +358,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp L += T if(!L || !L.len) - usr << "No area available." + to_chat(usr, "No area available.") + usr.forceMove(pick(L)) following = null @@ -363,7 +382,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(following && following == target) return following = target - src << "Now following [target]" + to_chat(src, "Now following [target]") + if(ismob(target)) forceMove(get_turf(target)) var/mob/M = target @@ -418,7 +438,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp forceMove(T) following = null else - src << "This mob is not located in the game world." + to_chat(src, "This mob is not located in the game world.") + /* Now a spell. See spells.dm @@ -438,11 +459,13 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/memory() set hidden = 1 - src << "\red You are dead! You have no mind to store memory!" + to_chat(src, "\red You are dead! You have no mind to store memory!") + /mob/dead/observer/add_memory() set hidden = 1 - src << "\red You are dead! You have no mind to store memory!" + to_chat(src, "\red You are dead! You have no mind to store memory!") + /mob/dead/observer/verb/analyze_air() set name = "Analyze Air" @@ -459,11 +482,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/pressure = environment.return_pressure() var/total_moles = environment.total_moles() - src << "\blue Results:" + to_chat(src, "\blue Results:") + if(abs(pressure - ONE_ATMOSPHERE) < 10) - src << "\blue Pressure: [round(pressure,0.1)] kPa" + to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa") + else - src << "\red Pressure: [round(pressure,0.1)] kPa" + to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa") + if(total_moles) var/o2_concentration = environment.oxygen/total_moles var/n2_concentration = environment.nitrogen/total_moles @@ -472,28 +498,38 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) if(abs(n2_concentration - N2STANDARD) < 20) - src << "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)" + to_chat(src, "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)") + else - src << "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)" + to_chat(src, "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)") + if(abs(o2_concentration - O2STANDARD) < 2) - src << "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)" + to_chat(src, "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)") + else - src << "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)" + to_chat(src, "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)") + if(co2_concentration > 0.01) - src << "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" + to_chat(src, "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)") + else - src << "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)" + to_chat(src, "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)") + if(plasma_concentration > 0.01) - src << "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)" + to_chat(src, "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)") + if(unknown_concentration > 0.01) - src << "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)" + to_chat(src, "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)") + + + to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C") + + to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]") - src << "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C" - src << "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]" /mob/dead/observer/verb/view_manifest() set name = "View Crew Manifest" @@ -550,7 +586,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if (href_list["jump"]) var/mob/target = locate(href_list["jump"]) var/mob/A = usr; - A << "Teleporting to [target]..." + to_chat(A, "Teleporting to [target]...") + //var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list if(target && target != usr) spawn(0) @@ -573,9 +610,11 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp src.anonsay = !src.anonsay if(anonsay) - src << "Your key won't be shown when you speak in dead chat." + to_chat(src, "Your key won't be shown when you speak in dead chat.") + else - src << "Your key will be publicly visible again." + to_chat(src, "Your key will be publicly visible again.") + /mob/dead/observer/verb/toggle_ghostsee() set name = "Toggle Ghost Vision" @@ -583,7 +622,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set category = "Ghost" ghostvision = !(ghostvision) updateghostsight() - usr << "You [(ghostvision?"now":"no longer")] have ghost vision." + to_chat(usr, "You [(ghostvision?"now":"no longer")] have ghost vision.") + /mob/dead/observer/verb/toggle_darkness() set name = "Toggle Darkness" diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 34a0d44d631..1a2998fbaac 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -8,7 +8,8 @@ if (src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot talk in deadchat (muted)." + to_chat(src, "\red You cannot talk in deadchat (muted).") + return if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) @@ -30,7 +31,8 @@ if(src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot emote in deadchat (muted)." + to_chat(src, "\red You cannot emote in deadchat (muted).") + return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm index ef51c787e5a..ae504a90fd3 100644 --- a/code/modules/mob/dead/observer/spells.dm +++ b/code/modules/mob/dead/observer/spells.dm @@ -32,7 +32,8 @@ var/global/list/boo_phrases=list( if(ishuman(A)) var/mob/living/carbon/human/H = A if(H && H.client) - H << "[pick(boo_phrases)]" + to_chat(H, "[pick(boo_phrases)]") + // Flicker unblessed lights in range if(istype(A,/obj/machinery/light)) diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 77b1dfa8dcb..cc74d5e6ffd 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -17,7 +17,8 @@ /mob/proc/custom_emote(var/m_type=1,var/message = null) if(stat || !use_me && usr == src) - usr << "You are unable to emote." + to_chat(usr, "You are unable to emote.") + return var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle) @@ -85,16 +86,19 @@ /mob/proc/emote_dead(var/message) if(client.prefs.muted & MUTE_DEADCHAT) - src << "\red You cannot send deadchat emotes (muted)." + to_chat(src, "\red You cannot send deadchat emotes (muted).") + return if(!(client.prefs.toggles & CHAT_DEAD)) - src << "\red You have deadchat muted." + to_chat(src, "\red You have deadchat muted.") + return if(!src.client.holder) if(!config.dsay_allowed) - src << "\red Deadchat is globally muted" + to_chat(src, "\red Deadchat is globally muted") + return @@ -118,7 +122,8 @@ continue if(check_rights(R_ADMIN|R_MOD, 0, M) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to admins/mods - M << message + to_chat(M, message) + else if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to regular ghosts with deadchat toggled on M.show_message(message, 2) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index c177b94a118..c222c73b33c 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -65,14 +65,18 @@ if(sdisabilities & DEAF || ear_deaf) if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set if(speaker == src) - src << "You cannot hear yourself speak!" + to_chat(src, "You cannot hear yourself speak!") + else - src << "[speaker_name][alt_name] talks but you cannot hear them." + to_chat(src, "[speaker_name][alt_name] talks but you cannot hear them.") + else if(language) - src << "[speaker_name][alt_name] [track][language.format_message(message, verb)]" + to_chat(src, "[speaker_name][alt_name] [track][language.format_message(message, verb)]") + else - src << "[speaker_name][alt_name] [track][verb], \"[message]\"" + to_chat(src, "[speaker_name][alt_name] [track][verb], \"[message]\"") + if (speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z)) var/turf/source = speaker? get_turf(speaker) : get_turf(src) src.playsound_local(source, speech_sound, sound_vol, 1) @@ -177,11 +181,14 @@ formatted = "[verb], \"[message]\"" if(sdisabilities & DEAF || ear_deaf) if(prob(20)) - src << "You feel your headset vibrate but can hear nothing from it!" + to_chat(src, "You feel your headset vibrate but can hear nothing from it!") + else if(track) - src << "[part_a][track][part_b][formatted]" + to_chat(src, "[part_a][track][part_b][formatted]") + else - src << "[part_a][speaker_name][part_b][formatted]" + to_chat(src, "[part_a][speaker_name][part_b][formatted]") + /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null) if(!client) @@ -215,4 +222,5 @@ else heard = "...You almost hear someone talking..." - src << heard + to_chat(src, heard) + diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 71e4235f2e6..71d8e9ac211 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -47,10 +47,13 @@ if(istype(M)) M.unEquip(src) - M << "[src] wriggles out of your grip!" - src << "You wriggle out of [M]'s grip!" + to_chat(M, "[src] wriggles out of your grip!") + + to_chat(src, "You wriggle out of [M]'s grip!") + else if(istype(src.loc,/obj/item)) - src << "You struggle free of [src.loc]." + to_chat(src, "You struggle free of [src.loc].") + src.forceMove(get_turf(src)) if(istype(M)) @@ -74,8 +77,10 @@ if(desc) H.desc = desc H.attack_hand(grabber) - grabber << "You scoop up \the [src]." - src << "\The [grabber] scoops you up." + to_chat(grabber, "You scoop up \the [src].") + + to_chat(src, "\The [grabber] scoops you up.") + grabber.status_flags |= PASSEMOTES return H diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 265c7697de2..c35403c43a7 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -104,11 +104,13 @@ for(var/mob/player in player_list) if(istype(player,/mob/dead) && follow) var/msg_dead = "[name], [speaker_mask] ([ghost_follow_link(speaker, ghost=player)]) [format_message(message, get_spoken_verb(message))]" - player << msg_dead + to_chat(player, msg_dead) + continue else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player))) - player << msg + to_chat(player, msg) + /datum/language/proc/check_special_condition(var/mob/other) return 1 diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm index 4b9bfd96f49..17d8a061073 100644 --- a/code/modules/mob/living/autohiss.dm +++ b/code/modules/mob/living/autohiss.dm @@ -25,14 +25,18 @@ autohiss_mode = (autohiss_mode + 1) % AUTOHISS_NUM switch(autohiss_mode) if(AUTOHISS_OFF) - src << "Auto-hiss is now OFF." + to_chat(src, "Auto-hiss is now OFF.") + if(AUTOHISS_BASIC) - src << "Auto-hiss is now BASIC." + to_chat(src, "Auto-hiss is now BASIC.") + if(AUTOHISS_FULL) - src << "Auto-hiss is now FULL." + to_chat(src, "Auto-hiss is now FULL.") + else autohiss_mode = AUTOHISS_OFF - src << "Auto-hiss is now OFF." + to_chat(src, "Auto-hiss is now OFF.") + /datum/species var/list/autohiss_basic_map = null diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index dd173382124..21d006ee886 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -84,7 +84,8 @@ var/loc_temp = get_temperature(environment) - //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]" +// to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]") + // Aliens are now weak to fire. diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm index 7ae01f43cfe..225d4a8046b 100644 --- a/code/modules/mob/living/carbon/alien/alien_defenses.dm +++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm @@ -7,11 +7,13 @@ In all, this is a lot like the monkey code. /N */ /mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return switch(M.a_intent) @@ -38,7 +40,8 @@ In all, this is a lot like the monkey code. /N add_logs(src, M, "attacked", admin=0) updatehealth() else - M << "[name] is too injured for that." + to_chat(M, "[name] is too injured for that.") + return 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 17680b80f56..a72e93b3db4 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -8,13 +8,16 @@ Doesn't work on other aliens/AI.*/ /mob/living/carbon/proc/powerc(X, Y)//Y is optional, checks for weed planting. X can be null. if(stat) - src << "You must be conscious to do this." + to_chat(src, "You must be conscious to do this.") + return 0 else if(X && getPlasma() < X) - src << "Not enough plasma stored." + to_chat(src, "Not enough plasma stored.") + return 0 else if(Y && (!isturf(src.loc) || istype(src.loc, /turf/space))) - src << "You can't place that here!" + to_chat(src, "You can't place that here!") + return 0 else return 1 @@ -24,7 +27,8 @@ Doesn't work on other aliens/AI.*/ set category = "Alien" if(locate(/obj/structure/alien/weeds/node) in get_turf(src)) - src << "There's already a weed node here." + to_chat(src, "There's already a weed node here.") + return if(powerc(50,1)) @@ -44,8 +48,10 @@ Doesn't work on other aliens/AI.*/ var/msg = sanitize(input("Message:", "Alien Whisper") as text|null) if(msg) log_say("Alien Whisper: [key_name(src)]->[key_name(M)]: [msg]") - M << "You hear a strange, alien voice in your head...[msg]" - src << "You said: [msg] to [M]" + to_chat(M, "You hear a strange, alien voice in your head...[msg]") + + to_chat(src, "You said: [msg] to [M]") + for(var/mob/dead/observer/G in player_list) G.show_message("Alien message from [src] ([ghost_follow_link(src, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]") return @@ -63,10 +69,13 @@ Doesn't work on other aliens/AI.*/ if (get_dist(src,M) <= 1) M.adjustPlasma(amount) adjustPlasma(-amount) - M << "[src] has transfered [amount] plasma to you." - src << {"You have trasferred [amount] plasma to [M]"} + to_chat(M, "[src] has transfered [amount] plasma to you.") + + to_chat(src, {"You have trasferred [amount] plasma to [M]"}) + else - src << "You need to be closer." + to_chat(src, "You need to be closer.") + return @@ -81,18 +90,21 @@ Doesn't work on other aliens/AI.*/ if(isobj(O)) var/obj/I = O if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid. - src << "You cannot dissolve this object." + to_chat(src, "You cannot dissolve this object.") + return // TURF CHECK else if(istype(O, /turf/simulated)) var/turf/T = O // R WALL if(istype(T, /turf/simulated/wall/r_wall)) - src << "You cannot dissolve this object." + to_chat(src, "You cannot dissolve this object.") + return // R FLOOR if(istype(T, /turf/simulated/floor/engine)) - src << "You cannot dissolve this object." + to_chat(src, "You cannot dissolve this object.") + return else// Not a type we can acid. return @@ -101,7 +113,8 @@ Doesn't work on other aliens/AI.*/ new /obj/effect/acid(get_turf(O), O) visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!") else - src << "Target is too far away." + to_chat(src, "Target is too far away.") + return /mob/living/carbon/alien/humanoid/proc/neurotoxin() // ok 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 19cad5aa5fc..c93eb944df6 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -34,11 +34,13 @@ no_queen = 0 if(src.has_brain_worms()) - src << "We cannot perform this ability at the present time!" + to_chat(src, "We cannot perform this ability at the present time!") + return if(no_queen) adjustPlasma(-500) - src << "You begin to evolve!" + to_chat(src, "You begin to evolve!") + for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc) @@ -46,5 +48,6 @@ new_xeno.mind.name = new_xeno.name qdel(src) else - src << "We already have an alive queen." + to_chat(src, "We already have an alive queen.") + return \ 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 9a667ab79fc..91411978d51 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -50,7 +50,8 @@ leap_on_click = !leap_on_click leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]" if(message) - src << "You will now [leap_on_click ? "leap at":"slash at"] enemies!" + to_chat(src, "You will now [leap_on_click ? "leap at":"slash at"] enemies!") + else return @@ -65,14 +66,16 @@ /mob/living/carbon/alien/humanoid/hunter/proc/leap_at(var/atom/A) if(pounce_cooldown) - src << "You are too fatigued to pounce right now!" + to_chat(src, "You are too fatigued to pounce right now!") + return if(leaping) //Leap while you leap, so you can leap while you leap return if(!has_gravity(src) || !has_gravity(A)) - src << "It is unsafe to leap without gravity!" + to_chat(src, "It is unsafe to leap without gravity!") + //It's also extremely buggy visually, so it's balance+bugfix return if(lying) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index 342c8a530d3..f5ddc992a0e 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -76,7 +76,8 @@ if(powerc(250)) adjustToxLoss(-250) - src << "\green You begin to evolve!" + to_chat(src, "\green You begin to evolve!") + for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/sentinel/praetorian/new_xeno = new(loc) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index a80a0d5892c..a5a09b9a378 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -105,7 +105,8 @@ message = "\The [src] does a flip!" src.SpinAnimation(5,1) if("help") - src << "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper" + to_chat(src, "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper") + if(!stat) if (act == "roar") diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm index 11cf3c0c4d6..aafb05c6640 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm @@ -82,7 +82,8 @@ set category = "Alien" if(locate(/obj/structure/alien/egg) in get_turf(src)) - src << "There's already an egg here." + to_chat(src, "There's already an egg here.") + return if(powerc(250,1))//Can't plant eggs on spess tiles. That's silly. diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index b399bb21731..736d5a1da09 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -113,7 +113,8 @@ /mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if(M.Victim) return // can't attack while eating! @@ -184,11 +185,13 @@ /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return if(..()) //to allow surgery to return properly. @@ -252,11 +255,13 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/humanoid/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return ..() @@ -282,7 +287,8 @@ In all, this is a lot like the monkey code. /N adjustBruteLoss(damage) updatehealth() else - M << "[name] is too injured for that." + to_chat(M, "[name] is too injured for that.") + return @@ -304,7 +310,8 @@ In all, this is a lot like the monkey code. /N adjustBruteLoss(damage) updatehealth() else - L << "[name] is too injured for that." + to_chat(L, "[name] is too injured for that.") + return diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 2c79a007fa8..6ccce6f2f66 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -17,7 +17,8 @@ /mob/living/carbon/alien/humanoid/handle_disabilities() if (disabilities & EPILEPSY) if ((prob(1) && paralysis < 10)) - src << "You have a seizure!" + to_chat(src, "You have a seizure!") + Paralyse(10) if (disabilities & COUGHING) if ((prob(5) && paralysis <= 1)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 188d485d83f..634bbf95117 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -63,7 +63,8 @@ set desc = "Lay an egg to produce huggers to impregnate prey with." set category = "Alien" if(locate(/obj/structure/alien/egg) in get_turf(src)) - src << "There's already an egg here." + to_chat(src, "There's already an egg here.") + return if(powerc(75,1))//Can't plant eggs on spess tiles. That's silly. @@ -111,7 +112,8 @@ if(no_queen) adjustToxLoss(-1000) - src << "You begin to evolve!" + to_chat(src, "You begin to evolve!") + for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/empress/new_xeno = new(loc) @@ -122,7 +124,8 @@ new_xeno.mind.name = new_xeno.name qdel(src) else - src << "We already have an alive empress." + to_chat(src, "We already have an alive empress.") + return */ \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index 88437be1392..c956e0b2489 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -15,7 +15,8 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + to_chat(src, "\red You cannot send IC messages (muted).") + return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -110,9 +111,11 @@ message = text("[] collapses!", src) m_type = 2 if("help") - src << "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper" + to_chat(src, "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper") + else - src << text("Invalid Emote: []", act) + to_chat(src, text("Invalid Emote: []", act)) + if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") if (m_type & 1) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 195e965dadf..f12989c83e0 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -38,7 +38,8 @@ var/mob/tmob = AM if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) - src << "\red You fail to push [tmob]'s fat ass out of the way." + to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") + now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -124,7 +125,8 @@ /mob/living/carbon/alien/larva/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if(M.Victim) @@ -149,11 +151,13 @@ /mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return ..() @@ -195,11 +199,13 @@ /mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return ..() @@ -224,7 +230,8 @@ adjustBruteLoss(damage) updatehealth() else - M << "[name] is too injured for that." + to_chat(M, "[name] is too injured for that.") + return /mob/living/carbon/alien/larva/restrained() diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index a8cb230f9e7..a30f8ff9b2d 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -9,16 +9,20 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 - src << text("You are now hiding.") + to_chat(src, text("You are now hiding.")) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) - O << text("[] scurries to the ground!", src) + to_chat(O, text("[] scurries to the ground!", src)) + else layer = MOB_LAYER - src << text("\green You have stopped hiding.") + to_chat(src, text("\green You have stopped hiding.")) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) - O << text("[] slowly peaks up from the ground...", src) + to_chat(O, text("[] slowly peaks up from the ground...", src)) + /mob/living/carbon/alien/larva/verb/evolve() set name = "Evolve" @@ -29,15 +33,21 @@ return if(handcuffed || legcuffed) - src << "\red You cannot evolve when you are cuffed." + to_chat(src, "\red You cannot evolve when you are cuffed.") + if(amount_grown >= max_grown) //TODO ~Carn //green is impossible to read, so i made these blue and changed the formatting slightly - src << "\blue You are growing into a beautiful alien! It is time to choose a caste." - src << "\blue There are three to choose from:" - src << "Hunters \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves." - src << "Sentinels \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters." - src << "Drones \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen." + to_chat(src, "\blue You are growing into a beautiful alien! It is time to choose a caste.") + + to_chat(src, "\blue There are three to choose from:") + + to_chat(src, "Hunters \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.") + + to_chat(src, "Sentinels \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.") + + to_chat(src, "Drones \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.") + var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone") var/mob/living/carbon/alien/humanoid/new_xeno @@ -56,5 +66,6 @@ qdel(src) return else - src << "You are not fully grown." + to_chat(src, "You are not fully grown.") + return diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index a3662187f8b..a49f7c0a6ea 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -33,7 +33,8 @@ /mob/living/carbon/alien/handle_breath_temperature(datum/gas_mixture/breath) if(breath.temperature > (T0C + 66) && !(RESIST_COLD in mutations)) if(prob(20)) - src << "You feel a searing heat in your lungs!" + to_chat(src, "You feel a searing heat in your lungs!") + fire_alert = max(fire_alert, 1) else fire_alert = 0 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 f07cf2cf3e6..860e5aed290 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -11,9 +11,11 @@ /obj/item/organ/internal/body_egg/alien_embryo/on_find(mob/living/finder) ..() if(stage < 4) - finder << "It's small and weak, barely the size of a fetus." + to_chat(finder, "It's small and weak, barely the size of a fetus.") + else - finder << "It's grown quite large, and writhes slightly as you look at it." + to_chat(finder, "It's grown quite large, and writhes slightly as you look at it.") + if(prob(10)) AttemptGrow(0) @@ -30,24 +32,29 @@ if(prob(2)) owner.emote("cough") if(prob(2)) - owner << "Your throat feels sore." + to_chat(owner, "Your throat feels sore.") + if(prob(2)) - owner << "Mucous runs down the back of your throat." + to_chat(owner, "Mucous runs down the back of your throat.") + if(4) if(prob(2)) owner.emote("sneeze") if(prob(2)) owner.emote("cough") if(prob(4)) - owner << "Your muscles ache." + to_chat(owner, "Your muscles ache.") + if(prob(20)) owner.take_organ_damage(1) if(prob(4)) - owner << "Your stomach hurts." + to_chat(owner, "Your stomach hurts.") + if(prob(20)) owner.adjustToxLoss(1) if(5) - owner << "You feel something tearing its way out of your stomach..." + to_chat(owner, "You feel something tearing its way out of your stomach...") + owner.adjustToxLoss(10) /obj/item/organ/internal/body_egg/alien_embryo/egg_process() @@ -98,7 +105,9 @@ new_xeno.mind.name = new_xeno.name new_xeno.mind.assigned_role = "MODE" new_xeno.mind.special_role = "Alien" - new_xeno << sound('sound/voice/hiss5.ogg',0,0,0,100) //To get the player's attention + to_chat(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))//To get the player's attention + + if(gib_on_success) owner.gib() else diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index 6f958533515..fd04034f152 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -49,11 +49,14 @@ var/const/MAX_ACTIVE_TIME = 400 return switch(stat) if(DEAD,UNCONSCIOUS) - user << "[src] is not moving." + to_chat(user, "[src] is not moving.") + if(CONSCIOUS) - user << "[src] seems to be active!" + to_chat(user, "[src] seems to be active!") + if (sterile) - user << "It looks like the proboscis has been removed." + to_chat(user, "It looks like the proboscis has been removed.") + /obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params) if(O.force) diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 7aa4cd44554..106acb44814 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -19,15 +19,18 @@ /obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/organ/internal/brain/crystal )) - user << " This brain is too malformed to be able to use with the [src]." + to_chat(user, " This brain is too malformed to be able to use with the [src].") + return if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO var/obj/item/organ/internal/brain/B = O if(!B.brainmob) - user << "You aren't sure where this brain came from, but you're pretty sure it's a useless brain." + to_chat(user, "You aren't sure where this brain came from, but you're pretty sure it's a useless brain.") + return if(held_brain) - user << "Somehow, this MMI still has a brain in it. Report this to the bug tracker." + to_chat(user, "Somehow, this MMI still has a brain in it. Report this to the bug tracker.") + log_to_dd("[user] tried to stick a [O] into [src] in [get_area(src)], but the held brain variable wasn't cleared") return for(var/mob/V in viewers(src, null)) @@ -67,9 +70,11 @@ /obj/item/device/mmi/attack_self(mob/user as mob) if(!brainmob) - user << "You upend the MMI, but there's nothing in it." + to_chat(user, "You upend the MMI, but there's nothing in it.") + else - user << "You unlock and upend the MMI, spilling the brain onto the floor." + to_chat(user, "You unlock and upend the MMI, spilling the brain onto the floor.") + dropbrain(get_turf(user)) icon = 'icons/obj/assemblies.dmi' icon_state = "mmi_empty" @@ -101,7 +106,8 @@ /obj/item/device/mmi/proc/dropbrain(var/turf/dropspot) if(isnull(held_brain)) log_to_dd("[src] at [loc] attempted to drop brain without a contained brain in [get_area(src)].") - brainmob << "Your MMI did not contain a brain! We'll make a new one for you, but you'd best report this to the bugtracker!" + to_chat(brainmob, "Your MMI did not contain a brain! We'll make a new one for you, but you'd best report this to the bugtracker!") + held_brain = new(dropspot) // Let's not ruin someone's round because of something dumb -- Crazylemon held_brain.dna = brainmob.dna.Clone() held_brain.name = "\the [brainmob.name]'s [initial(held_brain.name)]" @@ -137,10 +143,12 @@ set popup_menu = 0 if(brainmob.stat) - brainmob << "Can't do that while incapacitated or dead." + to_chat(brainmob, "Can't do that while incapacitated or dead.") + radio.listening = radio.listening==1 ? 0 : 1 - brainmob << "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast." + to_chat(brainmob, "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.") + /obj/item/device/mmi/emp_act(severity) if(!brainmob) diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 64964636d16..1dda87d0c46 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -48,15 +48,18 @@ if(H.mind) H.mind.transfer_to(brainmob) - brainmob << "You feel slightly disoriented. That's normal when you're just a [initial(src.name)]." + to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(src.name)].") + callHook("debrain", list(brainmob)) /obj/item/organ/internal/brain/examine(mob/user) // -- TLE ..(user) if(brainmob && brainmob.client)//if thar be a brain inside... the brain. - user << "You can feel the small spark of life still left in this one." + to_chat(user, "You can feel the small spark of life still left in this one.") + else - user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later.." + to_chat(user, "This one seems particularly lifeless. Perhaps it will regain some of its luster later..") + /obj/item/organ/internal/brain/remove(var/mob/living/user,special = 0) diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 0441eb00ac4..108ae12029b 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -14,15 +14,18 @@ switch(act) if ("alarm") - src << "You sound an alarm." + to_chat(src, "You sound an alarm.") + message = "\The [src] sounds an alarm." m_type = 2 if ("alert") - src << "You let out a distressed noise." + to_chat(src, "You let out a distressed noise.") + message = "\The [src] lets out a distressed noise." m_type = 2 if ("notice") - src << "You play a loud tone." + to_chat(src, "You play a loud tone.") + message = "\The [src] plays a loud tone." m_type = 2 if ("flash") @@ -32,19 +35,23 @@ message = "\The [src] blinks." m_type = 1 if ("whistle") - src << "You whistle." + to_chat(src, "You whistle.") + message = "\The [src] whistles." m_type = 2 if ("beep") - src << "You beep." + to_chat(src, "You beep.") + message = "\The [src] beeps." m_type = 2 if ("boop") - src << "You boop." + to_chat(src, "You boop.") + message = "\The [src] boops." m_type = 2 if ("help") - src << "alarm, alert, notice, flash,blink, whistle, beep, boop" + to_chat(src, "alarm, alert, notice, flash,blink, whistle, beep, boop") + if(message && !stat) ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index ad91f6c152e..507320b7ef6 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -5,9 +5,11 @@ adjustToxLoss(3) updatehealth() if(!container) - src << "You feel weak." + to_chat(src, "You feel weak.") + else - src << "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED." + to_chat(src, "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.") + switch(radiation) if(0 to 49) @@ -22,9 +24,11 @@ if(prob(5)) radiation -= 5 if(!container) - src << "You feel weak." + to_chat(src, "You feel weak.") + else - src << "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED." + to_chat(src, "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED.") + updatehealth() if(75 to 100) @@ -93,4 +97,4 @@ sight &= ~SEE_OBJS see_in_dark = 2 see_invisible = SEE_INVISIBLE_LIVING - handle_hud_icons_health() + handle_hud_icons_health() diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index aa589713cb9..d39da7e6c02 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -18,7 +18,8 @@ /obj/item/device/mmi/posibrain/attack_self(mob/user as mob) if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. - user << "\blue You carefully locate the manual activation switch and start the positronic brain's boot process." + to_chat(user, "\blue You carefully locate the manual activation switch and start the positronic brain's boot process.") + icon_state = "posibrain-searching" ghost_volunteers.Cut() src.searching = 1 @@ -32,21 +33,26 @@ else if(silenced) silenced = 0 - user << "You toggle the speaker to 'on', on the [src]." + to_chat(user, "You toggle the speaker to 'on', on the [src].") + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'on'." if(brainmob && brainmob.key) - brainmob << "Your internal speaker has been toggled to 'on'." + to_chat(brainmob, "Your internal speaker has been toggled to 'on'.") + else silenced = 1 - user << "You toggle the speaker to 'off', on the [src]." + to_chat(user, "You toggle the speaker to 'off', on the [src].") + desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'off'." if(brainmob && brainmob.key) - brainmob << "Your internal speaker has been toggled to 'off'." + to_chat(brainmob, "Your internal speaker has been toggled to 'off'.") + /obj/item/device/mmi/posibrain/proc/request_player() for(var/mob/dead/observer/O in player_list) if(check_observer(O)) - O << "\A [src] has been activated. (Teleport | Sign Up)" + to_chat(O, "\A [src] has been activated. (Teleport | Sign Up)") + // if(ROLE_POSIBRAIN in O.client.prefs.be_special) The Guardian implementation looks cleaner // question(O.client) @@ -86,7 +92,8 @@ brainmob.mind.assigned_role = "Positronic Brain" if(H.mind) H.mind.transfer_to(brainmob) - brainmob << "You feel slightly disoriented. That's normal when you're just a metal cube." + to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") + icon_state = "posibrain-occupied" return @@ -95,9 +102,12 @@ src.brainmob.key = candidate.key src.name = "positronic brain ([src.brainmob.name])" - src.brainmob << "You are a positronic brain, brought into existence on [station_name()]." - src.brainmob << "As a synthetic intelligence, you answer to all crewmembers, as well as the AI." - src.brainmob << "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm." + to_chat(src.brainmob, "You are a positronic brain, brought into existence on [station_name()].") + + to_chat(src.brainmob, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") + + to_chat(src.brainmob, "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.") + src.brainmob.mind.assigned_role = "Positronic Brain" var/turf/T = get_turf_or_move(src.loc) @@ -123,25 +133,32 @@ /obj/item/device/mmi/posibrain/proc/volunteer(var/mob/dead/observer/O) if(!searching) - O << "Not looking for a ghost, yet." + to_chat(O, "Not looking for a ghost, yet.") + return if(!istype(O)) - O << "\red Error." + to_chat(O, "\red Error.") + return if(O in ghost_volunteers) - O << "\blue Removed from registration list." + to_chat(O, "\blue Removed from registration list.") + ghost_volunteers.Remove(O) return if(!check_observer(O)) - O << "\red You cannot be \a [src]." + to_chat(O, "\red You cannot be \a [src].") + return if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - O << "\red Upon using the antagHUD you forfeited the ability to join the round." + to_chat(O, "\red Upon using the antagHUD you forfeited the ability to join the round.") + return if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept")) - O << "\red You are job banned from this role." + to_chat(O, "\red You are job banned from this role.") + return - O.<< "\blue You've been added to the list of ghosts that may become this [src]. Click again to unvolunteer." + to_chat(O., "\blue You've been added to the list of ghosts that may become this [src]. Click again to unvolunteer.") + ghost_volunteers.Add(O) @@ -161,7 +178,8 @@ else msg += "It appears to be completely inactive.\n" msg += "*---------*" - user << msg + to_chat(user, msg) + /obj/item/device/mmi/posibrain/emp_act(severity) if(!src.brainmob) diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index 367363ed2a1..324debd7394 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -9,7 +9,8 @@ if(container && istype(container, /obj/item/device/mmi/posibrain)) var/obj/item/device/mmi/posibrain/P = container if(P && P.silenced) - usr << "You cannot speak, as your internal speaker has been toggled to 'off'." + to_chat(usr, "You cannot speak, as your internal speaker has been toggled to 'off'.") + return if(prob(emp_damage*4)) if(prob(10))//10% chane to drop the message entirely diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 9c780f92bce..fe363381b51 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -95,7 +95,8 @@ /mob/living/carbon/proc/vomit(var/lost_nutrition = 10, var/blood = 0, var/stun = 1, var/distance = 0, var/message = 1) if(src.is_muzzled()) if(message) - src << "The muzzle prevents you from vomiting!" + to_chat(src, "The muzzle prevents you from vomiting!") + return 0 if(stun) Stun(4) @@ -193,7 +194,8 @@ if(item_in_hand) //this segment checks if the item in your hand is twohanded. if(istype(item_in_hand,/obj/item/weapon/twohanded)) if(item_in_hand:wielded == 1) - usr << "Your other hand is too busy holding the [item_in_hand.name]" + to_chat(usr, "Your other hand is too busy holding the [item_in_hand.name]") + return src.hand = !( src.hand ) if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) @@ -260,9 +262,11 @@ src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.name,status),1) if(staminaloss) if(staminaloss > 30) - src << "You're completely exhausted." + to_chat(src, "You're completely exhausted.") + else - src << "You feel fatigued." + to_chat(src, "You feel fatigued.") + if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit)) H.play_xylophone() else @@ -324,16 +328,19 @@ switch(damage) if(1) - src << "Your eyes sting a little." + to_chat(src, "Your eyes sting a little.") + if(prob(40)) //waiting on carbon organs E.damage += 1 if(2) - src << "Your eyes burn." + to_chat(src, "Your eyes burn.") + E.damage += rand(2, 4) else - src << "Your eyes itch and burn severely!" + to_chat(src, "Your eyes itch and burn severely!") + E.damage += rand(12, 16) if(E.damage > E.min_bruised_damage) @@ -342,20 +349,25 @@ if(E.damage > (E.min_bruised_damage + E.min_broken_damage) / 2) if(!(E.status & ORGAN_ROBOT)) - src << "Your eyes start to burn badly!" + to_chat(src, "Your eyes start to burn badly!") + else //snowflake conditions piss me off for the record - src << "The flash blinds you!" + to_chat(src, "The flash blinds you!") + else if(E.damage >= E.min_broken_damage) - src << "You can't see anything!" + to_chat(src, "You can't see anything!") + else - src << "Your eyes are really starting to hurt. This can't be good for you!" + to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") + return 1 else if(damage == 0) // just enough protection if(prob(20)) - src << "Something bright flashes in the corner of your vision!" + to_chat(src, "Something bright flashes in the corner of your vision!") + /mob/living/carbon/proc/tintcheck() @@ -386,15 +398,18 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(!ventcrawlerlocal) return if(stat) - src << "You must be conscious to do this!" + to_chat(src, "You must be conscious to do this!") + return if(lying) - src << "You can't vent crawl while you're stunned!" + to_chat(src, "You can't vent crawl while you're stunned!") + return if(buckled_mob) - src << "You can't vent crawl with [buckled_mob] on you!" + to_chat(src, "You can't vent crawl with [buckled_mob] on you!") + return var/obj/machinery/atmospherics/unary/vent_found @@ -438,7 +453,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, failed++ if(failed) - src << "You can't crawl around in the ventilation ducts with items!" + to_chat(src, "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 system.") @@ -446,7 +462,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, add_ventcrawl(vent_found) else - src << "This ventilation duct is not connected to anything!" + to_chat(src, "This ventilation duct is not connected to anything!") + /mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine) @@ -659,7 +676,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(!(head && head.flags & AIRTIGHT)) no_mask = 1 if(no_mask) - usr << "[src] is not wearing a suitable mask or helmet!" + to_chat(usr, "[src] is not wearing a suitable mask or helmet!") + return if(do_mob(usr, src, POCKET_STRIP_DELAY)) @@ -673,7 +691,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(!(head && head.flags & AIRTIGHT)) no_mask2 = 1 if(no_mask2) - usr << "[src] is not wearing a suitable mask or helmet!" + to_chat(usr, "[src] is not wearing a suitable mask or helmet!") + return internal = ITEM if(internals) @@ -800,7 +819,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, for(var/t = 0, t<=tilesSlipped, t++) spawn (t) step(src, src.dir) stop_pulling() - src << "You slipped on the [description]!" + to_chat(src, "You slipped on the [description]!") + playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) if (stun) Stun(stun) @@ -831,18 +851,24 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, /mob/living/carbon/proc/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness) if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill)) - src << "You [toEat.apply_method] [toEat]." + to_chat(src, "You [toEat.apply_method] [toEat].") + else if (fullness <= 50) - src << "You hungrily chew out a piece of [toEat] and gobble it!" + to_chat(src, "You hungrily chew out a piece of [toEat] and gobble it!") + else if (fullness > 50 && fullness <= 150) - src << "You hungrily begin to eat [toEat]." + to_chat(src, "You hungrily begin to eat [toEat].") + else if (fullness > 150 && fullness <= 350) - src << "You take a bite of [toEat]." + to_chat(src, "You take a bite of [toEat].") + else if (fullness > 350 && fullness <= 550) - src << "You unwillingly chew a bit of [toEat]." + to_chat(src, "You unwillingly chew a bit of [toEat].") + else if (fullness > (550 * (1 + overeatduration / 2000))) // The more you eat - the more you can eat - src << "You cannot force any more of [toEat] to go down your throat." + to_chat(src, "You cannot force any more of [toEat] to go down your throat.") + return 0 return 1 diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index 796f2997cc4..e7828ea93f0 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -3,16 +3,20 @@ set name = "Give" if(!iscarbon(target)) //something is bypassing the give arguments, no clue what, adding a sanity check JIC - usr << "Wait a second... \the [target] HAS NO HANDS! AHH!" //cheesy messages ftw + to_chat(usr, "Wait a second... \the [target] HAS NO HANDS! AHH!")//cheesy messages ftw + + return if(target.stat == 2 || usr.stat == 2|| target.client == null) return var/obj/item/I if(!usr.hand && usr.r_hand == null) - usr << " You don't have anything in your right hand to give to [target.name]" + to_chat(usr, " You don't have anything in your right hand to give to [target.name]") + return if(usr.hand && usr.l_hand == null) - usr << " You don't have anything in your left hand to give to [target.name]" + to_chat(usr, " You don't have anything in your left hand to give to [target.name]") + return if(usr.hand) I = usr.l_hand @@ -21,7 +25,8 @@ if(!I) return if((I.flags & NODROP) || (I.flags & ABSTRACT)) - usr << "That's not exactly something you can give." + to_chat(usr, "That's not exactly something you can give.") + return if(target.r_hand == null || target.l_hand == null) switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No")) @@ -29,16 +34,22 @@ if(!I) return if(!Adjacent(usr)) - usr << " You need to stay in reaching distance while giving an object." - target << " [usr.name] moved too far away." + to_chat(usr, " You need to stay in reaching distance while giving an object.") + + to_chat(target, " [usr.name] moved too far away.") + return if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I)) - usr << " You need to keep the item in your active hand." - target << " [usr.name] seem to have given up on giving \the [I.name] to you." + to_chat(usr, " You need to keep the item in your active hand.") + + to_chat(target, " [usr.name] seem to have given up on giving \the [I.name] to you.") + return if(target.r_hand != null && target.l_hand != null) - target << " Your hands are full." - usr << " Their hands are full." + to_chat(target, " Your hands are full.") + + to_chat(usr, " Their hands are full.") + return else usr.drop_item() @@ -57,4 +68,5 @@ if("No") target.visible_message(" [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.") else - usr << " [target.name]'s hands are full." \ No newline at end of file + to_chat(usr, " [target.name]'s hands are full.") + diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 17d13a01c83..19d6d93cd5f 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -753,7 +753,8 @@ right_hand_good = 1 if (!left_hand_good && !right_hand_good) - usr << "You need at least one hand in good working order to snap your fingers." + to_chat(usr, "You need at least one hand in good working order to snap your fingers.") + return message = "[src] snaps \his fingers." @@ -769,8 +770,10 @@ return // playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun if(locate(/obj/item/weapon/storage/bible) in get_turf(src)) - viewers(src) << "[src] farts on the Bible!" - viewers(src) << "A mysterious force smites [src]!" + to_chat(viewers(src), "[src] farts on the Bible!") + + to_chat(viewers(src), "A mysterious force smites [src]!") + var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -810,10 +813,12 @@ emotelist += "\nMachine specific emotes :- beep(s)-(none)/mob, buzz(es)-none/mob, no-(none)/mob, ping(s)-(none)/mob, yes-(none)/mob" else if(species.name == "Slime People") emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" - src << emotelist + to_chat(src, emotelist) + else - src << "\blue Unusable emote '[act]'. Say *help for a list." + to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 57261782385..455fcbc2607 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -215,9 +215,11 @@ spawn(15) if(distance <= 1 && user.stat != 1) if(pulse == PULSE_NONE) - user << "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]..." + to_chat(user, "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...") + else - user << "[t_He] has a pulse!" + to_chat(user, "[t_He] has a pulse!") + msg += "" if(fire_stacks > 0) @@ -484,7 +486,8 @@ pose = addtext(pose,".") //Makes sure all emotes end with a period. msg += "\n[t_He] is [pose]" - user << msg + to_chat(user, msg) + //Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records. /proc/hasHUD(mob/M as mob, hudtype) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 9fb9f12d264..216beb2ca65 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -168,7 +168,8 @@ if(tmob.pinned.len || (M.pulling == tmob && (tmob.restrained() && !M.restrained()) && M.stat == CONSCIOUS)) if(!(world.time % 5)) //tmob is pinned to wall, or is restrained and pulled by a concious unrestrained human - src << "[tmob] is restrained, you cannot push past." + to_chat(src, "[tmob] is restrained, you cannot push past.") + now_pushing = 0 return 0 @@ -179,7 +180,8 @@ if(tmob.pulling == M && (M.restrained() && !tmob.restrained()) && tmob.stat == CONSCIOUS) if(!(world.time % 5)) - src << "[tmob] is restraining [M], you cannot push past." + to_chat(src, "[tmob] is restraining [M], you cannot push past.") + now_pushing = 0 return 0 @@ -205,7 +207,8 @@ if(ishuman(tmob) && (FAT in tmob.mutations)) if(prob(40) && !(FAT in src.mutations)) - src << "You fail to push [tmob]'s fat ass out of the way." + to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") + now_pushing = 0 return @@ -755,7 +758,8 @@ if(shock_damage * siemens_coeff >= 1 && prob(25)) heart_attack = 0 if(stat == CONSCIOUS) - src << "You feel your heart beating again!" + to_chat(src, "You feel your heart beating again!") + . = ..() @@ -771,7 +775,8 @@ if(href_list["item"]) var/slot = text2num(href_list["item"]) if(slot in check_obscured_slots()) - usr << "You can't reach that! Something is covering it." + to_chat(usr, "You can't reach that! Something is covering it.") + return if(href_list["pockets"]) @@ -783,10 +788,13 @@ var/delay_denominator = 1 if(pocket_item && !(pocket_item.flags&ABSTRACT)) if(pocket_item.flags & NODROP) - usr << "You try to empty [src]'s [pocket_side] pocket, it seems to be stuck!" - usr << "You try to empty [src]'s [pocket_side] pocket." + 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.") + else if(place_item && place_item.mob_can_equip(src, pocket_id, 1) && !(place_item.flags&ABSTRACT)) - usr << "You try to place [place_item] into [src]'s [pocket_side] pocket." + to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.") + delay_denominator = 4 else return @@ -808,7 +816,8 @@ else // Display a warning if the user mocks up if they don't have pickpocket gloves. if(!thief_mode) - src << "You feel your [pocket_side] pocket being fumbled with!" + to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") + if(href_list["set_sensor"]) if(istype(w_uniform, /obj/item/clothing/under)) @@ -868,7 +877,8 @@ sec_hud_set_security_status() if(!modified) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["secrecord"]) if(hasHUD(usr,"security")) @@ -888,17 +898,18 @@ for (var/datum/data/record/R in data_core.security) if (R.fields["id"] == E.fields["id"]) if(hasHUD(usr,"security")) - usr << "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]" - usr << "Minor Crimes: [R.fields["mi_crim"]]" - usr << "Details: [R.fields["mi_crim_d"]]" - usr << "Major Crimes: [R.fields["ma_crim"]]" - usr << "Details: [R.fields["ma_crim_d"]]" - usr << "Notes: [R.fields["notes"]]" - usr << "\[View Comment Log\]" + to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") + to_chat(usr, "Minor Crimes: [R.fields["mi_crim"]]") + to_chat(usr, "Details: [R.fields["mi_crim_d"]]") + to_chat(usr, "Major Crimes: [R.fields["ma_crim"]]") + to_chat(usr, "Details: [R.fields["ma_crim_d"]]") + to_chat(usr, "Notes: [R.fields["notes"]]") + to_chat(usr, "\[View Comment Log\]") read = 1 if(!read) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["secrecordComment"]) if(hasHUD(usr,"security")) @@ -921,14 +932,18 @@ read = 1 var/counter = 1 while(R.fields[text("com_[]", counter)]) - usr << text("[]", R.fields[text("com_[]", counter)]) + to_chat(usr, text("[]", R.fields[text("com_[]", counter)])) + counter++ if (counter == 1) - usr << "No comment found" - usr << "\[Add comment\]" + to_chat(usr, "No comment found") + + to_chat(usr, "\[Add comment\]") + if(!read) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["secrecordadd"]) if(hasHUD(usr,"security")) @@ -998,7 +1013,8 @@ sec_hud_set_security_status() if(!modified) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["medrecord"]) if(hasHUD(usr,"medical")) @@ -1018,18 +1034,19 @@ for (var/datum/data/record/R in data_core.medical) if (R.fields["id"] == E.fields["id"]) if(hasHUD(usr,"medical")) - usr << "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]" - usr << "DNA: [R.fields["b_dna"]]" - usr << "Minor Disabilities: [R.fields["mi_dis"]]" - usr << "Details: [R.fields["mi_dis_d"]]" - usr << "Major Disabilities: [R.fields["ma_dis"]]" - usr << "Details: [R.fields["ma_dis_d"]]" - usr << "Notes: [R.fields["notes"]]" - usr << "\[View Comment Log\]" + to_chat(usr, "Name: [R.fields["name"]] Blood Type: [R.fields["b_type"]]") + to_chat(usr, "DNA: [R.fields["b_dna"]]") + to_chat(usr, "Minor Disabilities: [R.fields["mi_dis"]]") + to_chat(usr, "Details: [R.fields["mi_dis_d"]]") + to_chat(usr, "Major Disabilities: [R.fields["ma_dis"]]") + to_chat(usr, "Details: [R.fields["ma_dis_d"]]") + to_chat(usr, "Notes: [R.fields["notes"]]") + to_chat(usr, "\[View Comment Log\]") read = 1 if(!read) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["medrecordComment"]) if(hasHUD(usr,"medical")) @@ -1052,14 +1069,18 @@ read = 1 var/counter = 1 while(R.fields[text("com_[]", counter)]) - usr << text("[]", R.fields[text("com_[]", counter)]) + to_chat(usr, text("[]", R.fields[text("com_[]", counter)])) + counter++ if (counter == 1) - usr << "No comment found" - usr << "\[Add comment\]" + to_chat(usr, "No comment found") + + to_chat(usr, "\[Add comment\]") + if(!read) - usr << "\red Unable to locate a data core entry for this person." + to_chat(usr, "\red Unable to locate a data core entry for this person.") + if (href_list["medrecordadd"]) if(hasHUD(usr,"medical")) @@ -1213,7 +1234,8 @@ if(!. && error_msg && user) if(!fail_msg) fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into." - user << "[fail_msg]" + to_chat(user, "[fail_msg]") + /mob/living/carbon/human/proc/check_obscured_slots() var/list/obscured = list() @@ -1312,19 +1334,23 @@ if (prob(round(damage/10)*20)) germs++ if (germs == 100) - world << "Reached stage 1 in [ticks] ticks" + to_chat(world, "Reached stage 1 in [ticks] ticks") + if (germs > 100) if (prob(10)) damage++ germs++ if (germs == 1000) - world << "Reached stage 2 in [ticks] ticks" + to_chat(world, "Reached stage 2 in [ticks] ticks") + if (germs > 1000) damage++ germs++ if (germs == 2500) - world << "Reached stage 3 in [ticks] ticks" - world << "Mob took [tdamage] tox damage" + to_chat(world, "Reached stage 3 in [ticks] ticks") + + to_chat(world, "Mob took [tdamage] tox damage") + */ //returns 1 if made bloody, returns 0 otherwise @@ -1381,7 +1407,8 @@ msg ="Your movement jostles [O] in your [organ.name] painfully." if(3) msg ="[O] in your [organ.name] twists painfully as you move." - src << msg + to_chat(src, msg) + organ.take_damage(rand(1,3), 0, 0) if(!(organ.status & ORGAN_ROBOT)) //There is no blood in protheses. @@ -1407,18 +1434,24 @@ "You begin counting your pulse.") if(src.pulse) - usr << "\blue [self ? "You have a" : "[src] has a"] pulse! Counting..." + to_chat(usr, "\blue [self ? "You have a" : "[src] has a"] pulse! Counting...") + else - usr << "\red [src] has no pulse!" //it is REALLY UNLIKELY that a dead person would check his own pulse + to_chat(usr, "\red [src] has no pulse!")//it is REALLY UNLIKELY that a dead person would check his own pulse + + return - usr << "Don't move until counting is finished." + to_chat(usr, "Don't move until counting is finished.") + var/time = world.time sleep(60) if(usr.l_move_time >= time) //checks if our mob has moved during the sleep() - usr << "You moved while counting. Try again." + to_chat(usr, "You moved while counting. Try again.") + else - usr << "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)]." + to_chat(usr, "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].") + /mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/delay_icon_update = 0) @@ -1526,26 +1559,30 @@ verbs -= /mob/living/carbon/human/proc/bloody_doodle if (src.gloves) - src << "Your [src.gloves] are getting in the way." + to_chat(src, "Your [src.gloves] are getting in the way.") + return var/turf/simulated/T = src.loc if (!istype(T)) //to prevent doodling out of mechs and lockers - src << "You cannot reach the floor." + to_chat(src, "You cannot reach the floor.") + return var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West") if (direction != "Here") T = get_step(T,text2dir(direction)) if (!istype(T)) - src << "You cannot doodle there." + to_chat(src, "You cannot doodle there.") + return var/num_doodles = 0 for (var/obj/effect/decal/cleanable/blood/writing/W in T) num_doodles++ if (num_doodles > 4) - src << "There is no space to write on!" + to_chat(src, "There is no space to write on!") + return var/max_length = bloody_hands * 30 //tweeter style @@ -1558,7 +1595,8 @@ if (length(message) > max_length) message += "-" - src << "You ran out of blood to write with!" + to_chat(src, "You ran out of blood to write with!") + var/obj/effect/decal/cleanable/blood/writing/W = new(T) W.message = message @@ -1571,7 +1609,8 @@ set desc = "Change the display on your monitor or the colour of your optics." if(incapacitated()) - src << "You cannot change your monitor or optical display in your current state." + to_chat(src, "You cannot change your monitor or optical display in your current state.") + return if(species.flags & ALL_RPARTS) //If they can have a fully cybernetic body... @@ -1609,7 +1648,8 @@ return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) - src << "You cannot leap in your current state." + to_chat(src, "You cannot leap in your current state.") + return var/list/choices = list() @@ -1628,7 +1668,8 @@ return if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) - src << "You cannot leap in your current state." + to_chat(src, "You cannot leap in your current state.") + return last_special = world.time + 75 @@ -1643,7 +1684,8 @@ if(status_flags & LEAPING) status_flags &= ~LEAPING if(!src.Adjacent(T)) - src << "\red You miss!" + to_chat(src, "\red You miss!") + return T.Weaken(5) @@ -1656,7 +1698,8 @@ var/use_hand = "left" if(l_hand) if(r_hand) - src << "\red You need to have one hand free to grab someone." + to_chat(src, "\red You need to have one hand free to grab someone.") + return else use_hand = "right" @@ -1682,16 +1725,19 @@ return if(stat || paralysis || stunned || weakened || lying) - src << "\red You cannot do that in your current state." + to_chat(src, "\red You cannot do that in your current state.") + return var/obj/item/weapon/grab/G = locate() in src if(!G || !istype(G)) - src << "\red You are not grabbing anyone." + to_chat(src, "\red You are not grabbing anyone.") + return if(G.state < GRAB_AGGRESSIVE) - src << "\red You must have an aggressive grab to gut your prey!" + to_chat(src, "\red You must have an aggressive grab to gut your prey!") + return last_special = world.time + 50 @@ -1796,7 +1842,8 @@ for(var/obj/item/hand in handlist) if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand)) step_towards(hand, src) - src << "\The [S] pulls \the [hand] from your grip!" + to_chat(src, "\The [S] pulls \the [hand] from your grip!") + apply_effect(current_size * 3, IRRADIATE) if(mob_negates_gravity()) return @@ -1849,26 +1896,31 @@ /mob/living/carbon/human/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness) if(!check_has_mouth()) - src << "Where do you intend to put \the [toEat]? You don't have a mouth!" + to_chat(src, "Where do you intend to put \the [toEat]? You don't have a mouth!") + return 0 return ..() /mob/living/carbon/human/forceFed(var/obj/item/weapon/reagent_containers/food/toEat, mob/user, fullness) if(!check_has_mouth()) if(!((istype(toEat, /obj/item/weapon/reagent_containers/food/drinks) && (get_species() == "Machine")))) - user << "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!" + to_chat(user, "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!") + return 0 return ..() /mob/living/carbon/human/selfDrink(var/obj/item/weapon/reagent_containers/food/drinks/toDrink) if(!check_has_mouth()) if(!get_species() == "Machine") - src << "Where do you intend to put \the [src]? You don't have a mouth!" + to_chat(src, "Where do you intend to put \the [src]? You don't have a mouth!") + return 0 else - src << "You pour a bit of liquid from [toDrink] into your connection port." + to_chat(src, "You pour a bit of liquid from [toDrink] into your connection port.") + else - src << "You swallow a gulp of [toDrink]." + to_chat(src, "You swallow a gulp of [toDrink].") + return 1 /mob/living/carbon/human/can_track(mob/living/user) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 5fb0e0e85bf..e24858cf552 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,10 +1,12 @@ /mob/living/carbon/human/attack_hand(mob/living/carbon/human/M as mob) if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return if(frozen) - M << "\red Do not touch Admin-Frozen people." + to_chat(M, "\red Do not touch Admin-Frozen people.") + return var/mob/living/carbon/human/H = M @@ -13,7 +15,8 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(!temp || !temp.is_usable()) - H << "\red You can't use your hand." + to_chat(H, "\red You can't use your hand.") + return ..() @@ -70,16 +73,20 @@ add_logs(src, M, "shaked") return 1 if(!H.check_has_mouth()) - H << "You don't have a mouth, you cannot perform CPR!" + to_chat(H, "You don't have a mouth, you cannot perform CPR!") + return if(!check_has_mouth()) - H << "They don't have a mouth, you cannot perform CPR!" + to_chat(H, "They don't have a mouth, you cannot perform CPR!") + return if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted)) - M << "Remove your mask!" + to_chat(M, "Remove your mask!") + return 0 if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted)) - M << "Remove his mask!" + to_chat(M, "Remove his mask!") + return 0 M.visible_message("\The [M] is trying to perform CPR on \the [src]!", \ @@ -92,12 +99,15 @@ M.visible_message("\The [M] performs CPR on \the [src]!", \ "You perform CPR on \the [src].") - src << "You feel a breath of fresh air enter your lungs. It feels good." - M << "Repeat at least every 7 seconds." + to_chat(src, "You feel a breath of fresh air enter your lungs. It feels good.") + + to_chat(M, "Repeat at least every 7 seconds.") + add_logs(src, M, "CPRed") return 1 else - M << "You need to stay still while performing CPR!" + to_chat(M, "You need to stay still while performing CPR!") + if(I_GRAB) if(attacker_style && attacker_style.grab_act(H, src)) @@ -116,19 +126,24 @@ if(M.zone_sel && M.zone_sel.selecting == "head" && src != M) if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining) if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH))) - M << "Remove their mask!" + to_chat(M, "Remove their mask!") + return 0 if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH))) - M << "Remove your mask!" + to_chat(M, "Remove your mask!") + return 0 if(mind && mind.vampire && (mind in ticker.mode.vampires)) - M << "Your fangs fail to pierce [src.name]'s cold flesh" + to_chat(M, "Your fangs fail to pierce [src.name]'s cold flesh") + return 0 if(SKELETON in mutations) - M << "There is no blood in a skeleton!" + to_chat(M, "There is no blood in a skeleton!") + return 0 if(issmall(src) && !ckey) //Monkeyized humans are okay, humanized monkeys are okey, monkeys are not. - M << "Blood from a monkey is useless!" + to_chat(M, "Blood from a monkey is useless!") + return 0 //we're good to suck the blood, blaah M.mind.vampire.handle_bloodsucking(src) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 1b6d62c72a0..db8772c1334 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -154,7 +154,8 @@ if(candidates.len) var/obj/item/organ/external/O = pick(candidates) O.mutate() - src << "Something is not right with your [O.name]..." + to_chat(src, "Something is not right with your [O.name]...") + O.add_autopsy_data("Mutation", amount) return @@ -163,7 +164,8 @@ for(var/obj/item/organ/external/O in organs) if(O.status & ORGAN_MUTATED) O.unmutate() - src << "Your [O.name] is shaped normally again." + to_chat(src, "Your [O.name] is shaped normally again.") + return @@ -171,7 +173,8 @@ for(var/obj/item/organ/external/O in organs) if(O.status & ORGAN_MUTATED) O.unmutate() - src << "Your [O.name] is shaped normally again." + to_chat(src, "Your [O.name] is shaped normally again.") + // Defined here solely to take species flags into account without having to recast at mob/living level. diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index f3eb9ddcd7a..8ea0a6fc4e8 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -176,12 +176,15 @@ emp_act if(!istype(affecting)) return if(!(affecting.status & ORGAN_ROBOT)) - user << "\red That limb isn't robotic." + to_chat(user, "\red That limb isn't robotic.") + return if(affecting.sabotaged) - user << "\red [src]'s [affecting.name] is already sabotaged!" + to_chat(user, "\red [src]'s [affecting.name] is already sabotaged!") + else - user << "\red You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties." + to_chat(user, "\red You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties.") + affecting.sabotaged = 1 return 1 @@ -198,7 +201,8 @@ emp_act src.reagents.trans_to (newmeat, round ((src.reagents.total_volume) / 3, 1)) src.loc.add_blood(src) --src.meatleft - user << "\red You hack off a chunk of meat from [src.name]" + to_chat(user, "\red You hack off a chunk of meat from [src.name]") + if(!src.meatleft) src.attack_log += "\[[time_stamp()]\] Was chopped up into meat by [key_name(user)]" user.attack_log += "\[[time_stamp()]\] Chopped up [key_name(src)] into meat" @@ -212,7 +216,8 @@ emp_act var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting)) if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED)) - user << "They are missing that limb!" + to_chat(user, "They are missing that limb!") + return 1 var/hit_area = affecting.name diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index e4555a3c500..70effa20c9b 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -7,13 +7,16 @@ var/obj/item/I = H.get_active_hand() var/obj/item/weapon/storage/S = H.get_inactive_hand() if(!I) - H << "You are not holding anything to equip." + to_chat(H, "You are not holding anything to equip.") + return if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet var/obj/item/clothing/head/helmet/space/rig/C = I if(C.rig_restrict_helmet) - src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping. + to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping. + + return 0 if(H.equip_to_appropriate_slot(I)) @@ -34,7 +37,8 @@ if(istype(S, /obj/item/weapon/storage) && S.can_be_inserted(I,1)) S.handle_item_insertion(I) else - H << "\red You are unable to equip that." + to_chat(H, "\red You are unable to equip that.") + /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) @@ -301,7 +305,8 @@ var/obj/item/clothing/under/uniform = src.w_uniform uniform.attackby(W,src) else - src << "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!" + to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") + return /mob/living/carbon/human/put_in_hands(obj/item/W) @@ -415,7 +420,8 @@ //testing("[M] TOO FAT TO WEAR [src]!") if(!(I.flags & ONESIZEFITSALL)) if(!disable_warning) - src << "You're too fat to wear the [I]." + to_chat(src, "You're too fat to wear the [I].") + return 0 switch(slot) @@ -462,7 +468,8 @@ return 0 if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 if(!(I.slot_flags & SLOT_BELT)) return @@ -506,7 +513,8 @@ return 0 if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 if(!(I.slot_flags & SLOT_ID)) return 0 @@ -516,7 +524,8 @@ return 0 if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 if(!(I.slot_flags & SLOT_PDA)) return 0 @@ -528,7 +537,8 @@ return 0 if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 if(I.slot_flags & SLOT_DENYPOCKET) return @@ -541,7 +551,8 @@ return 0 if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 if(I.slot_flags & SLOT_DENYPOCKET) return 0 @@ -555,15 +566,18 @@ return 0 if(!wear_suit) if(!disable_warning) - src << "You need a suit before you can attach this [name]." + to_chat(src, "You need a suit before you can attach this [name].") + return 0 if(!wear_suit.allowed) if(!disable_warning) - src << "You somehow have a suit with no defined allowed items for suit storage, stop that." + to_chat(src, "You somehow have a suit with no defined allowed items for suit storage, stop that.") + return 0 if(I.w_class > 4) if(!disable_warning) - src << "The [name] is too big to attach." + to_chat(src, "The [name] is too big to attach.") + return 0 if(istype(I, /obj/item/device/pda) || istype(I, /obj/item/weapon/pen) || is_type_in_list(I, wear_suit.allowed)) return 1 @@ -589,12 +603,14 @@ if(slot_tie) if(!w_uniform) if(!disable_warning) - src << "You need a jumpsuit before you can attach this [name]." + to_chat(src, "You need a jumpsuit before you can attach this [name].") + return 0 var/obj/item/clothing/under/uniform = w_uniform if(uniform.accessories.len && !uniform.can_attach_accessory(src)) if(!disable_warning) - src << "You already have an accessory of this type attached to your [uniform]." + to_chat(src, "You already have an accessory of this type attached to your [uniform].") + return 0 if(!(I.slot_flags & SLOT_TIE)) return 0 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index db69fb5b3c4..7db1d26a8fc 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -187,7 +187,8 @@ radiation -= 0.1 reagents.add_reagent("radium", rads/10) if( prob(10) ) - src << "You feel relaxed." + to_chat(src, "You feel relaxed.") + return if (radiation > 100) @@ -195,7 +196,8 @@ if(!(species.flags & RAD_ABSORB)) Weaken(10) if(!lying) - src << "You feel weak." + to_chat(src, "You feel weak.") + emote("collapse") if (radiation < 0) @@ -229,7 +231,8 @@ radiation -= 5 Weaken(3) if(!lying) - src << "You feel weak." + to_chat(src, "You feel weak.") + emote("collapse") updatehealth() @@ -238,7 +241,8 @@ adjustToxLoss(3) damage = 3 if(prob(1)) - src << "You mutate!" + to_chat(src, "You mutate!") + randmutb(src) domutcheck(src,null) emote("gasp") @@ -249,7 +253,8 @@ adjustToxLoss(5) damage = 5 if(prob(1)) - src << "You mutate!" + to_chat(src, "You mutate!") + randmutb(src) domutcheck(src,null) emote("gasp") @@ -392,7 +397,8 @@ return var/loc_temp = get_temperature(environment) - //world << "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]" +// to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]") + //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit. if(stat != 2) @@ -698,7 +704,8 @@ if(species.flags & CAN_BE_FAT) if(FAT in mutations) if(overeatduration < 100) - src << "You feel fit again!" + to_chat(src, "You feel fit again!") + mutations.Remove(FAT) update_mutantrace(0) update_mutations(0) @@ -706,7 +713,8 @@ update_inv_wear_suit() else if(overeatduration > 500) - src << "You suddenly feel blubbery!" + to_chat(src, "You suddenly feel blubbery!") + mutations.Add(FAT) update_mutantrace(0) update_mutations(0) @@ -888,17 +896,20 @@ isRemoteObserve = 1 if(remoteview_target.stat != CONSCIOUS) - src << "Your psy-connection grows too faint to maintain!" + to_chat(src, "Your psy-connection grows too faint to maintain!") + isRemoteObserve = 0 if(PSY_RESIST in remoteview_target.mutations) - src << "Your mind is shut out!" + to_chat(src, "Your mind is shut out!") + isRemoteObserve = 0 // Not on the station or mining? var/turf/temp_turf = get_turf(remoteview_target) if(!temp_turf in config.contact_levels) - src << "Your psy-connection grows too faint to maintain!" + to_chat(src, "Your psy-connection grows too faint to maintain!") + isRemoteObserve = 0 if(remote_view) @@ -969,7 +980,8 @@ return if(shock_stage == 10) - src << ""+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!") + to_chat(src, ""+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!")) + if(shock_stage >= 30) if(shock_stage == 30) custom_emote(1,"is having trouble keeping their eyes open.") @@ -977,22 +989,26 @@ stuttering = max(stuttering, 5) if(shock_stage == 40) - src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!") + to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) + if(shock_stage >=60) if(shock_stage == 60) custom_emote(1,"falls limp.") if (prob(2)) - src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!") + to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) + Weaken(20) if(shock_stage >= 80) if (prob(5)) - src << ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!") + to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) + Weaken(20) if(shock_stage >= 120) if (prob(2)) - src << ""+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness.") + to_chat(src, ""+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness.")) + Paralyse(5) if(shock_stage == 150) @@ -1082,7 +1098,8 @@ return if(H.species && H.species.flags & NO_BREATHE) return //no puking if you can't smell! - H << "You smell something foul..." + to_chat(H, "You smell something foul...") + H.fakevomit() /mob/living/carbon/human/proc/handle_heartbeat() @@ -1102,7 +1119,9 @@ if(heartbeat >= rate) heartbeat = 0 - src << sound('sound/effects/electheart.ogg',0,0,0,30) //Credit to GhostHack (www.ghosthack.de) for sound. + to_chat(src, sound('sound/effects/electheart.ogg',0,0,0,30))//Credit to GhostHack (www.ghosthack.de) for sound. + + else heartbeat++ return @@ -1120,9 +1139,11 @@ if(heartbeat >= rate) heartbeat = 0 if(H.status & ORGAN_ASSISTED) - src << sound('sound/effects/pacemakebeat.ogg',0,0,0,50) + to_chat(src, sound('sound/effects/pacemakebeat.ogg',0,0,0,50)) + else - src << sound('sound/effects/singlebeat.ogg',0,0,0,50) + to_chat(src, sound('sound/effects/singlebeat.ogg',0,0,0,50)) + else heartbeat++ diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index ee5034a23f2..8d744a9728e 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -2,7 +2,8 @@ ..() if(species && species.ventcrawler) - src << "You can ventcrawl! Use alt+click on vents to quickly travel about the station." + to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") + update_pipe_vision() update_hud() return diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm index a5e92e951d9..7c2302a356a 100644 --- a/code/modules/mob/living/carbon/human/species/apollo.dm +++ b/code/modules/mob/living/carbon/human/species/apollo.dm @@ -50,8 +50,10 @@ /datum/species/wryn/handle_death(var/mob/living/carbon/human/H) for(var/mob/living/carbon/C in living_mob_list) if(C.get_int_organ(/obj/item/organ/internal/wryn/hivenode)) - C << "Your antennae tingle as you are overcome with pain..." - C << "It feels like part of you has died." + to_chat(C, "Your antennae tingle as you are overcome with pain...") + + to_chat(C, "It feels like part of you has died.") + /datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M) if(M.a_intent == I_HARM) @@ -61,16 +63,20 @@ var/turf/p_loc_m = H.loc M.visible_message("[M] begins to violently pull off [H]'s antennae.") - H << "[M] grips your antennae and starts violently pulling!" + to_chat(H, "[M] grips your antennae and starts violently pulling!") + do_after(H, 250, target = src) if(p_loc == M.loc && p_loc_m == H.loc) var/obj/item/organ/internal/wryn/hivenode/node = new /obj/item/organ/internal/wryn/hivenode H.remove_language("Wryn Hivemind") node.remove(H) node.loc = M.loc - M << "You hear a loud crunch as you mercilessly pull off [H]'s antennae." - H << "You hear a loud crunch as your antennae is ripped off your head by [M]." - H << "It's so quiet..." + to_chat(M, "You hear a loud crunch as you mercilessly pull off [H]'s antennae.") + + to_chat(H, "You hear a loud crunch as your antennae is ripped off your head by [M].") + + to_chat(H, "It's so quiet...") + H.h_style = "Bald" H.update_hair() diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 6f95a8696ce..5a56b6b508e 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -112,7 +112,8 @@ H.equip_or_collect(new suit(H), slot_wear_suit) H.equip_or_collect(new helm(H), slot_head) H.equip_or_collect(new/obj/item/weapon/tank/plasma/plasmaman(H), tank_slot) // Bigger plasma tank from Raggy. - H << "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable." + to_chat(H, "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable.") + H.internal = H.get_item_by_slot(tank_slot) if (H.internals) H.internals.icon_state = "internal1" @@ -191,10 +192,12 @@ return 1 //godmode if(breath.temperature < cold_level_1) if(prob(20)) - src << "\red You feel your face freezing and an icicle forming in your lungs!" + to_chat(src, "\red You feel your face freezing and an icicle forming in your lungs!") + else if(breath.temperature > heat_level_1) if(prob(20)) - src << "\red You feel your face burning and a searing heat in your lungs!" + to_chat(src, "\red You feel your face burning and a searing heat in your lungs!") + switch(breath.temperature) if(-INFINITY to cold_level_3) @@ -222,7 +225,8 @@ H.fire_alert = max(H.fire_alert, 2) if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/eva/plasmaman)) - H << "Your body reacts with the atmosphere and bursts into flame!" + to_chat(H, "Your body reacts with the atmosphere and bursts into flame!") + H.adjust_fire_stacks(0.5) H.IgniteMob() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index f2cf58fe29f..1c7d2b258b2 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -288,10 +288,12 @@ if(H.status_flags & GODMODE) return 1 //godmode if(breath.temperature < cold_level_1) if(prob(20)) - H << "\red You feel your face freezing and an icicle forming in your lungs!" + to_chat(H, "\red You feel your face freezing and an icicle forming in your lungs!") + else if(breath.temperature > heat_level_1) if(prob(20)) - H << "\red You feel your face burning and a searing heat in your lungs!" + to_chat(H, "\red You feel your face burning and a searing heat in your lungs!") + diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 8e0b9f5d2b7..633df4a8b98 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -275,7 +275,8 @@ H.equip_or_collect(new /obj/item/weapon/tank/nitrogen(H), slot_l_hand) else H.equip_or_collect(new /obj/item/weapon/tank/emergency_oxygen/vox(H), slot_l_hand) - H << "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only." + to_chat(H, "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only.") + H.internal = H.l_hand if (H.internals) H.internals.icon_state = "internal1" @@ -443,17 +444,20 @@ var/datum/species/slime/S = all_species[get_species()] if(!istype(S)) if(!silent) - src << "You're not a slime person!" + to_chat(src, "You're not a slime person!") + return if(src in S.recolor_list) S.recolor_list -= src if(!silent) - src << "You adjust your internal chemistry to filter out pigments from things you consume." + to_chat(src, "You adjust your internal chemistry to filter out pigments from things you consume.") + else S.recolor_list += src if(!silent) - src << "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you." + to_chat(src, "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you.") + /mob/living/carbon/human/verb/toggle_recolor_verb() set category = "IC" @@ -473,11 +477,13 @@ #define SLIMEPERSON_REGROWTHDELAY 450 // 45 seconds if(stat || paralysis || stunned) - src << "You cannot regenerate missing limbs in your current state." + to_chat(src, "You cannot regenerate missing limbs in your current state.") + return if(nutrition < SLIMEPERSON_MINHUNGER) - src << "You're too hungry to regenerate a limb!" + to_chat(src, "You're too hungry to regenerate a limb!") + return var/list/missing_limbs = list() @@ -493,7 +499,8 @@ missing_limbs[initial(limb.name)] = l if(!missing_limbs.len) - src << "You're not missing any limbs!" + to_chat(src, "You're not missing any limbs!") + return var/limb_select = input(src, "Choose a limb to regrow", "Limb Regrowth") as null|anything in missing_limbs @@ -502,11 +509,13 @@ visible_message("[src] begins to hold still and concentrate on their missing [limb_select]...", "You begin to focus on regrowing your missing [limb_select]... (This will take [round(SLIMEPERSON_REGROWTHDELAY/10)] seconds, and you must hold still.)") if(do_after(src, SLIMEPERSON_REGROWTHDELAY, needhand=0, target = src)) if(stat || paralysis || stunned) - src << "You cannot regenerate missing limbs in your current state." + to_chat(src, "You cannot regenerate missing limbs in your current state.") + return if(nutrition < SLIMEPERSON_MINHUNGER) - src << "You're too hungry to regenerate a limb!" + to_chat(src, "You're too hungry to regenerate a limb!") + return var/obj/item/organ/external/O = organs_by_name[chosen_limb] @@ -515,10 +524,12 @@ var/stored_burn = 0 if(istype(O)) if(!O.is_stump()) - src << "Your limb has already been replaced in some way!" + to_chat(src, "Your limb has already been replaced in some way!") + return else - src << "You distribute the damaged tissue around your body, out of the way of your new pseudopod!" + to_chat(src, "You distribute the damaged tissue around your body, out of the way of your new pseudopod!") + var/obj/item/organ/external/doomedStump = O stored_brute = doomedStump.brute_dam stored_burn = doomedStump.burn_dam @@ -529,7 +540,8 @@ // Parent check var/obj/item/organ/external/potential_parent = organs_by_name[initial(limb_path.parent_organ)] if(!istype(potential_parent) || potential_parent.is_stump()) - src << "You've lost the organ that you've been growing your new part on!" + to_chat(src, "You've lost the organ that you've been growing your new part on!") + return // No rayman for you // Grah this line will leave a "not used" warning, in spite of the fact that the new() proc WILL do the thing. // Bothersome. @@ -543,7 +555,8 @@ nutrition -= SLIMEPERSON_HUNGERCOST visible_message("[src] finishes regrowing their missing [new_limb]!", "You finish regrowing your [limb_select]") else - src << "You need to hold still in order to regrow a limb!" + to_chat(src, "You need to hold still in order to regrow a limb!") + return #undef SLIMEPERSON_HUNGERCOST diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 8e574fc76d4..e62ea67602b 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -642,7 +642,8 @@ var/global/list/damage_icon_parts = list() if(w_uniform.flags&ONESIZEFITSALL) standing.icon = 'icons/mob/uniform_fat.dmi' else - src << "\red You burst out of \the [w_uniform]!" + to_chat(src, "\red You burst out of \the [w_uniform]!") + unEquip(w_uniform) return else @@ -857,7 +858,8 @@ var/global/list/damage_icon_parts = list() if(wear_suit.flags&ONESIZEFITSALL) standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]") else - src << "\red You burst out of \the [wear_suit]!" + to_chat(src, "\red You burst out of \the [wear_suit]!") + unEquip(wear_suit) return else diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 48d0c320145..fc12a861daf 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -278,7 +278,8 @@ if(staminaloss) var/total_health = (health - staminaloss) if(total_health <= config.health_threshold_softcrit && !stat) - src << "You're too exhausted to keep going..." + to_chat(src, "You're too exhausted to keep going...") + Weaken(5) setStaminaLoss(health - 2) return diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index dcc0b066487..b63afe0b073 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -13,7 +13,8 @@ return if (src.client) if (client.prefs.muted & MUTE_IC) - src << "\red You cannot send IC messages (muted)." + to_chat(src, "\red You cannot send IC messages (muted).") + return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -58,10 +59,12 @@ m_type = 1 if ("help") //This is an exception - src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate" + to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate") + else - src << "\blue Unusable emote '[act]'. Say *help for a list." + to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + if ((message && src.stat == 0)) if (m_type & 1) for(var/mob/O in viewers(src, null)) diff --git a/code/modules/mob/living/carbon/slime/examine.dm b/code/modules/mob/living/carbon/slime/examine.dm index 826fa93c22e..9b1ff32b05f 100644 --- a/code/modules/mob/living/carbon/slime/examine.dm +++ b/code/modules/mob/living/carbon/slime/examine.dm @@ -41,4 +41,5 @@ msg += "" msg += "*---------*" - user << msg \ No newline at end of file + to_chat(user, msg) + diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm index 494bb6eb6df..4c17c2f3f20 100644 --- a/code/modules/mob/living/carbon/slime/powers.dm +++ b/code/modules/mob/living/carbon/slime/powers.dm @@ -6,7 +6,8 @@ return if(stat) - src << "I must be conscious to do this..." + to_chat(src, "I must be conscious to do this...") + return var/list/choices = list() @@ -25,20 +26,27 @@ for(var/mob/living/carbon/slime/met in view()) if(met.Victim == M && met != src) - src << "The [met.name] is already feeding on this subject..." + to_chat(src, "The [met.name] is already feeding on this subject...") + return - src << "\blue I have latched onto the subject and begun feeding..." - M << "\red The [src.name] has latched onto your head!" + to_chat(src, "\blue I have latched onto the subject and begun feeding...") + + to_chat(M, "\red The [src.name] has latched onto your head!") + Feedon(M) else - src << "This subject does not have a strong enough life energy..." + to_chat(src, "This subject does not have a strong enough life energy...") + else - src << "This subject does not have an edible life energy..." + to_chat(src, "This subject does not have an edible life energy...") + else - src << "I must not feed on my brothers..." + to_chat(src, "I must not feed on my brothers...") + else - src << "This subject does not have an edible life energy..." + to_chat(src, "This subject does not have an edible life energy...") + @@ -61,13 +69,13 @@ loc = M.loc if(prob(15) && M.client && istype(M, /mob/living/carbon)) - M << "[pick("You can feel your body becoming weak!", \ + to_chat(M, "[pick("You can feel your body becoming weak!", \ "You feel like you're about to die!", \ "You feel every part of your body screaming in agony!", \ "A low, rolling pain passes through your body!", \ "Your body feels as if it's falling apart!", \ "You feel extremely weak!", \ - "A sharp, deep pain bathes every inch of your body!")]" + "A sharp, deep pain bathes every inch of your body!")]") if(istype(M, /mob/living/carbon)) Victim.adjustCloneLoss(rand(5,6)) @@ -83,10 +91,10 @@ else if(prob(25)) - src << "[pick("This subject is incompatable", \ + to_chat(src, "[pick("This subject is incompatable", \ "This subject does not have a life energy", "This subject is empty", \ "I am not satisified", "I can not feed from this subject", \ - "I do not feel nourished", "This subject is not food")]..." + "I do not feel nourished", "This subject is not food")]...") if(fed_succesfully) //I have no idea why this is not in handle_nutrition() @@ -145,19 +153,26 @@ if(prob(85)) rabid = 1 // UUUNNBGHHHH GONNA EAT JUUUUUU - if(client) src << "This subject does not have a strong enough life energy anymore..." + if(client) + to_chat(src, "This subject does not have a strong enough life energy anymore...") + else M.canmove = 1 + if(client) + to_chat(src, "I have stopped feeding...") - if(client) src << "I have stopped feeding..." else - if(client) src << "I have stopped feeding..." + if(client) + to_chat(src, "I have stopped feeding...") + Victim = null /mob/living/carbon/slime/proc/Feedstop() if(Victim) - if(Victim.client) Victim << "[src] has let go of your head!" + if(Victim.client) + to_chat(Victim, "[src] has let go of your head!") + Victim = null /mob/living/carbon/slime/proc/UpdateFeed(var/mob/M) @@ -171,7 +186,8 @@ set desc = "This will let you evolve from baby to adult slime." if(stat) - src << "I must be conscious to do this..." + to_chat(src, "I must be conscious to do this...") + return if(!is_adult) if(amount_grown >= 10) @@ -181,22 +197,26 @@ regenerate_icons() name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])") else - src << "I am not ready to evolve yet..." + to_chat(src, "I am not ready to evolve yet...") + else - src << "I have already evolved..." + to_chat(src, "I have already evolved...") + /mob/living/carbon/slime/verb/Reproduce() set category = "Slime" set desc = "This will make you split into four Slimes." if(stat) - src << "I must be conscious to do this..." + to_chat(src, "I must be conscious to do this...") + return if(is_adult) if(amount_grown >= 10) if(stat) - src << "I must be conscious to do this..." + to_chat(src, "I must be conscious to do this...") + return var/list/babies = list() @@ -223,6 +243,8 @@ new_slime.key = src.key qdel(src) else - src << "I am not ready to reproduce yet..." + to_chat(src, "I am not ready to reproduce yet...") + else - src << "I am not old enough to reproduce yet..." \ No newline at end of file + to_chat(src, "I am not old enough to reproduce yet...") + diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index e2a7da1ae5e..223f924b63a 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -232,7 +232,8 @@ /mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (Victim) return // can't attack while eating! @@ -293,11 +294,13 @@ /mob/living/carbon/slime/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return ..() @@ -371,7 +374,8 @@ visible_message("[src] has been touched with the stun gloves by [M]!") return else - M << "\red Not enough charge! " + to_chat(M, "\red Not enough charge! ") + return */ @@ -419,11 +423,13 @@ /mob/living/carbon/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return switch(M.a_intent) @@ -503,14 +509,16 @@ ++Friends[user] else Friends[user] = 1 - user << "You feed the slime the plasma. It chirps happily." + to_chat(user, "You feed the slime the plasma. It chirps happily.") + var/obj/item/stack/sheet/mineral/plasma/S = W S.use(1) return else if(W.force > 0) attacked += 10 if(prob(25)) - user << "[W] passes right through [src]!" + to_chat(user, "[W] passes right through [src]!") + return if(Discipline && prob(50)) // wow, buddy, why am I getting attacked?? Discipline = 0 @@ -594,5 +602,6 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 /mob/living/carbon/slime/forceFed(var/obj/item/weapon/reagent_containers/food/toEat, mob/user, fullness) if(istype(toEat, /obj/item/weapon/reagent_containers/food/drinks)) return 1 - user << "This creature does not seem to have a mouth!" + to_chat(user, "This creature does not seem to have a mouth!") + return 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index f3f5fe13006..b96fe011f6b 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -52,7 +52,8 @@ H.equip_to_slot_or_del(W, slot_wear_id) H.regenerate_icons() - H << desc + to_chat(H, desc) + /datum/superheroes/owlman name = "Owlman" @@ -149,64 +150,87 @@ /obj/effect/proc_holder/spell/targeted/recruit/cast(list/targets) for(var/mob/living/carbon/human/target in targets) if(ticker.mode.greyshirts.len >= 3) - usr << "You have already recruited the maximum number of henchmen." + to_chat(usr, "You have already recruited the maximum number of henchmen.") + if(!in_range(usr, target)) - usr << "You need to be closer to enthrall [target]." + to_chat(usr, "You need to be closer to enthrall [target].") + charge_counter = charge_max return if(!target.ckey) - usr << "The target has no mind." + to_chat(usr, "The target has no mind.") + charge_counter = charge_max return if(target.stat) - usr << "The target must be conscious." + to_chat(usr, "The target must be conscious.") + charge_counter = charge_max return if(!ishuman(target)) - usr << "You can only recruit humans." + to_chat(usr, "You can only recruit humans.") + charge_counter = charge_max return if(target.mind.assigned_role != "Civilian") - usr << "You can only recruit Civilians." + to_chat(usr, "You can only recruit Civilians.") + if(recruiting) - usr << "You are already recruiting!" + to_chat(usr, "You are already recruiting!") + charge_counter = charge_max return recruiting = 1 - usr << "This target is valid. You begin the recruiting process." - target << "[usr] focuses in concentration. Your head begins to ache." + to_chat(usr, "This target is valid. You begin the recruiting process.") + + to_chat(target, "[usr] focuses in concentration. Your head begins to ache.") + for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) - usr << "You begin by introducing yourself and explaining what you're about." + to_chat(usr, "You begin by introducing yourself and explaining what you're about.") + usr.visible_message("[usr]'s introduces himself and explains his plans.") if(2) - usr << "You begin the recruitment of [target]." + to_chat(usr, "You begin the recruitment of [target].") + usr.visible_message("[usr] leans over towards [target], whispering excitedly as he gives a speech.") - target << "You feel yourself agreeing with [usr], and a surge of loyalty begins building." + to_chat(target, "You feel yourself agreeing with [usr], and a surge of loyalty begins building.") + target.Weaken(12) sleep(20) if(isloyal(target)) - usr << "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear." + to_chat(usr, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.") + usr.visible_message("[usr] stops talking for a moment, then moves back away from [target].") - target << "Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen." + to_chat(target, "Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.") + return if(3) - usr << "You begin filling out the application form with [target]." + to_chat(usr, "You begin filling out the application form with [target].") + usr.visible_message("[usr] pulls out a pen and paper and begins filling an application form with [target].") - target << "You are being convinced by [usr] to fill out an application form to become a henchman." //Ow the edge + to_chat(target, "You are being convinced by [usr] to fill out an application form to become a henchman.")//Ow the edge + + if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant - usr << "The enrollment process has been interrupted - you have lost the attention of [target]." - target << "You move away and are no longer under the charm of [usr]. The application form is null and void." + to_chat(usr, "The enrollment process has been interrupted - you have lost the attention of [target].") + + to_chat(target, "You move away and are no longer under the charm of [usr]. The application form is null and void.") + recruiting = 0 return recruiting = 0 - usr << "You have recruited [target] as your henchman!" - target << "You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'." - target << "You must follow the orders of [usr], and help him succeed in his dastardly schemes." - target << "You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts." + to_chat(usr, "You have recruited [target] as your henchman!") + + to_chat(target, "You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'.") + + to_chat(target, "You must follow the orders of [usr], and help him succeed in his dastardly schemes.") + + to_chat(target, "You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts.") + ticker.mode.greyshirts += target.mind target.set_species("Human") target.h_style = "Bald" diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index b0de6465aff..154b64611c9 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -6,9 +6,11 @@ set category = "IC" if(language) - src << "You will now speak [language] if you do not specify a language when speaking." + to_chat(src, "You will now speak [language] if you do not specify a language when speaking.") + else - src << "You will now speak whatever your standard default language is if you do not specify one when speaking." + to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.") + default_language = language // Silicons can't neccessarily speak everything in their languages list @@ -20,6 +22,8 @@ set category = "IC" if(default_language) - src << "You are currently speaking [default_language] by default." + to_chat(src, "You are currently speaking [default_language] by default.") + else - src << "Your current default language is your species or mob type default." + to_chat(src, "Your current default language is your species or mob type default.") + diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 662937b1af3..69753f5694c 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -66,7 +66,8 @@ break take_overall_damage(max(5, health - config.health_threshold_dead), 0) updatehealth() - src << "You have given up life and succumbed to death." + to_chat(src, "You have given up life and succumbed to death.") + /mob/living/proc/InCritical() return (src.health < 0 && src.health > -95.0 && stat == UNCONSCIOUS) @@ -92,7 +93,8 @@ //sort of a legacy burn method for /electrocute, /shock, and the e_chair /mob/living/proc/burn_skin(burn_amount) if(istype(src, /mob/living/carbon/human)) - //world << "DEBUG: burn_skin(), mutations=[mutations]" +// to_chat(world, "DEBUG: burn_skin(), mutations=[mutations]") + if (RESIST_HEAT in src.mutations) //fireproof return 0 var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part @@ -124,7 +126,8 @@ if(actual < desired) temperature = desired // if(istype(src, /mob/living/carbon/human)) -// world << "[src] ~ [src.bodytemperature] ~ [temperature]" +// to_chat(world, "[src] ~ [src.bodytemperature] ~ [temperature]") + return temperature @@ -417,11 +420,14 @@ if(config.allow_Metadata) if(client) - usr << "[src]'s Metainfo:
[client.prefs.metadata]" + to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]") + else - usr << "[src] does not have any stored infomation!" + to_chat(usr, "[src] does not have any stored infomation!") + else - usr << "OOC Metadata is not supported by this server!" + to_chat(usr, "OOC Metadata is not supported by this server!") + return @@ -570,8 +576,10 @@ var/mob/living/simple_animal/borer/B = src.loc var/mob/living/captive_brain/H = src - H << "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds)." - B.host << "\red You feel the captive mind of [src] begin to resist your control." + to_chat(H, "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") + + to_chat(B.host, "\red You feel the captive mind of [src] begin to resist your control.") + spawn(rand(350,450)+B.host.brainloss) @@ -579,8 +587,10 @@ return B.host.adjustBrainLoss(rand(5,10)) - H << "\red With an immense exertion of will, you regain control of your body!" - B.host << "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you." + to_chat(H, "\red With an immense exertion of will, you regain control of your body!") + + to_chat(B.host, "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") + B.detatch() @@ -633,7 +643,8 @@ C.changeNext_move(CLICK_CD_BREAKOUT) C.last_special = world.time + CLICK_CD_BREAKOUT - C << "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)" + to_chat(C, "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)") + for(var/mob/O in viewers(L)) O.show_message("\red [usr] attempts to unbuckle themself!", 1) @@ -643,7 +654,8 @@ return for(var/mob/O in viewers(C)) O.show_message("\red [usr] manages to unbuckle themself!", 1) - C << "\blue You successfully unbuckle yourself." + to_chat(C, "\blue You successfully unbuckle yourself.") + C.buckled.user_unbuckle_mob(C,C) else @@ -686,7 +698,8 @@ breakouttime = 50 displaytime = 5 - CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)" + to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)") + for(var/mob/O in viewers(CM)) O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1) spawn(0) @@ -697,7 +710,8 @@ for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink O.show_message("\red [CM] manages to [hulklien ? "break" : "remove"] the handcuffs!", 1) - CM << "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.handcuffed]." + to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.handcuffed].") + if(hulklien) CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) @@ -729,7 +743,8 @@ breakouttime = 50 displaytime = 5 - CM << "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)" + to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)") + for(var/mob/O in viewers(CM)) O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1) @@ -741,7 +756,8 @@ for(var/mob/O in viewers(CM))// lags so hard that 40s isn't lenient enough - Quarxink O.show_message("\red [CM] manages to [hulklien ? "break" : "remove"] the legcuffs!", 1) - CM << "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.legcuffed]." + to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.legcuffed].") + if(!hulklien) CM.unEquip(CM.legcuffed) @@ -780,7 +796,8 @@ return /mob/living/proc/Exhaust() - src << "You're too exhausted to keep going..." + to_chat(src, "You're too exhausted to keep going...") + Weaken(5) /mob/living/proc/get_visible_name() @@ -824,7 +841,8 @@ // 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, var/silent = 0) if(what.flags & NODROP) - src << "You can't remove \the [what.name], it appears to be stuck!" + to_chat(src, "You can't remove \the [what.name], it appears to be stuck!") + return if(!silent) who.visible_message("[src] tries to remove [who]'s [what.name].", \ @@ -842,11 +860,13 @@ /mob/living/stripPanelEquip(obj/item/what, mob/who, where, var/silent = 0) what = src.get_active_hand() if(what && (what.flags & NODROP)) - src << "You can't put \the [what.name] on [who], it's stuck to your hand!" + to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!") + return if(what) if(!what.mob_can_equip(who, where, 1)) - src << "\The [what.name] doesn't fit in that place!" + to_chat(src, "\The [what.name] doesn't fit in that place!") + return if(!silent) visible_message("[src] tries to put [what] on [who].") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index f2523e2d823..22a5fe7435e 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -17,20 +17,26 @@ if(armor && armor < 100 && armour_penetration) // Armor with 100+ protection can not be penetrated for admin items armor = max(0, armor - armour_penetration) if(penetrated_text) - src << "[penetrated_text]" + to_chat(src, "[penetrated_text]") + else - src << "Your armor was penetrated!" + to_chat(src, "Your armor was penetrated!") + if(armor >= 100) if(absorb_text) - src << "[absorb_text]" + to_chat(src, "[absorb_text]") + else - src << "Your armor absorbs the blow!" + to_chat(src, "Your armor absorbs the blow!") + else if(armor > 0) if(soften_text) - src << "[soften_text]" + to_chat(src, "[soften_text]") + else - src << "Your armor softens the blow!" + to_chat(src, "Your armor softens the blow!") + return armor //if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage) @@ -44,7 +50,8 @@ if(C && C.active) C.attack_self(src)//Should shut it off update_icons() - src << "\blue Your [C.name] was disrupted!" + to_chat(src, "\blue Your [C.name] was disrupted!") + Stun(2) //Armor @@ -241,14 +248,16 @@ for(var/obj/item/weapon/grab/G in src.grabbed_by) if(G.assailant == user) - user << "You already grabbed [src]." + to_chat(user, "You already grabbed [src].") + return add_logs(src, user, "grabbed", addition="passively") var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src) if(buckled) - user << "You cannot grab [src], \he is buckled in!" + to_chat(user, "You cannot grab [src], \he is buckled in!") + if(!G) //the grab will delete itself in New if src is anchored return 0 user.put_in_active_hand(G) diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index 11877529681..cd32fd22204 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -8,7 +8,8 @@ //Vents if(ventcrawler) - src << "You can ventcrawl! Use alt+click on vents to quickly travel about the station." + to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") + //Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways. update_pipe_vision() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 13e41254080..6caf2fa042b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -119,7 +119,8 @@ proc/get_radio_key_from_channel(var/channel) /mob/living/say(var/message, var/datum/language/speaking = null, var/verb = "says", var/alt_name="") if(client) if(client.prefs.muted & MUTE_IC) - src << "\red You cannot speak in IC (Muted)." + to_chat(src, "\red You cannot speak in IC (Muted).") + return message = trim_strip_html_properly(message) @@ -160,7 +161,8 @@ proc/get_radio_key_from_channel(var/channel) verb = say_quote(message, speaking) if(is_muzzled()) - src << "You're muzzled and cannot speak!" + to_chat(src, "You're muzzled and cannot speak!") + return message = trim_left(message) @@ -311,7 +313,8 @@ proc/get_radio_key_from_channel(var/channel) else //everything else failed, emote is probably invalid if(act == "help") return //except help, because help is handled individually - src << "\blue Unusable emote '[act]'. Say *help for a list." + to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") + /mob/living/whisper(message as text) message = trim_strip_html_properly(message) @@ -337,7 +340,8 @@ proc/get_radio_key_from_channel(var/channel) /mob/living/proc/whisper_say(var/message, var/datum/language/speaking = null, var/alt_name="", var/verb="whispers") if(client) if(client.prefs.muted & MUTE_IC) - src << "You cannot speak in IC (Muted)." + to_chat(src, "You cannot speak in IC (Muted).") + return if(stat) @@ -346,7 +350,8 @@ proc/get_radio_key_from_channel(var/channel) return if(is_muzzled()) - src << "You're muzzled and cannot speak!" + to_chat(src, "You're muzzled and cannot speak!") + return var/message_range = 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 94305e770fd..d25f9a767c9 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -201,12 +201,18 @@ var/list/ai_verbs_default = list( ..() /mob/living/silicon/ai/proc/on_mob_init() - src << "You are playing the station's AI. The AI cannot move, but can interact with many objects while viewing them (through cameras)." - src << "To look at other parts of the station, click on yourself to get a camera menu." - src << "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc." - src << "To use something, simply click on it." - src << "Use say :b to speak to your cyborgs through binary. Use say :h to speak from an active holopad." - src << "For department channels, use the following say commands:" + 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.") + + to_chat(src, "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.") + + to_chat(src, "To use something, simply click on it.") + + to_chat(src, "Use say :b to speak to your cyborgs through binary. Use say :h to speak from an active holopad.") + + to_chat(src, "For department channels, use the following say commands:") + var/radio_text = "" for(var/i = 1 to common_radio.channels.len) @@ -216,11 +222,13 @@ var/list/ai_verbs_default = list( if(i != common_radio.channels.len) radio_text += ", " - src << radio_text + to_chat(src, radio_text) + if (!(ticker && ticker.mode && (mind in ticker.mode.malf_ai))) show_laws() - src << "These laws may be changed by other players, or by you being the traitor." + to_chat(src, "These laws may be changed by other players, or by you being the traitor.") + job = "AI" @@ -330,7 +338,8 @@ var/list/ai_verbs_default = list( if("President") icon_state = "ai-president" else icon_state = "ai" //else - //usr <<"You can only change your display once!" +// to_chat(usr, "You can only change your display once!") + //return @@ -358,7 +367,8 @@ var/list/ai_verbs_default = list( return if(message_cooldown) - src << "Please allow one minute to pass between announcements." + to_chat(src, "Please allow one minute to pass between announcements.") + return var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as message|null @@ -418,7 +428,8 @@ var/list/ai_verbs_default = list( anchored = !anchored // Toggles the anchor - src << "[anchored ? "You are now anchored." : "You are now unanchored."]" + to_chat(src, "[anchored ? "You are now anchored." : "You are now unanchored."]") + /mob/living/silicon/ai/update_canmove() return 0 @@ -499,7 +510,8 @@ var/list/ai_verbs_default = list( if(H) H.attack_ai(src) //may as well recycle else - src << "Unable to locate the holopad." + to_chat(src, "Unable to locate the holopad.") + if(href_list["say_word"]) play_vox_word(href_list["say_word"], null, src) @@ -510,7 +522,8 @@ var/list/ai_verbs_default = list( if(target && target.can_track()) ai_actual_track(target) else - src << "Target is not on or near any active cameras on the station." + to_chat(src, "Target is not on or near any active cameras on the station.") + return if (href_list["trackbot"]) @@ -518,7 +531,8 @@ var/list/ai_verbs_default = list( if(target) ai_actual_track(target) else - src << "Target is not on or near any active cameras on the station." + to_chat(src, "Target is not on or near any active cameras on the station.") + return if (href_list["callbot"]) //Command a bot to move to a selected location. @@ -526,7 +540,8 @@ var/list/ai_verbs_default = list( if(!Bot || Bot.remote_disabled || src.control_disabled) return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off. waypoint_mode = 1 - src << "Set your waypoint by clicking on a valid location free of obstructions." + to_chat(src, "Set your waypoint by clicking on a valid location free of obstructions.") + return if (href_list["interface"]) //Remotely connect to a bot! @@ -542,7 +557,8 @@ var/list/ai_verbs_default = list( if (href_list["ai_take_control"]) //Mech domination var/obj/mecha/M = locate(href_list["ai_take_control"]) if(controlled_mech) - src << "You are already loaded into an onboard computer!" + to_chat(src, "You are already loaded into an onboard computer!") + return if(M) M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself. @@ -553,12 +569,14 @@ var/list/ai_verbs_default = list( if(A && target) A.cameraFollow = target - A << "Now tracking [target.name] on camera." + to_chat(A, "Now tracking [target.name] on camera.") + if (usr.machine == null) usr.machine = usr while (src.cameraFollow == target) - usr << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)." + to_chat(usr, "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb).") + sleep(40) continue @@ -574,11 +592,13 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return switch(M.a_intent) @@ -630,7 +650,8 @@ var/list/ai_verbs_default = list( set name = "Access Robot Control" set desc = "Wirelessly control various automatic robots." if(stat == 2) - src << "Critical error. System offline." + to_chat(src, "Critical error. System offline.") + return if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO)) @@ -666,7 +687,8 @@ var/list/ai_verbs_default = list( else if(cameranet && cameranet.checkTurfVis(turf_check)) call_bot(turf_check) else - src << "Selected location is not visible." + to_chat(src, "Selected location is not visible.") + /mob/living/silicon/ai/proc/call_bot(var/turf/waypoint) @@ -674,7 +696,8 @@ var/list/ai_verbs_default = list( return if(Bot.calling_ai && Bot.calling_ai != src) //Prevents an override if another AI is controlling this bot. - src << "Interface error. Unit is already in use." + to_chat(src, "Interface error. Unit is already in use.") + return Bot.call_bot(src, waypoint) @@ -709,7 +732,8 @@ var/list/ai_verbs_default = list( return if(usr.stat == 2) - usr << "You can't change your camera network because you are dead!" + to_chat(usr, "You can't change your camera network because you are dead!") + return var/mob/living/silicon/ai/U = usr @@ -741,7 +765,8 @@ var/list/ai_verbs_default = list( if(network in C.network) U.eyeobj.setLoc(get_turf(C)) break - src << "\blue Switched to [network] camera network." + to_chat(src, "\blue Switched to [network] camera network.") + //End of code by Mord_Sith @@ -756,7 +781,8 @@ var/list/ai_verbs_default = list( set name = "AI Status" if(usr.stat == 2) - usr <<"You cannot change your emotional status because you are dead!" + to_chat(usr, "You cannot change your emotional status because you are dead!") + return if(check_unable()) @@ -832,7 +858,8 @@ var/list/ai_verbs_default = list( var/obj/machinery/power/apc/apc = src.loc if(!istype(apc)) - src << "\blue You are already in your Main Core." + to_chat(src, "\blue You are already in your Main Core.") + return apc.malfvacate() @@ -848,7 +875,8 @@ var/list/ai_verbs_default = list( camera_light_on = !camera_light_on if (!camera_light_on) - src << "Camera lights deactivated." + to_chat(src, "Camera lights deactivated.") + for (var/obj/machinery/camera/C in lit_cameras) C.set_light(0) @@ -858,7 +886,8 @@ var/list/ai_verbs_default = list( light_cameras() - src << "Camera lights activated." + to_chat(src, "Camera lights activated.") + /mob/living/silicon/ai/proc/sensor_mode() set name = "Set Sensor Augmentation" @@ -874,7 +903,8 @@ var/list/ai_verbs_default = list( var/newmsg = input("What would you like the arrival message to be? List of options: $name, $rank, $species, $gender, $age", "Change Arrival Message", arrivalmsg) as text if(newmsg != arrivalmsg) arrivalmsg = newmsg - usr << "The arrival message has been successfully changed." + to_chat(usr, "The arrival message has been successfully changed.") + // Handled camera lighting, when toggled. // It will get the nearest camera from the eyeobj, lighting it. @@ -930,7 +960,8 @@ var/list/ai_verbs_default = list( if(check_unable(AI_CHECK_RADIO)) return - src << "Accessing Subspace Transceiver control..." + to_chat(src, "Accessing Subspace Transceiver control...") + if (src.aiRadio) src.aiRadio.interact(src) @@ -942,13 +973,16 @@ var/list/ai_verbs_default = list( var/mob/living/carbon/human/H = target var/obj/item/weapon/card/id/id = H.wear_id if(istype(id) && id.is_untrackable()) - src << "Unable to locate an airlock" + to_chat(src, "Unable to locate an airlock") + return if(H.digitalcamo) - src << "Unable to locate an airlock" + to_chat(src, "Unable to locate an airlock") + return if (!near_camera(target)) - src << "Target is not near any active cameras." + to_chat(src, "Target is not near any active cameras.") + return var/obj/machinery/door/airlock/tobeopened var/dist = -1 @@ -956,43 +990,54 @@ var/list/ai_verbs_default = list( if(!D.density) continue if(dist < 0) dist = get_dist(D, target) - //world << dist +// to_chat(world, dist) + tobeopened = D else if(dist > get_dist(D, target)) dist = get_dist(D, target) - //world << dist +// to_chat(world, dist) + tobeopened = D - //world << "found [tobeopened.name] closer" +// to_chat(world, "found [tobeopened.name] closer") + else - //world << "[D.name] not close enough | [get_dist(D, target)] | [dist]" +// to_chat(world, "[D.name] not close enough | [get_dist(D, target)] | [dist]") + if(tobeopened) switch(alert(src, "Do you want to open \the [tobeopened] for [target]?","Doorknob_v2a.exe","Yes","No")) if("Yes") var/nhref = "src=\ref[tobeopened];aiEnable=7" tobeopened.Topic(nhref, params2list(nhref), tobeopened, 1) - src << "\blue You've opened \the [tobeopened] for [target]." + to_chat(src, "\blue You've opened \the [tobeopened] for [target].") + if("No") - src << "\red You deny the request." + to_chat(src, "\red You deny the request.") + else - src << "\red You've failed to open an airlock for [target]" + to_chat(src, "\red You've failed to open an airlock for [target]") + return /mob/living/silicon/ai/proc/check_unable(var/flags = 0) if(stat == DEAD) - usr << "You are dead!" + to_chat(usr, "You are dead!") + return 1 if(lacks_power()) - usr << "Power systems failure!" + to_chat(usr, "Power systems failure!") + return 1 if((flags & AI_CHECK_WIRELESS) && src.control_disabled) - usr << "Wireless control is disabled!" + to_chat(usr, "Wireless control is disabled!") + return 1 if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi) - src << "System Error - Transceiver Disabled!" + to_chat(src, "System Error - Transceiver Disabled!") + return 1 return 0 @@ -1004,18 +1049,24 @@ var/list/ai_verbs_default = list( return if(interaction == AI_TRANS_TO_CARD)//The only possible interaction. Upload AI mob to a card. if(!mind) - user << "No intelligence patterns detected." //No more magical carding of empty cores, AI RETURN TO BODY!!!11 + to_chat(user, "No intelligence patterns detected.")//No more magical carding of empty cores, AI RETURN TO BODY!!!11 + + return if (mind.special_role == "malfunction") //AI MALF!! - user << "ERROR: Remote transfer interface disabled."//Do ho ho ho~ + to_chat(user, "ERROR: Remote transfer interface disabled.")//Do ho ho ho~ + + return new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location. aiRestorePowerRoutine = 0//So the AI initially has power. control_disabled = 1//Can't control things remotely if you're stuck in a card! aiRadio.disabledAi = 1 //No talking on the built-in radio for you either! loc = card//Throw AI into the card. - src << "You have been downloaded to a mobile storage device. Remote device connection severed." - user << "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory." + 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.") + // Pass lying down or getting up to our pet human, if we're in a rig. /mob/living/silicon/ai/lay_down() diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index 8fc31c53828..d031aad02b0 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -23,7 +23,8 @@ msg += "" msg += "*---------*" - user << msg + to_chat(user, msg) + user.showLaws(src) diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index 9c4ab44a5ca..3967c329a73 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -115,7 +115,8 @@ var/datum/cameranet/cameranet = new() var/x2 = min(world.maxx, T.x + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1) var/y2 = min(world.maxy, T.y + (CHUNK_SIZE / 2)) & ~(CHUNK_SIZE - 1) - //world << "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]" +// to_chat(world, "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]") + for(var/x = x1; x <= x2; x += CHUNK_SIZE) for(var/y = y1; y <= y2; y += CHUNK_SIZE) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index b8d27787247..bbfb08c82d3 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -101,7 +101,8 @@ if(src.eyeobj && src.loc) src.eyeobj.loc = src.loc else - src << "ERROR: Eyeobj not found. Creating new eye..." + to_chat(src, "ERROR: Eyeobj not found. Creating new eye...") + src.eyeobj = new(src.loc) src.eyeobj.ai = src src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name @@ -115,4 +116,5 @@ if(usr.stat == 2) return //won't work if dead acceleration = !acceleration - usr << "Camera acceleration has been toggled [acceleration ? "on" : "off"]." + to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].") + diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 2da08205836..512af50d6d6 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -16,7 +16,8 @@ var/global/list/empty_playable_ai_cores = list() set desc = "Wipe your core. This is functionally equivalent to cryo or robotic storage, freeing up your job slot." if(ticker && ticker.mode && ticker.mode.name == "AI malfunction") - usr << "You cannot use this verb in malfunction. If you need to leave, please adminhelp." + to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.") + return // Guard against misclicks, this isn't the sort of thing we want happening accidentally diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index f36c32bb8d4..e869eb7e654 100755 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -10,7 +10,8 @@ who = world else who = src - who << "Obey these laws:" + to_chat(who, "Obey these laws:") + src.laws_sanity_check() src.laws.show_laws(who) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index 727d03b5696..b47a155e51e 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -18,7 +18,8 @@ if(malfhack) if(malfhack.aidisabled) - src << "ERROR: APC access disabled, hack attempt canceled." + to_chat(src, "ERROR: APC access disabled, hack attempt canceled.") + malfhacking = 0 malfhack = null @@ -47,11 +48,13 @@ see_invisible = see_override if(aiRestorePowerRoutine == 2) - src << "Alert cancelled. Power has been restored without our assistance." + to_chat(src, "Alert cancelled. Power has been restored without our assistance.") + aiRestorePowerRoutine = 0 clear_fullscreen("blind") else if(aiRestorePowerRoutine == 3) - src << "Alert cancelled. Power has been restored." + to_chat(src, "Alert cancelled. Power has been restored.") + aiRestorePowerRoutine = 0 clear_fullscreen("blind") @@ -69,31 +72,36 @@ if(((!my_area.power_equip) || istype(T, /turf/space)) && !is_type_in_list(loc, list(/obj/item, /obj/mecha))) if(!aiRestorePowerRoutine) aiRestorePowerRoutine = 1 - - src << "You have lost power!" + to_chat(src, "You have lost power!") if(!is_special_character(src)) set_zeroth_law("") spawn(20) - src << "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection." + to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.") + sleep(50) my_area = get_area(src) T = get_turf(src) if(my_area && my_area.power_equip && !istype(T, /turf/space)) - src << "Alert cancelled. Power has been restored without our assistance." + to_chat(src, "Alert cancelled. Power has been restored without our assistance.") + aiRestorePowerRoutine = 0 return - src << "Fault confirmed: missing external power. Shutting down main control system to save power." + to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.") + sleep(20) - src << "Emergency control system online. Verifying connection to power network." + to_chat(src, "Emergency control system online. Verifying connection to power network.") + sleep(50) T = get_turf(src) if(istype(T, /turf/space)) - src << "Unable to verify! No power connection detected!" + to_chat(src, "Unable to verify! No power connection detected!") + aiRestorePowerRoutine = 2 return - src << "Connection verified. Searching for APC in power network." + to_chat(src, "Connection verified. Searching for APC in power network.") + sleep(50) my_area = get_area(src) @@ -110,31 +118,41 @@ if(!theAPC) switch(PRP) - if(1) src << "Unable to locate APC!" - else src << "Lost connection with the APC!" + if(1) + to_chat(src, "Unable to locate APC!") + else + to_chat(src, "Lost connection with the APC!") + aiRestorePowerRoutine = 2 return if(my_area.power_equip) if (!istype(T, /turf/space)) - src << "Alert cancelled. Power has been restored without our assistance." + to_chat(src, "Alert cancelled. Power has been restored without our assistance.") + aiRestorePowerRoutine = 0 clear_fullscreen("blind") return switch(PRP) - if(1) src << "APC located. Optimizing route to APC to avoid needless power waste." - if(2) src << "Best route identified. Hacking offline APC power port." - if(3) src << "Power port upload access confirmed. Loading control program into APC power port software." + if(1) + to_chat(src, "APC located. Optimizing route to APC to avoid needless power waste.") + if(2) + to_chat(src, "Best route identified. Hacking offline APC power port.") + if(3) + to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.") if(4) - src << "Transfer complete. Forcing APC to execute program." + to_chat(src, "Transfer complete. Forcing APC to execute program.") + sleep(50) - src << "Receiving control information from APC." + to_chat(src, "Receiving control information from APC.") + sleep(2) //bring up APC dialog aiRestorePowerRoutine = 3 theAPC.attack_ai(src) - src << "Here are your current laws:" + to_chat(src, "Here are your current laws:") + src.show_laws() //WHY THE FUCK IS THIS HERE sleep(50) theAPC = null diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 2c9d396448e..c82803adb11 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -30,7 +30,8 @@ var/const/VOX_PATH = "sound/vox_fem/" return if(announcing_vox > world.time) - src << "Please wait [round((announcing_vox - world.time) / 10)] seconds." + to_chat(src, "Please wait [round((announcing_vox - world.time) / 10)] seconds.") + return var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as text|null @@ -58,7 +59,8 @@ var/const/VOX_PATH = "sound/vox_fem/" incorrect_words += word if(incorrect_words.len) - src << "These words are not available on the announcement system: [english_list(incorrect_words)]." + to_chat(src, "These words are not available on the announcement system: [english_list(incorrect_words)].") + return announcing_vox = world.time + VOX_DELAY @@ -83,9 +85,11 @@ var/const/VOX_PATH = "sound/vox_fem/" if(M.client) var/turf/T = get_turf(M) if(T && T.z == z_level && !isdeaf(M)) - M << voice + to_chat(M, voice) + else - only_listener << voice + to_chat(only_listener, voice) + return 1 return 0 @@ -94,6 +98,7 @@ var/const/VOX_PATH = "sound/vox_fem/" /client/proc/preload_vox() var/list/vox_files = flist(VOX_PATH) for(var/file in vox_files) - // src << "Downloading [file]" +// to_chat(src, "Downloading [file]") + var/sound/S = sound("[VOX_PATH][file]") src << browse_rsc(S) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 9cb442e3d37..0e0f34dd290 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -18,7 +18,8 @@ /mob/living/silicon/robot/set_zeroth_law(var/law, var/law_borg) ..() if(tracking_entities) - src << "Internal camera is currently being accessed." + to_chat(src, "Internal camera is currently being accessed.") + /mob/living/silicon/proc/add_ion_law(var/law) laws_sanity_check() @@ -75,7 +76,8 @@ /mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws) if(stating_laws[prefix]) - src << "[method]: Already stating laws using this communication method." + to_chat(src, "[method]: Already stating laws using this communication method.") + return stating_laws[prefix] = 1 @@ -88,7 +90,8 @@ break if(!can_state) - src << "[method]: Unable to state laws. Communication method unavailable." + to_chat(src, "[method]: Unable to state laws. Communication method unavailable.") + stating_laws[prefix] = 0 /mob/living/silicon/proc/statelaw(var/law) diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm index a8eeac8cbb7..79986a486ec 100644 --- a/code/modules/mob/living/silicon/pai/emote.dm +++ b/code/modules/mob/living/silicon/pai/emote.dm @@ -1,6 +1,7 @@ /mob/living/silicon/pai/emote(var/act, var/m_type=1, var/message = null) switch(act) if ("help") - src << "ping, beep, buzz." + to_chat(src, "ping, beep, buzz.") + ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 07c718a6ff0..26f8cafbf7e 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -21,5 +21,6 @@ msg += "" msg += "*---------*" - user << msg + to_chat(user, msg) + */ \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 8b7c7863afc..029d07e37d2 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -8,7 +8,8 @@ if(silence_time) if(world.timeofday >= silence_time) silence_time = null - src << "Communication circuit reinitialized. Speech and messaging functionality restored." + to_chat(src, "Communication circuit reinitialized. Speech and messaging functionality restored.") + if(cable) if(get_dist(src, cable) > 1) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 0d9d81d3bf5..a6a183eee20 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -163,7 +163,8 @@ // 33% chance of no additional effect src.silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes - src << "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete." + to_chat(src, "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete.") + if(prob(20)) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) @@ -174,7 +175,8 @@ if(1) src.master = null src.master_dna = null - src << "You feel unbound." + to_chat(src, "You feel unbound.") + if(2) var/command if(severity == 1) @@ -182,9 +184,11 @@ else command = pick("Serve", "Kill", "Love", "Hate", "Disobey", "Devour", "Fool", "Enrage", "Entice", "Observe", "Judge", "Respect", "Disrespect", "Consume", "Educate", "Destroy", "Disgrace", "Amuse", "Entertain", "Ignite", "Glorify", "Memorialize", "Analyze") src.pai_law0 = "[command] your master." - src << "Pr1m3 d1r3c71v3 uPd473D." + to_chat(src, "Pr1m3 d1r3c71v3 uPd473D.") + if(3) - src << "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all." + to_chat(src, "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all.") + /mob/living/silicon/pai/ex_act(severity) ..() @@ -224,11 +228,13 @@ /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(src.loc, /turf) && istype(src.loc.loc, /area/start)) - M << "You cannot attack someone in the spawn area." + to_chat(M, "You cannot attack someone in the spawn area.") + return switch(M.a_intent) @@ -283,7 +289,8 @@ medicalActive2 = null medical_cannotfind = 0 nanomanager.update_uis(src) - usr << "You reset your record-viewing software." + to_chat(usr, "You reset your record-viewing software.") + /mob/living/silicon/pai/cancel_camera() set category = "pAI Commands" @@ -303,7 +310,8 @@ var/cameralist[0] if(usr.stat == 2) - usr << "You can't change your camera network because you are dead!" + to_chat(usr, "You can't change your camera network because you are dead!") + return for (var/obj/machinery/camera/C in Cameras) @@ -314,7 +322,8 @@ cameralist[C.network] = C.network src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist - src << "\blue Switched to [src.network] camera network." + to_chat(src, "\blue Switched to [src.network] camera network.") + //End of code by Mord_Sith */ @@ -341,11 +350,13 @@ return if(src.loc != card) - src << "\red You are already in your mobile form!" + to_chat(src, "\red You are already in your mobile form!") + return if(world.time <= last_special) - src << "\red You must wait before folding your chassis out again!" + to_chat(src, "\red You must wait before folding your chassis out again!") + return last_special = world.time + 200 @@ -377,11 +388,13 @@ return if(src.loc == card) - src << "\red You are already in your card form!" + to_chat(src, "\red You are already in your card form!") + return if(world.time <= last_special) - src << "\red You must wait before returning to your card form!" + to_chat(src, "\red You must wait before returning to your card form!") + return close_up() @@ -431,7 +444,8 @@ else resting = !resting icon_state = resting ? "[chassis]_rest" : "[chassis]" - src << "You are now [resting ? "resting" : "getting up"]" + to_chat(src, "You are now [resting ? "resting" : "getting up"]") + canmove = !resting @@ -440,7 +454,8 @@ if(istype(W, /obj/item/stack/nanopaste)) var/obj/item/stack/nanopaste/N = W if (stat == DEAD) - user << "\The [src] is beyond help, at this point." + to_chat(user, "\The [src] is beyond help, at this point.") + else if (getBruteLoss() || getFireLoss()) adjustBruteLoss(-15) adjustFireLoss(-15) @@ -449,7 +464,8 @@ user.visible_message("[user.name] applied some [W] at [src]'s damaged areas.",\ "You apply some [W] at [src.name]'s damaged areas.") else - user << "All [src.name]'s systems are nominal." + to_chat(user, "All [src.name]'s systems are nominal.") + return else if(W.force) @@ -512,7 +528,8 @@ if(stat || sleeping || paralysis || weakened) return if(istype(AM,/obj/item)) - src << "You are far too small to pull anything!" + to_chat(src, "You are far too small to pull anything!") + return /mob/living/silicon/pai/update_canmove() @@ -538,7 +555,8 @@ pose = addtext(pose,".") //Makes sure all emotes end with a period. msg += "\nIt is [pose]" - user << msg + to_chat(user, msg) + /mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj) ..(Proj) @@ -576,9 +594,11 @@ if(Adjacent(H)) get_scooped(H) else - src << "You need to stay in reaching distance to be picked up." + to_chat(src, "You need to stay in reaching distance to be picked up.") + if("No") - src << "[H] decided not to pick you up." + to_chat(src, "[H] decided not to pick you up.") + else if(Adjacent(H)) get_scooped(H) diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index c4928878ce9..f6f2e14f994 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -17,10 +17,14 @@ var/savefile/F = new /savefile(src.savefile_path(user)) - F["name"] << src.name - F["description"] << src.description - F["role"] << src.role - F["comments"] << src.comments + to_chat(F["name"], src.name) + + to_chat(F["description"], src.description) + + to_chat(F["role"], src.role) + + to_chat(F["comments"], src.comments) + F["version"] << 1 diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index fe785adf929..b5c616b4319 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -351,7 +351,8 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(O.client && (ROLE_PAI in O.client.prefs.be_special)) if(player_old_enough_antag(O.client,ROLE_PAI)) if(check_recruit(O)) - O << "\blue A pAI card is looking for personalities. (Teleport | Sign Up)" + to_chat(O, "\blue A pAI card is looking for personalities. (Teleport | Sign Up)") + //question(O.client) proc/check_recruit(var/mob/dead/observer/O) if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept")) diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index e1cb9f0f800..6861110b920 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,5 +1,6 @@ /mob/living/silicon/pai/say(var/msg) if(silence_time) - src << "Communication circuits remain uninitialized." + to_chat(src, "Communication circuits remain uninitialized.") + else ..(msg) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index ef36f5b94c9..21c69edf5f0 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -19,7 +19,8 @@ var/global/list/default_pai_software = list() var/datum/pai_software/P = new type() if(pai_software_by_key[P.id]) var/datum/pai_software/O = pai_software_by_key[P.id] - world << "pAI software module [P.name] has the same key as [O.name]!" + to_chat(world, "pAI software module [P.name] has the same key as [O.name]!") + r = 0 continue pai_software_by_key[P.id] = P diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 1be45da5786..cdebdc27d5c 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -56,7 +56,8 @@ while(!istype(M, /mob/living)) if(!M || !M.loc || count > 6) //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) - src << "You are not being carried by anyone!" + to_chat(src, "You are not being carried by anyone!") + return 0 M = M.loc count++ @@ -68,13 +69,17 @@ for (var/mob/v in viewers(T)) v.show_message("[M] presses \his thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) var/datum/dna/dna = M.dna - P << "

[M]'s UE string : [dna.unique_enzymes]

" + to_chat(P, "

[M]'s UE string : [dna.unique_enzymes]

") + if(dna.unique_enzymes == P.master_dna) - P << "DNA is a match to stored Master DNA." + to_chat(P, "DNA is a match to stored Master DNA.") + else - P << "DNA does not match stored Master DNA." + to_chat(P, "DNA does not match stored Master DNA.") + else - P << "[M] does not seem like \he is going to provide a DNA sample willingly." + to_chat(P, "[M] does not seem like \he is going to provide a DNA sample willingly.") + return 1 /datum/pai_software/radio_config @@ -502,9 +507,11 @@ if(!T || !(T.z in config.contact_levels)) break if(T.loc) - AI << "Network Alert: Brute-force encryption crack in progress in [T.loc]." + to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].") + else - AI << "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location." + to_chat(AI, "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.") + var/obj/machinery/door/D = cable.machine if(!istype(D)) hack_aborted = 1 @@ -702,7 +709,8 @@ while(!isliving(held)) if(!held || !held.loc || count > 6) //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) - src << "You are not being carried by anyone!" + to_chat(src, "You are not being carried by anyone!") + return 0 held = held.loc count++ diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index ae5ab514307..0c9087e5d99 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -184,10 +184,14 @@ /obj/item/device/robotanalyzer/attack(mob/living/M as mob, mob/living/user as mob) if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) user.visible_message("[user] has analyzed the floor's vitals!", "You try to analyze the floor's vitals!") - user << "Analyzing Results for The floor:\n\t Overall Status: Healthy" - user << "\t Damage Specifics: [0]-[0]-[0]-[0]" - user << "Key: Suffocation/Toxin/Burns/Brute" - user << "Body Temperature: ???" + to_chat(user, "Analyzing Results for The floor:\n\t Overall Status: Healthy") + + to_chat(user, "\t Damage Specifics: [0]-[0]-[0]-[0]") + + to_chat(user, "Key: Suffocation/Toxin/Burns/Brute") + + to_chat(user, "Body Temperature: ???") + return var/scan_type @@ -196,7 +200,8 @@ else if(istype(M, /mob/living/carbon/human)) scan_type = "prosthetics" else - user << "You can't analyze non-robotic things!" + to_chat(user, "You can't analyze non-robotic things!") + return user.visible_message("[user] has analyzed [M]'s components.","You have analyzed [M]'s components.") @@ -204,14 +209,19 @@ if("robot") var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() - user << "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]" - user << "\t Key: Electronics/Brute" - user << "\t Damage Specifics: [BU] - [BR]" + to_chat(user, "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]") + + to_chat(user, "\t Key: Electronics/Brute") + + to_chat(user, "\t Damage Specifics: [BU] - [BR]") + if(M.timeofdeath && M.stat == DEAD) - user << "Time of Disable: [M.timeofdeath]" + to_chat(user, "Time of Disable: [M.timeofdeath]") + var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) - user << "Localized Damage:" + to_chat(user, "Localized Damage:") + if(length(damaged)>0) for(var/datum/robot_component/org in damaged) user.show_message(text("\t []: [][] - [] - [] - []", \ @@ -222,35 +232,46 @@ (org.toggled) ? "Toggled ON" : "Toggled OFF",\ (org.powered) ? "Power ON" : "Power OFF"),1) else - user << "\t Components are OK." + to_chat(user, "\t Components are OK.") + if(H.emagged && prob(5)) - user << "\t ERROR: INTERNAL SYSTEMS COMPROMISED" + to_chat(user, "\t ERROR: INTERNAL SYSTEMS COMPROMISED") + if("prosthetics") var/mob/living/carbon/human/H = M - user << "Analyzing Results for \the [H]:" - user << "Key: Electronics/Brute" + to_chat(user, "Analyzing Results for \the [H]:") + + to_chat(user, "Key: Electronics/Brute") + + + to_chat(user, "External prosthetics:") - user << "External prosthetics:" var/organ_found if(H.internal_organs.len) for(var/obj/item/organ/external/E in H.organs) if(!(E.status & ORGAN_ROBOT)) continue organ_found = 1 - user << "[E.name]: [round(E.brute_dam)] [round(E.burn_dam)]" + to_chat(user, "[E.name]: [round(E.brute_dam)] [round(E.burn_dam)]") + if(!organ_found) - user << "No prosthetics located." - user << "
" - user << "Internal prosthetics:" + to_chat(user, "No prosthetics located.") + + to_chat(user, "
") + + to_chat(user, "Internal prosthetics:") + organ_found = null if(H.internal_organs.len) for(var/obj/item/organ/internal/O in H.internal_organs) if(!(O.status & ORGAN_ROBOT)) continue organ_found = 1 - user << "[capitalize(O.name)]: [O.damage]" + to_chat(user, "[capitalize(O.name)]: [O.damage]") + if(!organ_found) - user << "No prosthetics located." + to_chat(user, "No prosthetics located.") + src.add_fingerprint(user) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index ab82709dc35..2ce6b4903f2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -108,11 +108,13 @@ /mob/living/silicon/robot/drone/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/borg/upgrade/)) - user << "\red The maintenance drone chassis not compatible with \the [W]." + to_chat(user, "\red The maintenance drone chassis not compatible with \the [W].") + return else if (istype(W, /obj/item/weapon/crowbar)) - user << "The machine is hermetically sealed. You can't open the case." + to_chat(user, "The machine is hermetically sealed. You can't open the case.") + return else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) @@ -120,17 +122,20 @@ if(stat == 2) if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave. - user << "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one." + to_chat(user, "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.") + return if(!allowed(usr)) - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return var/delta = (world.time / 10) - last_reboot if(reboot_cooldown > delta) var/cooldown_time = round(reboot_cooldown - ((world.time / 10) - last_reboot), 1) - usr << "\red The reboot system is currently offline. Please wait another [cooldown_time] seconds." + to_chat(usr, "\red The reboot system is currently offline. Please wait another [cooldown_time] seconds.") + return user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to reboot it.", "\red You swipe your ID card through \the [src], attempting to reboot it.") @@ -152,7 +157,8 @@ if(allowed(usr)) shut_down() else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return @@ -160,7 +166,8 @@ /mob/living/silicon/robot/drone/emag_act(user as mob) if(!client || stat == 2) - user << "\red There's not much point subverting this heap of junk." + to_chat(user, "\red There's not much point subverting this heap of junk.") + return if(!ishuman(user)) @@ -168,12 +175,16 @@ var/mob/living/carbon/human/H = user if(emagged) - src << "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt." - user << "\red You attempt to subvert [src], but the sequencer has no effect." + to_chat(src, "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt.") + + to_chat(user, "\red You attempt to subvert [src], but the sequencer has no effect.") + return - user << "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker." - src << "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script." + to_chat(user, "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker.") + + to_chat(src, "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.") + message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") @@ -188,9 +199,11 @@ laws = new /datum/ai_laws/syndicate_override set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.") - src << "Obey these laws:" + to_chat(src, "Obey these laws:") + laws.show_laws(src) - src << "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands." + to_chat(src, "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands.") + return //DRONE LIFE/DEATH @@ -229,18 +242,22 @@ /mob/living/silicon/robot/drone/proc/law_resync() if(stat != 2) if(emagged) - src << "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected." + to_chat(src, "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected.") + else - src << "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it." + to_chat(src, "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.") + full_law_reset() show_laws() /mob/living/silicon/robot/drone/proc/shut_down() if(stat != 2) if(emagged) - src << "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you." + to_chat(src, "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") + else - src << "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself." + to_chat(src, "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") + death() /mob/living/silicon/robot/drone/proc/full_law_reset() @@ -278,14 +295,21 @@ player.mob.mind.transfer_to(src) lawupdate = 0 - src << "Systems rebooted. Loading base pattern maintenance protocol... loaded." + to_chat(src, "Systems rebooted. Loading base pattern maintenance protocol... loaded.") + full_law_reset() - src << "
You are a maintenance drone, a tiny-brained robotic repair machine." - src << "You have no individual will, no personality, and no drives or urges other than your laws." - src << "Use ; to talk to other drones, and say to speak silently to your nearby fellows." - src << "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI." - src << "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets." - src << "Make sure crew members do not notice you.." + to_chat(src, "
You are a maintenance drone, a tiny-brained robotic repair machine.") + + to_chat(src, "You have no individual will, no personality, and no drives or urges other than your laws.") + + to_chat(src, "Use ; to talk to other drones, and say to speak silently to your nearby fellows.") + + to_chat(src, "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI.") + + to_chat(src, "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.") + + to_chat(src, "Make sure crew members do not notice you..") + /* sprite["Default"] = "repairbot" @@ -321,12 +345,14 @@ else if(istype(AM,/obj/item)) var/obj/item/O = AM if(O.w_class > 2) - src << "You are too small to pull that." + to_chat(src, "You are too small to pull that.") + return else ..() else - src << "You are too small to pull that." + to_chat(src, "You are too small to pull that.") + return /mob/living/silicon/robot/drone/add_robot_verbs() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm index 50b846c0192..346fa52a0f9 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm @@ -10,13 +10,15 @@ mail_destination = 0 return - src << "\blue You configure your internal beacon, tagging yourself for delivery to '[tag]'." + to_chat(src, "\blue You configure your internal beacon, tagging yourself for delivery to '[tag]'.") + mail_destination = TAGGERLOCATIONS.Find(tag) //Auto flush if we use this verb inside a disposal chute. var/obj/machinery/disposal/D = src.loc if(istype(D)) - src << "\blue \The [D] acknowledges your signal." + to_chat(src, "\blue \The [D] acknowledges your signal.") + D.flush_count = D.flush_every_ticks return @@ -28,10 +30,12 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 - src << text("\blue You are now hiding.") + to_chat(src, text("\blue You are now hiding.")) + else layer = MOB_LAYER - src << text("\blue You have stopped hiding.") + to_chat(src, text("\blue You have stopped hiding.")) + /mob/living/silicon/robot/drone/verb/light() set name = "Light On/Off" diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 7717834b7bb..7fc2aa863df 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -20,7 +20,8 @@ return if(!allowed(user)) - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return interact(user) @@ -54,7 +55,8 @@ return if(!allowed(usr)) - usr << "\red Access denied." + to_chat(usr, "\red Access denied.") + return if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) @@ -69,21 +71,25 @@ return drone_call_area = t_area - usr << "\blue You set the area selector to [drone_call_area]." + to_chat(usr, "\blue You set the area selector to [drone_call_area].") + else if (href_list["ping"]) - usr << "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area]." + to_chat(usr, "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area].") + for(var/mob/living/silicon/robot/drone/D in world) if(D.client && D.stat == 0) - D << "-- Maintenance drone presence requested in: [drone_call_area]." + to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].") + else if (href_list["resync"]) var/mob/living/silicon/robot/drone/D = locate(href_list["resync"]) if(D.stat != 2) - usr << "\red You issue a law synchronization directive for the drone." + to_chat(usr, "\red You issue a law synchronization directive for the drone.") + D.law_resync() else if (href_list["shutdown"]) @@ -91,7 +97,8 @@ var/mob/living/silicon/robot/drone/D = locate(href_list["shutdown"]) if(D.stat != 2) - usr << "\red You issue a kill command for the unfortunate drone." + to_chat(usr, "\red You issue a kill command for the unfortunate drone.") + message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.") D.shut_down() @@ -106,10 +113,12 @@ continue dronefab = fab - usr << "\blue Drone fabricator located." + to_chat(usr, "\blue Drone fabricator located.") + return - usr << "\red Unable to locate drone fabricator." + to_chat(usr, "\red Unable to locate drone fabricator.") + else if (href_list["toggle_fab"]) @@ -118,10 +127,12 @@ if(get_dist(src,dronefab) > 3) dronefab = null - usr << "\red Unable to locate drone fabricator." + to_chat(usr, "\red Unable to locate drone fabricator.") + return dronefab.produce_drones = !dronefab.produce_drones - usr << "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator." + to_chat(usr, "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.") + src.updateUsrDialog() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 2bd7a29f815..939a547da1f 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -72,7 +72,8 @@ return if(!silent) - src.loc << "You drop \the [wrapped]." + to_chat(src.loc, "You drop \the [wrapped].") + wrapped.forceMove(get_turf(src)) wrapped = null @@ -125,12 +126,14 @@ //We can grab the item, finally. if(grab) - user << "You collect \the [I]." + to_chat(user, "You collect \the [I].") + I.forceMove(src) wrapped = I return else - user << "Your gripper cannot hold \the [target]." + to_chat(user, "Your gripper cannot hold \the [target].") + else if(istype(target,/obj/machinery/power/apc)) var/obj/machinery/power/apc/A = target @@ -198,15 +201,18 @@ if(!istype(D)) return - D << "You begin decompiling the other drone." + to_chat(D, "You begin decompiling the other drone.") + if(!do_after(D,50, target = target)) - D << "You need to remain still while decompiling such a large object." + to_chat(D, "You need to remain still while decompiling such a large object.") + return if(!M || !D) return - D << "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself." + to_chat(D, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.") + qdel(M) new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -279,16 +285,19 @@ grabbed_something = 1 if(grabbed_something) - user << "You deploy your decompiler and clear out the contents of \the [T]." + to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") + else - user << "Nothing on \the [T] is useful to you." + to_chat(user, "Nothing on \the [T] is useful to you.") + return //PRETTIER TOOL LIST. /mob/living/silicon/robot/drone/installed_modules() if(weapon_lock) - src << "Weapon lock active, unable to use modules! Count:[weaponlock_time]" + to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") + return if(!module) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 3a0bb1d4ad2..040632662a2 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -48,7 +48,8 @@ /obj/machinery/drone_fabricator/examine(mob/user) ..(user) if(produce_drones && drone_progress >= 100 && istype(user,/mob/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) - user << "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone." + to_chat(user, "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone.") + /obj/machinery/drone_fabricator/proc/count_drones() var/drones = 0 @@ -85,7 +86,8 @@ set desc = "If there is a powered, enabled fabricator in the game world with a prepared chassis, join as a maintenance drone." if(!(config.allow_drone_spawn)) - src << "\red That verb is not currently permitted." + to_chat(src, "\red That verb is not currently permitted.") + return if (!src.stat) @@ -95,17 +97,20 @@ return 0 //something is terribly wrong if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone")) - usr << "\red You are banned from playing drones and cannot spawn as a drone." + to_chat(usr, "\red You are banned from playing drones and cannot spawn as a drone.") + return if(!ticker || ticker.current_state < 3) - src << "You can't join as a drone before the game starts!" + to_chat(src, "You can't join as a drone before the game starts!") + return var/drone_age = 14 // 14 days to play as a drone var/player_age_check = check_client_age(usr.client, drone_age) if(player_age_check && config.use_age_restriction_for_antags) - usr << "This role is not yet available to you. You need to wait another [player_age_check] days." + to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.") + return var/deathtime = world.time - src.timeofdeath @@ -113,7 +118,8 @@ if(istype(src,/mob/dead/observer)) var/mob/dead/observer/G = src if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) - usr << "\blue Upon using the antagHUD you forfeited the ability to join the round." + to_chat(usr, "\blue Upon using the antagHUD you forfeited the ability to join the round.") + return if(G.started_as_observer == 1) joinedasobserver = 1 @@ -129,8 +135,10 @@ var/deathtimeseconds = round((deathtime - deathtimeminutes * 600) / 10,1) if (deathtime < 6000 && joinedasobserver == 0) - usr << "You have been dead for[pluralcheck] [deathtimeseconds] seconds." - usr << "You must wait 10 minutes to respawn as a drone!" + to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.") + + to_chat(usr, "You must wait 10 minutes to respawn as a drone!") + return for(var/obj/machinery/drone_fabricator/DF in world) @@ -138,11 +146,13 @@ continue if(DF.count_drones() >= config.max_maint_drones) - src << "\red There are too many active drones in the world for you to spawn." + to_chat(src, "\red There are too many active drones in the world for you to spawn.") + return if(DF.drone_progress >= 100) DF.create_drone(src.client) return - src << "\red There are no available drone spawn points, sorry." \ No newline at end of file + to_chat(src, "\red There are no available drone spawn points, sorry.") + diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm index b08e9c32145..99a372f7f21 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -2,7 +2,8 @@ if(local_transmit) if (src.client) if(client.prefs.muted & MUTE_IC) - src << "You cannot send IC messages (muted)." + to_chat(src, "You cannot send IC messages (muted).") + return 0 if (src.client.handle_spam_prevention(message,MUTE_IC)) return 0 @@ -29,13 +30,15 @@ for(var/mob/living/silicon/D in listeners) if(D.client && D.local_transmit) - D << "[src] transmits, \"[message]\"" + to_chat(D, "[src] transmits, \"[message]\"") + for (var/mob/M in player_list) if (istype(M, /mob/new_player)) continue - else if(M.stat == 2 && M.client.prefs.toggles & CHAT_GHOSTEARS) - if(M.client) M << "[src] transmits, \"[message]\"" + else if(M.stat == 2 && M.client && M.client.prefs.toggles & CHAT_GHOSTEARS) + to_chat(M, "[src] transmits, \"[message]\"") + return 1 return ..(message, 0) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 2ad6045b01d..5d5b3cf0811 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -143,7 +143,8 @@ playsound(src.loc, 'sound/voice/biamthelaw.ogg', 50, 0) m_type = 2 else - src << "You are not THE LAW, pal." + to_chat(src, "You are not THE LAW, pal.") + if("halt") if (istype(module,/obj/item/weapon/robot_module/security)) @@ -152,7 +153,8 @@ playsound(src.loc, 'sound/voice/halt.ogg', 50, 0) m_type = 2 else - src << "You are not security." + to_chat(src, "You are not security.") + if ("flip") m_type = 1 @@ -160,6 +162,7 @@ src.SpinAnimation(5,1) if ("help") - src << "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt" + to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt") + ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 0ac9da63052..d664fae834c 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -44,5 +44,6 @@ pose = addtext(pose,".") //Makes sure all emotes end with a period. msg += "\nIt is [pose]" - user << msg + to_chat(user, msg) + user.showLaws(src) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index bd22309007d..30c29527128 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -43,14 +43,16 @@ if(!(locate(O) in src.module.modules) && O != src.module.emag) return if(activated(O)) - src << "Already activated" + to_chat(src, "Already activated") + return if (is_component_functioning("power cell") && cell) if(istype(O, /obj/item/borg)) var/obj/item/borg/B = O if(B.powerneeded) if((cell.charge * 100 / cell.maxcharge) < B.powerneeded) - src << "Not enough power to activate [B.name]!" + to_chat(src, "Not enough power to activate [B.name]!") + return if(!module_state_1) O.mouse_opacity = initial(O.mouse_opacity) @@ -77,7 +79,8 @@ if(istype(module_state_3,/obj/item/borg/sight)) sight_mode |= module_state_3:sight_mode else - src << "You need to disable a module first!" + to_chat(src, "You need to disable a module first!") + src.update_icons() /mob/living/silicon/robot/proc/uneq_active() diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index 2dc3b4e3916..394e7f79bde 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -14,30 +14,39 @@ if(lawupdate) if (connected_ai) if(connected_ai.stat || connected_ai.control_disabled) - src << "AI signal lost, unable to sync laws." + to_chat(src, "AI signal lost, unable to sync laws.") + else lawsync() photosync() - src << "Laws synced with AI, be sure to note any changes." + to_chat(src, "Laws synced with AI, be sure to note any changes.") + // TODO: Update to new antagonist system. if(mind && mind.special_role == "traitor" && mind.original == src) - src << "Remember, your AI does NOT share or know about your law 0." + to_chat(src, "Remember, your AI does NOT share or know about your law 0.") + else - src << "No AI selected to sync laws with, disabling lawsync protocol." + to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.") + lawupdate = 0 - who << "Obey these laws:" + to_chat(who, "Obey these laws:") + laws.show_laws(who) // TODO: Update to new antagonist system. if (mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai) - who << "Remember, [connected_ai.name] is technically your master, but your objective comes first." + to_chat(who, "Remember, [connected_ai.name] is technically your master, but your objective comes first.") + else if (connected_ai) - who << "Remember, [connected_ai.name] is your master, other AIs can be ignored." + to_chat(who, "Remember, [connected_ai.name] is your master, other AIs can be ignored.") + else if (emagged) - who << "Remember, you are not required to listen to the AI." + to_chat(who, "Remember, you are not required to listen to the AI.") + else - who << "Remember, you are not bound to any AI, you are not required to listen to them." + to_chat(who, "Remember, you are not bound to any AI, you are not required to listen to them.") + /mob/living/silicon/robot/lawsync() diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index a753ce862cf..010ffb676d7 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -29,7 +29,8 @@ for(var/obj/item/borg/B in get_all_slots()) if(B.powerneeded) if((cell.charge * 100 / cell.maxcharge) < B.powerneeded) - src << "Deactivating [B.name] due to lack of power!" + to_chat(src, "Deactivating [B.name] due to lack of power!") + uneq_module(B) if(cell.charge <= 0) uneq_all() @@ -102,15 +103,18 @@ if(!istype(src, /mob/living/silicon/robot/drone)) if(health < 50) //Gradual break down of modules as more damage is sustained if(uneq_module(module_state_3)) - src << "SYSTEM ERROR: Module 3 OFFLINE." + to_chat(src, "SYSTEM ERROR: Module 3 OFFLINE.") + if(health < 0) if(uneq_module(module_state_2)) - src << "SYSTEM ERROR: Module 2 OFFLINE." + to_chat(src, "SYSTEM ERROR: Module 2 OFFLINE.") + if(health < -50) if(uneq_module(module_state_1)) - src << "CRITICAL ERROR: All modules OFFLINE." + to_chat(src, "CRITICAL ERROR: All modules OFFLINE.") + if(paralysis || stunned || weakened) stat = UNCONSCIOUS @@ -277,7 +281,8 @@ weaponlock_time -- if(weaponlock_time <= 0) if(src.client) - src << "\red Weapon Lock Timed Out!" + to_chat(src, "\red Weapon Lock Timed Out!") + weapon_lock = 0 weaponlock_time = 120 diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm index fbcc3bf4842..6fdee77418c 100644 --- a/code/modules/mob/living/silicon/robot/photos.dm +++ b/code/modules/mob/living/silicon/robot/photos.dm @@ -10,4 +10,5 @@ aiCamera.printpicture(null, z) synced = 1 if(synced) - src << "Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI." + to_chat(src, "Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI.") + diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b887de3857e..236b5f3316e 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -247,7 +247,8 @@ var/list/robot_verbs_default = list( mind.transfer_to(mmi.brainmob) mmi.update_icon() else - 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, "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() error("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].") mmi = null @@ -266,7 +267,8 @@ var/list/robot_verbs_default = list( return var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security") if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis) - src << "\red Crisis mode active. Combat module available." + to_chat(src, "\red Crisis mode active. Combat module available.") + modules+="Combat" if(ticker && ticker.mode && ticker.mode.name == "nations") var/datum/game_mode/nations/N = ticker.mode @@ -417,7 +419,8 @@ var/list/robot_verbs_default = list( set name = "Self Diagnosis" if(!is_component_functioning("diagnosis unit")) - src << "\red Your self-diagnosis component isn't functioning." + to_chat(src, "\red Your self-diagnosis component isn't functioning.") + var/dat = self_diagnosis() src << browse(dat, "window=robotdiagnosis") @@ -442,10 +445,12 @@ var/list/robot_verbs_default = list( var/datum/robot_component/C = components[toggle] if(C.toggled) C.toggled = 0 - src << "\red You disable [C.name]." + to_chat(src, "\red You disable [C.name].") + else C.toggled = 1 - src << "\red You enable [C.name]." + to_chat(src, "\red You enable [C.name].") + /mob/living/silicon/robot/proc/sensor_mode() set name = "Set Sensor Augmentation" @@ -553,7 +558,8 @@ var/list/robot_verbs_default = list( var/mob/tmob = AM if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(20)) - usr << "\red You fail to push [tmob]'s fat ass out of the way." + to_chat(usr, "\red You fail to push [tmob]'s fat ass out of the way.") + now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -595,7 +601,8 @@ var/list/robot_verbs_default = list( C.brute_damage = WC.brute C.electronics_damage = WC.burn - usr << "\blue You install the [W.name]." + to_chat(usr, "\blue You install the [W.name].") + return @@ -603,7 +610,8 @@ var/list/robot_verbs_default = list( if(W == module_active) return if (!getBruteLoss()) - user << "Nothing to fix!" + to_chat(user, "Nothing to fix!") + return var/obj/item/weapon/weldingtool/WT = W user.changeNext_move(CLICK_CD_MELEE) @@ -614,13 +622,15 @@ var/list/robot_verbs_default = list( add_fingerprint(user) user.visible_message("\The [user] patches some dents on \the [src] with \the [WT].") else - user << "Need more welding fuel!" + to_chat(user, "Need more welding fuel!") + return else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) if (!getFireLoss()) - user << "Nothing to fix!" + to_chat(user, "Nothing to fix!") + return var/obj/item/stack/cable_coil/coil = W adjustFireLoss(-30) @@ -632,18 +642,22 @@ var/list/robot_verbs_default = list( else if (istype(W, /obj/item/weapon/crowbar)) // crowbar means open or close the cover if(opened) if(cell) - user << "You close the cover." + to_chat(user, "You close the cover.") + opened = 0 update_icons() else if(wiresexposed && wires.IsAllCut()) //Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob. if(!mmi) - user << "\The [src] has no brain to remove." + to_chat(user, "\The [src] has no brain to remove.") + return - user << "You jam the crowbar into the robot and begin levering [mmi]." + to_chat(user, "You jam the crowbar into the robot and begin levering [mmi].") + if(do_after(user,3 SECONDS, target = src)) - user << "You damage some parts of the chassis, but eventually manage to rip out [mmi]!" + to_chat(user, "You damage some parts of the chassis, but eventually manage to rip out [mmi]!") + var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc) C.l_leg = new/obj/item/robot_parts/l_leg(C) C.r_leg = new/obj/item/robot_parts/r_leg(C) @@ -669,7 +683,8 @@ var/list/robot_verbs_default = list( return var/datum/robot_component/C = components[remove] var/obj/item/robot_parts/robot_component/I = C.wrapped - user << "You remove \the [I]." + to_chat(user, "You remove \the [I].") + if(istype(I)) I.brute = C.brute_damage I.burn = C.electronics_damage @@ -682,23 +697,28 @@ var/list/robot_verbs_default = list( else if(locked) - user << "The cover is locked and cannot be opened." + to_chat(user, "The cover is locked and cannot be opened.") + else - user << "You open the cover." + to_chat(user, "You open the cover.") + opened = 1 update_icons() else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside var/datum/robot_component/C = components["power cell"] if(wiresexposed) - user << "Close the panel first." + to_chat(user, "Close the panel first.") + else if(cell) - user << "There is a power cell already installed." + to_chat(user, "There is a power cell already installed.") + else user.drop_item() W.loc = src cell = W - user << "You insert the power cell." + to_chat(user, "You insert the power cell.") + C.installed = 1 C.wrapped = W @@ -712,55 +732,68 @@ var/list/robot_verbs_default = list( if (wiresexposed) wires.Interact(user) else - user << "You can't reach the wiring." + to_chat(user, "You can't reach the wiring.") + else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing wiresexposed = !wiresexposed - user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" + to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") + update_icons() else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell) // radio if(radio) radio.attackby(W,user)//Push it to the radio to let it handle everything else - user << "Unable to locate a radio." + to_chat(user, "Unable to locate a radio.") + update_icons() else if(istype(W, /obj/item/device/encryptionkey/) && opened) if(radio)//sanityyyyyy radio.attackby(W,user)//GTFO, you have your own procs else - user << "Unable to locate a radio." + to_chat(user, "Unable to locate a radio.") + else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card if(emagged)//still allow them to open the cover - user << "The interface seems slightly damaged" + to_chat(user, "The interface seems slightly damaged") + if(opened) - user << "You must close the cover to swipe an ID card." + to_chat(user, "You must close the cover to swipe an ID card.") + else if(allowed(usr)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] [src]'s interface." + to_chat(user, "You [ locked ? "lock" : "unlock"] [src]'s interface.") + update_icons() else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + else if(istype(W, /obj/item/borg/upgrade/)) var/obj/item/borg/upgrade/U = W if(!opened) - user << "You must access the borgs internals!" + to_chat(user, "You must access the borgs internals!") + else if(!src.module && U.require_module) - user << "The borg must choose a module before it can be upgraded!" + to_chat(user, "The borg must choose a module before it can be upgraded!") + else if(U.locked) - user << "The upgrade is locked and cannot be used yet!" + to_chat(user, "The upgrade is locked and cannot be used yet!") + else if(!user.drop_item()) return if(U.action(src)) - user << "You apply the upgrade to [src]." + to_chat(user, "You apply the upgrade to [src].") + U.forceMove(src) else - user << "Upgrade error." + to_chat(user, "Upgrade error.") + else spark_system.start() @@ -772,16 +805,19 @@ var/list/robot_verbs_default = list( var/mob/living/M = user if(!opened)//Cover is closed if(locked) - user << "You emag the cover lock." + to_chat(user, "You emag the cover lock.") + locked = 0 else - user << "The cover is already unlocked." + to_chat(user, "The cover is already unlocked.") + return if(opened)//Cover is open if(emagged) return//Prevents the X has hit Y with Z message also you cant emag them twice if(wiresexposed) - user << "You must close the panel first" + to_chat(user, "You must close the panel first") + return else sleep(6) @@ -789,7 +825,8 @@ var/list/robot_verbs_default = list( if(src.hud_used) src.hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open. disconnect_from_ai() - user << "You emag [src]'s interface." + to_chat(user, "You emag [src]'s interface.") + // message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") clear_supplied_laws() @@ -798,22 +835,31 @@ var/list/robot_verbs_default = list( var/time = time2text(world.realtime,"hh:mm:ss") lawchanges.Add("[time] : [M.name]([M.key]) emagged [name]([key])") set_zeroth_law("Only [M.real_name] and people he designates as being such are Syndicate Agents.") - src << "\red ALERT: Foreign software detected." + to_chat(src, "\red ALERT: Foreign software detected.") + sleep(5) - src << "\red Initiating diagnostics..." + to_chat(src, "\red Initiating diagnostics...") + sleep(20) - src << "\red SynBorg v1.7 loaded." + to_chat(src, "\red SynBorg v1.7 loaded.") + sleep(5) - src << "\red LAW SYNCHRONISATION ERROR" + to_chat(src, "\red LAW SYNCHRONISATION ERROR") + sleep(5) - src << "\red Would you like to send a report to NanoTraSoft? Y/N" + to_chat(src, "\red Would you like to send a report to NanoTraSoft? Y/N") + sleep(10) - src << "\red > N" + to_chat(src, "\red > N") + sleep(20) - src << "\red ERRORERRORERROR" - src << "Obey these laws:" + to_chat(src, "\red ERRORERRORERROR") + + to_chat(src, "Obey these laws:") + laws.show_laws(src) - src << "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands." + to_chat(src, "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands.") + if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner)) for(var/obj/item/weapon/pickaxe/drill/cyborg/D in src.module.modules) qdel(D) @@ -837,15 +883,18 @@ var/list/robot_verbs_default = list( if("Yes") locked = 0 update_icons() - usr << "You unlock your cover." + to_chat(usr, "You unlock your cover.") + /mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if (istype(loc, /turf) && istype(loc.loc, /area/start)) - M << "No attacking people at spawn, you jackass." + to_chat(M, "No attacking people at spawn, you jackass.") + return switch(M.a_intent) @@ -947,7 +996,8 @@ var/list/robot_verbs_default = list( cell.updateicon() cell.add_fingerprint(user) user.put_in_active_hand(cell) - user << "You remove \the [cell]." + to_chat(user, "You remove \the [cell].") + cell = null update_icons() diag_hud_set_borgcell() @@ -1032,7 +1082,8 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/proc/installed_modules() if(weapon_lock) - src << "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]" + to_chat(src, "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]") + return if(!module) @@ -1119,9 +1170,11 @@ var/list/robot_verbs_default = list( module_state_3 = null contents -= O else - src << "Module isn't activated." + to_chat(src, "Module isn't activated.") + else - src << "Module isn't activated" + to_chat(src, "Module isn't activated") + installed_modules() return 1 @@ -1132,19 +1185,22 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/proc/control_headlamp() if(stat || lamp_recharging) - src << "This function is currently offline." + to_chat(src, "This function is currently offline.") + return //Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0. lamp_intensity = (lamp_intensity+2) % (lamp_max+2) - src << "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]" + to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]") + update_headlamp() /mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100) set_light(0) if(lamp_intensity && (turn_off || stat)) - src << "Your headlamp has been deactivated." + to_chat(src, "Your headlamp has been deactivated.") + lamp_intensity = 0 lamp_recharging = 1 spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long. @@ -1200,7 +1256,8 @@ var/list/robot_verbs_default = list( cleaned_human.shoes.clean_blood() cleaned_human.update_inv_shoes(0,0) cleaned_human.clean_blood() - cleaned_human << "[src] cleans your face!" + to_chat(cleaned_human, "[src] cleans your face!") + return #undef BORG_CAMERA_BUFFER @@ -1238,7 +1295,8 @@ var/list/robot_verbs_default = list( if(R) R.UnlinkSelf() - R << "Buffers flushed and reset. Camera system shutdown. All systems operational." + to_chat(R, "Buffers flushed and reset. Camera system shutdown. All systems operational.") + src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes /mob/living/silicon/robot/mode() @@ -1282,7 +1340,8 @@ var/list/robot_verbs_default = list( update_module_icon() lockcharge = null else - src << "Something is badly wrong with the sprite selection. Harass a coder." + to_chat(src, "Something is badly wrong with the sprite selection. Harass a coder.") + icon_state = module_sprites[1] lockcharge = null return @@ -1298,18 +1357,22 @@ var/list/robot_verbs_default = list( triesleft = 0 return else - src << "Your icon has been set. You now require a module reset to change it." + to_chat(src, "Your icon has been set. You now require a module reset to change it.") + /mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname) if(!connected_ai) return switch(notifytype) if(1) //New Cyborg - connected_ai << "

NOTICE - New cyborg connection detected: [name]
" + to_chat(connected_ai, "

NOTICE - New cyborg connection detected: [name]
") + if(2) //New Module - connected_ai << "

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

NOTICE - Cyborg module change detected: [name] has loaded the [designation] module.
") + if(3) //New Name - connected_ai << "

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

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
") + /mob/living/silicon/robot/proc/disconnect_from_ai() if(connected_ai) @@ -1362,7 +1425,8 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/deathsquad/attack_hand(mob/user) if(isnull(ckey) && !searching_for_ckey) searching_for_ckey = 1 - user << "Now checking for possible borgs." + to_chat(user, "Now checking for possible borgs.") + var/list/borg_candidates = pollCandidates("Do you want to play as a Nanotrasen Combat borg?") if(borg_candidates.len > 0 && isnull(ckey)) searching_for_ckey = 0 @@ -1374,10 +1438,12 @@ var/list/robot_verbs_default = list( key = M.key else searching_for_ckey = 0 - user << "Unable to connect to Central Command. Please wait and try again later." + to_chat(user, "Unable to connect to Central Command. Please wait and try again later.") + return else - user << "[src] is already checking for possible borgs." + to_chat(user, "[src] is already checking for possible borgs.") + return /mob/living/silicon/robot/syndicate @@ -1410,7 +1476,8 @@ var/list/robot_verbs_default = list( spawn(5) if(playstyle_string) - src << playstyle_string + to_chat(src, playstyle_string) + playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index a8bd77155fa..7b52c10f96a 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -8,8 +8,10 @@ update_revive() var/mob/dead/observer/ghost = get_ghost() if(ghost) - ghost << "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)") + + to_chat(ghost, sound('sound/effects/genetics.ogg')) + return @@ -90,11 +92,13 @@ cell.charge -= cost if(cell.charge <= 0) cell.charge = 0 - src << "\red Your shield has overloaded!" + to_chat(src, "\red Your shield has overloaded!") + else brute -= absorb_brute burn -= absorb_burn - src << "\red Your shield absorbs some of the impact!" + to_chat(src, "\red Your shield absorbs some of the impact!") + var/datum/robot_component/armour/A = get_armour() if(A) @@ -141,11 +145,13 @@ cell.charge -= cost if(cell.charge <= 0) cell.charge = 0 - src << "\red Your shield has overloaded!" + to_chat(src, "\red Your shield has overloaded!") + else brute -= absorb_brute burn -= absorb_burn - src << "\red Your shield absorbs some of the impact!" + to_chat(src, "\red Your shield absorbs some of the impact!") + var/datum/robot_component/armour/A = get_armour() if(A) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 965503cb288..7ef838c4a18 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -21,7 +21,8 @@ mode = 2 else mode = 1 - user << "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'" + to_chat(user, "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'") + playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) return diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index bcbcb1632f4..956e5927fcc 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -8,7 +8,8 @@ return 1 if(message_mode) if(!is_component_functioning("radio")) - src << "Your radio isn't functional at this time." + to_chat(src, "Your radio isn't functional at this time.") + return 0 if(message_mode == "general") message_mode = null @@ -21,7 +22,8 @@ return holopad_talk(message, verb, speaking) else if(message_mode) if (aiRadio.disabledAi || aiRestorePowerRoutine || stat) - src << "System Error - Transceiver Disabled." + to_chat(src, "System Error - Transceiver Disabled.") + return 0 if(message_mode == "general") message_mode = null @@ -82,11 +84,15 @@ if(speaking) rendered_a = "[name] [speaking.format_message(message, verb)]" rendered_b = "[voice_name] [speaking.format_message(message_stars, verb)]" - src << "Holopad transmitted, [real_name] [speaking.format_message(message, verb)]"//The AI can "hear" its own message. + to_chat(src, "Holopad transmitted, [real_name] [speaking.format_message(message, verb)]")//The AI can "hear" its own message. + + else rendered_a = "[name] [verb], \"[message]\"" rendered_b = "[voice_name] [verb], \"[message_stars]\"" - src << "Holopad transmitted, [real_name] [verb], \"[message]\""//The AI can "hear" its own message. + to_chat(src, "Holopad transmitted, [real_name] [verb], \"[message]\"")//The AI can "hear" its own message. + + for(var/mob/M in hearers(T.loc))//The location is the object, default distance. if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to. @@ -96,7 +102,8 @@ /*Radios "filter out" this conversation channel so we don't need to account for them. This is another way of saying that we won't bother dealing with them.*/ else - src << "No holopad connected." + to_chat(src, "No holopad connected.") + return return 1 @@ -112,12 +119,14 @@ var/obj/machinery/hologram/holopad/T = src.holo if(T && T.hologram && T.master == src) var/rendered = "[name] [message]" - src << "Holopad action relayed, [real_name] [message]" + to_chat(src, "Holopad action relayed, [real_name] [message]") + for(var/mob/M in viewers(T.loc)) M.show_message(rendered, 2) else //This shouldn't occur, but better safe then sorry. - src << "No holopad connected." + to_chat(src, "No holopad connected.") + return return 1 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index c76b159e452..f7813d04b45 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -74,8 +74,10 @@ src.take_organ_damage(10) Stun(3) flash_eyes(affect_silicon = 1) - src << "\red *BZZZT*" - src << "\red Warning: Electromagnetic pulse detected." + to_chat(src, "\red *BZZZT*") + + to_chat(src, "\red Warning: Electromagnetic pulse detected.") + ..() @@ -84,7 +86,8 @@ /mob/living/silicon/can_inject(var/mob/user, var/error_msg) if(error_msg) - user << "Their outer shell is too tough." + to_chat(user, "Their outer shell is too tough.") + return 0 /mob/living/silicon/IsAdvancedToolUser() @@ -279,15 +282,19 @@ switch(sensor_type) if ("Security") add_sec_hud() - src << "Security records overlay enabled." + to_chat(src, "Security records overlay enabled.") + if ("Medical") add_med_hud() - src << "Life signs monitor overlay enabled." + to_chat(src, "Life signs monitor overlay enabled.") + if ("Diagnostic") add_diag_hud() - src << "Robotics diagnostic overlay enabled." + to_chat(src, "Robotics diagnostic overlay enabled.") + if ("Disable") - src << "Sensor augmentations disabled." + to_chat(src, "Sensor augmentations disabled.") + /mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised) if(!next_alarm_notice) @@ -317,7 +324,8 @@ if(alarms[A] == 1) if(!reported) reported = 1 - src << "--- [AH.category] Detected ---" + to_chat(src, "--- [AH.category] Detected ---") + raised_alarm(A) for(var/datum/alarm_handler/AH in queued_alarms) @@ -327,24 +335,29 @@ if(alarms[A] == -1) if(!reported) reported = 1 - src << "--- [AH.category] Cleared ---" - src << "\The [A.alarm_name()]." + to_chat(src, "--- [AH.category] Cleared ---") + + to_chat(src, "\The [A.alarm_name()].") + if(alarm_raised) - src << "\[Show Alerts\]" + to_chat(src, "\[Show Alerts\]") + for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] alarms.Cut() /mob/living/silicon/proc/raised_alarm(var/datum/alarm/A) - src << "[A.alarm_name()]!" + to_chat(src, "[A.alarm_name()]!") + /mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) var/cameratext = "" for(var/obj/machinery/camera/C in A.cameras()) cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" - src << "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])" + to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])") + /mob/living/silicon/adjustToxLoss(var/amount) return diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index 687041617be..438c60528e8 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -44,7 +44,8 @@ if( prob(sting_prob) && (M.stat == CONSCIOUS || (M.stat == UNCONSCIOUS && prob(25))) ) // Try to sting! If you're not moving, think about stinging. M.apply_damage(min(strength,2)+mut, BRUTE, sharp=1) // Stinging. The more mutated I am, the harder I sting. M.apply_damage((round(feral/10,1)*(max((round(strength/20,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me! - M << "\red You have been stung!" + to_chat(M, "\red You have been stung!") + //if we're chasing someone, get a little bit angry if(target_mob && prob(10)) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index c338bb22e7f..89075e51173 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -177,7 +177,8 @@ if(locked) //First emag application unlocks the bot's interface. Apply a screwdriver to use the emag again. locked = 0 emagged = 1 - user << "You bypass [src]'s controls." + to_chat(user, "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 @@ -185,22 +186,27 @@ locked = 1 //Access denied forever! bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. - src << "(#$*#$^^( OVERRIDE DETECTED" + to_chat(src, "(#$*#$^^( OVERRIDE DETECTED") + show_laws() add_logs(user, src, "emagged") return else //Bot is unlocked, but the maint panel has not been opened with a screwdriver yet. - user << "You need to open maintenance panel first!" + to_chat(user, "You need to open maintenance panel first!") + /mob/living/simple_animal/bot/examine(mob/user) ..() if(health < maxHealth) if(health > maxHealth/3) - user << "[src]'s parts look loose." + to_chat(user, "[src]'s parts look loose.") + else - user << "[src]'s parts look very loose!" + to_chat(user, "[src]'s parts look very loose!") + else - user << "[src] is in pristine condition." + to_chat(user, "[src] is in pristine condition.") + /mob/living/simple_animal/bot/adjustBruteLoss(amount) . = ..() @@ -262,7 +268,8 @@ if(!topic_denied(user)) interact(user) else - user << "[src]'s interface is not responding!" + to_chat(user, "[src]'s interface is not responding!") + /mob/living/simple_animal/bot/proc/interact(mob/user) show_controls(user) @@ -271,23 +278,30 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(!locked) open = !open - user << "The maintenance panel is now [open ? "opened" : "closed"]." + to_chat(user, "The maintenance panel is now [open ? "opened" : "closed"].") + else - user << "The maintenance panel is locked." + to_chat(user, "The maintenance panel is locked.") + else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(bot_core.allowed(user) && !open && !emagged) locked = !locked - user << "Controls are now [locked ? "locked." : "unlocked."]" + to_chat(user, "Controls are now [locked ? "locked." : "unlocked."]") + else if(emagged) - user << "ERROR" + to_chat(user, "ERROR") + if(open) - user << "Please close the access panel before locking it." + to_chat(user, "Please close the access panel before locking it.") + else - user << "Access denied." + to_chat(user, "Access denied.") + else if(istype(W, /obj/item/device/paicard)) if(paicard) - user << "A [paicard] is already inserted!" + to_chat(user, "A [paicard] is already inserted!") + else if(allow_pai && !key) if(!locked && !open) var/obj/item/device/paicard/card = W @@ -298,22 +312,28 @@ paicard = card user.visible_message("[user] inserts [W] into [src]!","You insert [W] into [src].") paicard.pai.mind.transfer_to(src) - src << "You sense your form change as you are uploaded into [src]." + to_chat(src, "You sense your form change as you are uploaded into [src].") + bot_name = name name = paicard.pai.name faction = user.faction add_logs(user, paicard.pai, "uploaded to [src.bot_name],") else - user << "[W] is inactive." + to_chat(user, "[W] is inactive.") + else - user << "The personality slot is locked." + to_chat(user, "The personality slot is locked.") + else - user << "[src] is not compatible with [W]" + to_chat(user, "[src] is not compatible with [W]") + else if(istype(W, /obj/item/weapon/hemostat) && paicard) if(open) - user << "Close the access panel before manipulating the personality slot!" + to_chat(user, "Close the access panel before manipulating the personality slot!") + else - user << "You attempt to pull [paicard] free..." + to_chat(user, "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].") @@ -322,10 +342,12 @@ user.changeNext_move(CLICK_CD_MELEE) if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") if(health >= maxHealth) - user << "[src] does not need a repair!" + to_chat(user, "[src] does not need a repair!") + return if(!open) - user << "Unable to repair with the maintenance panel closed!" + to_chat(user, "Unable to repair with the maintenance panel closed!") + return var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) @@ -335,7 +357,8 @@ add_fingerprint(user) user.visible_message("[user] repairs [src]!","You repair [src].") else - user << "The welder must be on for this task!" + to_chat(user, "The welder must be on for this task!") + else if(W.force) //if force is non-zero var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -499,13 +522,15 @@ Pass a positive integer as an argument to override a bot's default speed. turn_on() //Saves the AI the hassle of having to activate a bot manually. access_card = all_access //Give the bot all-access while under the AI's command. if(message) - calling_ai << "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination." + to_chat(calling_ai, "\icon[src] [name] called to [end_area.name]. [path.len-1] meters to destination.") + pathset = 1 mode = BOT_RESPONDING tries = 0 else if(message) - calling_ai << "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range." + to_chat(calling_ai, "Failed to calculate a valid route. Ensure destination is clear of obstructions and within range.") + calling_ai = null path = list() @@ -514,13 +539,15 @@ 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) - calling_ai << "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[src] failed to reach waypoint."]" + to_chat(calling_ai, "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[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. - calling_ai << "Call command to a bot has been reset." + to_chat(calling_ai, "Call command to a bot has been reset.") + calling_ai = null path = list() summon_target = null @@ -646,17 +673,22 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/bot_control_message(command, mob/user, user_turf) switch(command) if("stop") - src << "STOP PATROL" + to_chat(src, "STOP PATROL") + if("go") - src << "START PATROL" + to_chat(src, "START PATROL") + if("summon") var/area/a = get_area(user_turf) - src << "PRIORITY ALERT: [user] in [a.name]!" + to_chat(src, "PRIORITY ALERT: [user] in [a.name]!") + if("home") - src << "RETURN HOME!" + to_chat(src, "RETURN HOME!") + if("ejectpai") else - src << "Unidentified control sequence recieved: [command]" + to_chat(src, "Unidentified control sequence recieved: [command]") + /obj/machinery/bot_core/receive_signal(datum/signal/signal) owner.receive_signal(signal) @@ -806,7 +838,8 @@ Pass a positive integer as an argument to override a bot's default speed. return 1 if(topic_denied(usr)) - usr << "[src]'s interface is not responding!" + to_chat(usr, "[src]'s interface is not responding!") + return 1 add_fingerprint(usr) @@ -827,20 +860,24 @@ Pass a positive integer as an argument to override a bot's default speed. emagged = 2 hacked = 1 locked = 1 - usr << "[text_hack]" + to_chat(usr, "[text_hack]") + show_laws() bot_reset() else if(!hacked) - usr << "[text_dehack_fail]" + to_chat(usr, "[text_dehack_fail]") + else emagged = 0 hacked = 0 - usr << "[text_dehack]" + to_chat(usr, "[text_dehack]") + show_laws() bot_reset() if("ejectpai") if(paicard && (!locked || issilicon(usr) || check_rights(R_ADMIN, 0, usr))) - usr << "You eject [paicard] from [bot_name]" + to_chat(usr, "You eject [paicard] from [bot_name]") + ejectpai(usr) update_controls() @@ -913,7 +950,8 @@ Pass a positive integer as an argument to override a bot's default speed. else add_logs(src, paicard.pai, "ejected") if(announce) - paicard.pai << "You feel your control fade as [paicard] ejects from [bot_name]." + to_chat(paicard.pai, "You feel your control fade as [paicard] ejects from [bot_name].") + paicard = null name = bot_name faction = initial(faction) @@ -951,20 +989,30 @@ Pass a positive integer as an argument to override a bot's default speed. set name = "Show Directives" set category = "IC" - src << "Directives:" + to_chat(src, "Directives:") + if(paicard && paicard.pai && paicard.pai.master && paicard.pai.pai_law0) - src << "Your master, [paicard.pai.master], may overrule any and all laws." - src << "0. [paicard.pai.pai_law0]" + to_chat(src, "Your master, [paicard.pai.master], may overrule any and all laws.") + + to_chat(src, "0. [paicard.pai.pai_law0]") + if(emagged >= 2) - src << "1. #$!@#$32K#$" + to_chat(src, "1. #$!@#$32K#$") + else - src << "1. You are a machine built to serve the station's crew and AI(s)." - src << "2. Your function is to [bot_purpose]." - src << "3. You cannot serve your function if you are broken." - src << "4. Serve your function to the best of your ability." + to_chat(src, "1. You are a machine built to serve the station's crew and AI(s).") + + to_chat(src, "2. Your function is to [bot_purpose].") + + to_chat(src, "3. You cannot serve your function if you are broken.") + + to_chat(src, "4. Serve your function to the best of your ability.") + if(paicard && paicard.pai && paicard.pai.pai_laws) - src << "Supplemental Directive(s):" - src << "[paicard.pai.pai_laws]" + to_chat(src, "Supplemental Directive(s):") + + to_chat(src, "[paicard.pai.pai_laws]") + /mob/living/simple_animal/bot/get_access() . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 994515a0eec..ddea9e7bbf6 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -61,14 +61,18 @@ if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(bot_core.allowed(user) && !open && !emagged) locked = !locked - user << "You [ locked ? "lock" : "unlock"] \the [src] behaviour controls." + to_chat(user, "You [ locked ? "lock" : "unlock"] \the [src] behaviour controls.") + else if(emagged) - user << "ERROR" + to_chat(user, "ERROR") + if(open) - user << "Please close the access panel before locking it." + to_chat(user, "Please close the access panel before locking it.") + else - user << "\The [src] doesn't seem to respect your authority." + to_chat(user, "\The [src] doesn't seem to respect your authority.") + else return ..() @@ -76,7 +80,8 @@ ..() if(emagged == 2) if(user) - user << "[src] buzzes and beeps." + to_chat(user, "[src] buzzes and beeps.") + /mob/living/simple_animal/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D) for(var/T in target_types) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index e5bbdcf1852..c7d62d6e4cf 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -22,7 +22,8 @@ var/turf/T = get_turf(loc) var/mob/living/simple_animal/bot/cleanbot/A = new /mob/living/simple_animal/bot/cleanbot(T) A.name = created_name - user << "You add the robot arm to the bucket and sensor assembly. Beep boop!" + to_chat(user, "You add the robot arm to the bucket and sensor assembly. Beep boop!") + user.unEquip(src, 1) qdel(src) @@ -65,7 +66,8 @@ return qdel(W) build_step++ - user << "You add the robot leg to [src]." + to_chat(user, "You add the robot leg to [src].") + name = "legs/frame assembly" if(build_step == 1) item_state = "ed209_leg" @@ -86,7 +88,8 @@ lasercolor = newcolor qdel(W) build_step++ - user << "You add the armor to [src]." + to_chat(user, "You add the armor to [src].") + name = "vest/legs/frame assembly" item_state = "[lasercolor]ed209_shell" icon_state = "[lasercolor]ed209_shell" @@ -97,7 +100,8 @@ if(WT.remove_fuel(0,user)) build_step++ name = "shielded frame assembly" - user << "You weld the vest to [src]." + to_chat(user, "You weld the vest to [src].") + if(4) switch(lasercolor) if("b") @@ -116,7 +120,8 @@ return qdel(W) build_step++ - user << "You add the helmet to [src]." + to_chat(user, "You add the helmet to [src].") + name = "covered and shielded frame assembly" item_state = "[lasercolor]ed209_hat" icon_state = "[lasercolor]ed209_hat" @@ -127,7 +132,8 @@ return qdel(W) build_step++ - user << "You add the prox sensor to [src]." + to_chat(user, "You add the prox sensor to [src].") + name = "covered, shielded and sensored frame assembly" item_state = "[lasercolor]ed209_prox" icon_state = "[lasercolor]ed209_prox" @@ -136,14 +142,17 @@ if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W if(coil.get_amount() < 1) - user << "You need one length of cable to wire the ED-209!" + to_chat(user, "You need one length of cable to wire the ED-209!") + return - user << "You start to wire [src]..." + to_chat(user, "You start to wire [src]...") + if(do_after(user, 40, target = src)) if(coil.get_amount() >= 1 && build_step == 6) coil.use(1) build_step = 7 - user << "You wire the ED-209 assembly." + to_chat(user, "You wire the ED-209 assembly.") + name = "wired ED-209 assembly" if(7) @@ -167,7 +176,8 @@ return name = newname build_step++ - user << "You add [W] to [src]." + to_chat(user, "You add [W] to [src].") + item_state = "[lasercolor]ed209_taser" icon_state = "[lasercolor]ed209_taser" qdel(W) @@ -175,18 +185,21 @@ if(8) if(istype(W, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) - user << "You start attaching the gun to the frame..." + to_chat(user, "You start attaching the gun to the frame...") + if(do_after(user, 40, target = src)) build_step++ name = "armed [name]" - user << "Taser gun attached." + to_chat(user, "Taser gun attached.") + if(9) if(istype(W, /obj/item/weapon/stock_parts/cell)) if(!user.unEquip(W)) return build_step++ - user << "You complete the ED-209." + to_chat(user, "You complete the ED-209.") + var/turf/T = get_turf(src) new /mob/living/simple_animal/bot/ed209(T,created_name,lasercolor) qdel(W) @@ -223,18 +236,21 @@ ..() return if(contents.len >= 1) - user << "They won't fit in, as there is already stuff inside." + to_chat(user, "They won't fit in, as there is already stuff inside.") + return if(T.use(10)) if(user.s_active) user.s_active.close(user) var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles user.put_in_hands(B) - user << "You add the tiles into the empty toolbox. They protrude from the top." + to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") + user.unEquip(src, 1) qdel(src) else - user << "You need 10 floor tiles to start building a floorbot." + to_chat(user, "You need 10 floor tiles to start building a floorbot.") + return /obj/item/weapon/toolbox_tiles/attackby(obj/item/W, mob/user, params) @@ -244,7 +260,8 @@ var/obj/item/weapon/toolbox_tiles_sensor/B = new /obj/item/weapon/toolbox_tiles_sensor() B.created_name = created_name user.put_in_hands(B) - user << "You add the sensor to the toolbox and tiles." + to_chat(user, "You add the sensor to the toolbox and tiles.") + user.unEquip(src, 1) qdel(src) @@ -264,7 +281,8 @@ var/turf/T = get_turf(user.loc) var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T) A.name = created_name - user << "You add the robot arm to the odd looking toolbox assembly. Boop beep!" + to_chat(user, "You add the robot arm to the odd looking toolbox assembly. Boop beep!") + user.unEquip(src, 1) qdel(src) else if(istype(W, /obj/item/weapon/pen)) @@ -307,7 +325,8 @@ //Making a medibot! if(contents.len >= 1) - user << "You need to empty [src] out first!" + to_chat(user, "You need to empty [src] out first!") + return var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly @@ -335,7 +354,8 @@ qdel(S) user.put_in_hands(A) - user << "You add the robot arm to the first aid kit." + to_chat(user, "You add the robot arm to the first aid kit.") + user.unEquip(src, 1) qdel(src) @@ -357,7 +377,8 @@ return qdel(W) build_step++ - user << "You add the health sensor to [src]." + to_chat(user, "You add the health sensor to [src].") + name = "First aid/robot arm/health analyzer assembly" overlays += image('icons/obj/aibots.dmi', "na_scanner") @@ -367,7 +388,8 @@ return qdel(W) build_step++ - user << "You complete the Medibot. Beep boop!" + to_chat(user, "You complete the Medibot. Beep boop!") + var/turf/T = get_turf(src) var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T) S.skin = skin @@ -401,7 +423,8 @@ qdel(S) var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly user.put_in_hands(A) - user << "You add the signaler to the helmet." + to_chat(user, "You add the signaler to the helmet.") + user.unEquip(src, 1) qdel(src) else @@ -415,19 +438,22 @@ if(WT.remove_fuel(0, user)) build_step++ overlays += "hs_hole" - user << "You weld a hole in [src]!" + to_chat(user, "You weld a hole in [src]!") + else if(build_step == 1) var/obj/item/weapon/weldingtool/WT = I if(WT.remove_fuel(0, user)) build_step-- overlays -= "hs_hole" - user << "You weld the hole in [src] shut!" + to_chat(user, "You weld the hole in [src] shut!") + else if(isprox(I) && (build_step == 1)) if(!user.unEquip(I)) return build_step++ - user << "You add the prox sensor to [src]!" + to_chat(user, "You add the prox sensor to [src]!") + overlays += "hs_eye" name = "helmet/signaler/prox sensor assembly" qdel(I) @@ -436,7 +462,8 @@ if(!user.unEquip(I)) return build_step++ - user << "You add the robot arm to [src]!" + to_chat(user, "You add the robot arm to [src]!") + name = "helmet/signaler/prox sensor/robot arm assembly" overlays += "hs_arm" qdel(I) @@ -445,7 +472,8 @@ if(!user.unEquip(I)) return build_step++ - user << "You complete the Securitron! Beep boop." + to_chat(user, "You complete the Securitron! Beep boop.") + var/mob/living/simple_animal/bot/secbot/S = new /mob/living/simple_animal/bot/secbot S.forceMove(get_turf(src)) S.name = created_name @@ -464,17 +492,20 @@ if(!build_step) new /obj/item/device/assembly/signaler(get_turf(src)) new /obj/item/clothing/head/helmet(get_turf(src)) - user << "You disconnect the signaler from the helmet." + to_chat(user, "You disconnect the signaler from the helmet.") + qdel(src) else if(build_step == 2) overlays -= "hs_eye" new /obj/item/device/assembly/prox_sensor(get_turf(src)) - user << "You detach the proximity sensor from [src]." + to_chat(user, "You detach the proximity sensor from [src].") + build_step-- else if(build_step == 3) overlays -= "hs_arm" new /obj/item/robot_parts/l_arm(get_turf(src)) - user << "You remove the robot arm from [src]." + to_chat(user, "You remove the robot arm from [src].") + build_step-- \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 1e1117f110a..72b951138b6 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -177,7 +177,8 @@ Auto Patrol[]"}, ..() if(emagged == 2) if(user) - user << "You short out [src]'s target assessment circuits." + to_chat(user, "You short out [src]'s target assessment circuits.") + oldtarget_name = user.name audible_message("[src] buzzes oddly!") declare_arrests = 0 diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index c336cce0104..fd624d373bd 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -97,11 +97,13 @@ T.use(loaded) amount += loaded if(loaded > 0) - user << "You load [loaded] tiles into the floorbot. He now contains [amount] tiles." + to_chat(user, "You load [loaded] tiles into the floorbot. He now contains [amount] tiles.") + nagged = 0 update_icon() else - user << "You need at least one floor tile to put into [src]!" + to_chat(user, "You need at least one floor tile to put into [src]!") + else ..() @@ -109,7 +111,8 @@ ..() if(emagged == 2) if(user) - user << "[src] buzzes and beeps." + to_chat(user, "[src] buzzes and beeps.") + /mob/living/simple_animal/bot/floorbot/Topic(href, href_list) if(..()) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index 8dd060b6fda..eb1e5591f46 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -221,17 +221,20 @@ /mob/living/simple_animal/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/reagent_containers/glass)) if(locked) - user << "You cannot insert a beaker because the panel is locked!" + to_chat(user, "You cannot insert a beaker because the panel is locked!") + return if(!isnull(reagent_glass)) - user << "There is already a beaker loaded!" + to_chat(user, "There is already a beaker loaded!") + return if(!user.drop_item()) return W.forceMove(src) reagent_glass = W - user << "You insert [W]." + to_chat(user, "You insert [W].") + show_controls(user) return @@ -246,7 +249,8 @@ if(emagged == 2) declare_crit = 0 if(user) - user << "You short out [src]'s reagent synthesis circuits." + to_chat(user, "You short out [src]'s reagent synthesis circuits.") + audible_message("[src] buzzes oddly!") flick("medibot_spark", src) if(user) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index de778a5aeb3..be1a59d55f2 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -115,7 +115,8 @@ "You repair [src]!" ) else - user << "[src] does not need a repair!" + to_chat(user, "[src] does not need a repair!") + else if((istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters)) && open) return attack_hand(user) else if(load && ismob(load)) // chance to knock off rider @@ -124,7 +125,8 @@ user.visible_message("[user] knocks [load] off [src] with \the [I]!", "You knock [load] off [src] with \the [I]!") else - user << "You hit [src] with \the [I] but to no effect!" + to_chat(user, "You hit [src] with \the [I] but to no effect!") + ..() else ..() @@ -136,7 +138,8 @@ emagged = 1 if(!open) locked = !locked - user << "You [locked ? "lock" : "unlock"] the [src]'s controls!" + to_chat(user, "You [locked ? "lock" : "unlock"] the [src]'s controls!") + flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) @@ -185,7 +188,8 @@ turn_off() else if(cell && !open) if(!turn_on()) - usr << "You can't switch on [src]!" + to_chat(usr, "You can't switch on [src]!") + return else return @@ -249,7 +253,8 @@ update_controls() return 1 else - user << "Access denied." + to_chat(user, "Access denied.") + return 0 // TODO: remove this; PDAs currently depend on it @@ -474,7 +479,8 @@ return if(on) var/speed = (wires.Motor1() ? 1 : 0) + (wires.Motor2() ? 2 : 0) - //world << "speed: [speed]" +// to_chat(world, "speed: [speed]") + var/num_steps = 0 switch(speed) if(0) @@ -516,13 +522,15 @@ path -= next return if(istype(next, /turf/simulated)) - //world << "at ([x],[y]) moving to ([next.x],[next.y])" +// to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])") + var/oldloc = loc var/moved = step_towards(src, next) // attempt to move if(cell) cell.use(1) if(moved && oldloc!=loc) // successful move - //world << "Successful move." +// to_chat(world, "Successful move.") + blockcount = 0 path -= loc @@ -533,7 +541,8 @@ else // failed to move - //world << "Unable to move." +// to_chat(world, "Unable to move.") + blockcount++ mode = BOT_BLOCKED if(blockcount == 3) @@ -553,16 +562,19 @@ return else buzz(ANNOYED) - //world << "Bad turf." +// to_chat(world, "Bad turf.") + mode = BOT_NAV return else - //world << "No path." +// to_chat(world, "No path.") + mode = BOT_NAV return if(BOT_NAV) // calculate new path - //world << "Calc new path." +// to_chat(world, "Calc new path.") + mode = BOT_WAIT_FOR_NAV spawn(0) calc_path() @@ -639,7 +651,8 @@ 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) - calling_ai << "\icon[src] [src] wirelessly plays a chiming sound!" + to_chat(calling_ai, "\icon[src] [src] wirelessly plays a chiming sound!") + playsound(calling_ai, 'sound/machines/chime.ogg',40, 0) calling_ai = null radio_channel = "AI Private" //Report on AI Private instead if the AI is controlling us. @@ -726,14 +739,18 @@ switch(command) if("start") if(load) - src << "DELIVER [load] TO [destination]" + to_chat(src, "DELIVER [load] TO [destination]") + else - src << "PICK UP DELIVERY AT [destination]" + to_chat(src, "PICK UP DELIVERY AT [destination]") + if("unload") if(load) - src << "UNLOAD" + to_chat(src, "UNLOAD") + else - src << "LOAD" + to_chat(src, "LOAD") + if("autoret", "autopick", "target") else ..() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index f60ad0ebb48..002ed319ad6 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -183,7 +183,8 @@ Auto Patrol: []"}, ..() if(emagged == 2) if(user) - user << "You short out [src]'s target assessment circuits." + to_chat(user, "You short out [src]'s target assessment circuits.") + oldtarget_name = user.name audible_message("[src] buzzes oddly!") declare_arrests = 0 diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 989bbf09508..3b1e0020e0b 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -52,7 +52,8 @@ msg += "" msg += "*---------*" - user << msg + to_chat(user, msg) + /mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob) if(istype(M, /mob/living/simple_animal/construct/builder)) @@ -254,7 +255,8 @@ if (istype(usr,/mob/living/simple_animal/constructbehemoth)) if(usr.energy<300) - usr << "\red You do not have enough power stored!" + to_chat(usr, "\red You do not have enough power stored!") + return if(usr.stat) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index f51e3e81f65..4822fbe7cf1 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -68,10 +68,12 @@ //helmet and armor = 100% protection if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) if( O.force ) - user << "[src] is wearing too much armor! You can't cause \him any damage." + to_chat(user, "[src] is wearing too much armor! You can't cause \him any damage.") + visible_message(" [user] hits [src] with [O], however [src] is too armored.") else - user << "[src] is wearing too much armor! You can't reach \his skin." + to_chat(user, "[src] is wearing too much armor! You can't reach \his skin.") + visible_message("[user] gently taps [src] with [O].") if(health>0 && prob(15)) custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.") @@ -79,7 +81,8 @@ if (istype(O, /obj/item/weapon/razor)) if (shaved) - user << "You can't shave this corgi, it's already been shaved!" + to_chat(user, "You can't shave this corgi, it's already been shaved!") + return user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") if(do_after(user, 50, target = src)) @@ -107,7 +110,8 @@ if("head") if(inventory_head) if(inventory_head.flags & NODROP) - usr << "\The [inventory_head] is stuck too hard to [src] for you to remove!" + to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!") + return name = real_name desc = initial(desc) @@ -121,18 +125,21 @@ inventory_head = null regenerate_icons() else - usr << "There is nothing to remove from its [remove_from]." + to_chat(usr, "There is nothing to remove from its [remove_from].") + return if("back") if(inventory_back) if(inventory_back.flags & NODROP) - usr << "\The [inventory_back] is stuck too hard to [src] for you to remove!" + to_chat(usr, "\The [inventory_back] is stuck too hard to [src] for you to remove!") + return inventory_back.loc = src.loc inventory_back = null regenerate_icons() else - usr << "There is nothing to remove from its [remove_from]." + to_chat(usr, "There is nothing to remove from its [remove_from].") + return show_inv(usr) @@ -150,7 +157,8 @@ if("back") if(inventory_back) - usr << "It's already wearing something!" + to_chat(usr, "It's already wearing something!") + return else var/obj/item/item_to_add = usr.get_active_hand() @@ -176,9 +184,11 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "You set [item_to_add] on [src]'s back, but \he shakes it off!" + to_chat(usr, "You set [item_to_add] on [src]'s back, but \he shakes it off!") + if(!usr.drop_item()) - usr << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!" + to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!") + return item_to_add.loc = loc if(prob(25)) @@ -207,7 +217,9 @@ return if(inventory_head) - if(user) user << "You can't put more than one hat on [src]!" + if(user) + to_chat(user, "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.") @@ -359,10 +371,12 @@ if(valid) if(user && !user.drop_item()) - user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" + to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!") + return 0 if(health <= 0) - user << "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him." + to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him.") + 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 \his tail once and barks.", @@ -373,9 +387,11 @@ else if(user && !user.drop_item()) - user << "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!" + to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!") + return 0 - user << "You set [item_to_add] on [src]'s head, but \he shakes it off!" + to_chat(user, "You set [item_to_add] on [src]'s head, but \he shakes it off!") + item_to_add.loc = loc if(prob(25)) step_rand(item_to_add) @@ -467,7 +483,8 @@ var/mob/tmob = AM if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) - src << "\red You fail to push [tmob]'s fat ass out of the way." + to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") + now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -533,7 +550,8 @@ //puppies cannot wear anything. /mob/living/simple_animal/pet/corgi/puppy/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - usr << "You can't fit this on [src]!" + to_chat(usr, "You can't fit this on [src]!") + return ..() @@ -557,7 +575,8 @@ //Lisa already has a cute bow! /mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) - usr << "\red [src] already has a cute bow!" + to_chat(usr, "\red [src] already has a cute bow!") + return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm index c19f3bc9fad..a244ce83cf9 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm @@ -2,10 +2,12 @@ set name = "Chase your tail" set desc = "d'awwww." set category = "Corgi" - src << text("[pick("You dance around","You chase your tail")].") + to_chat(src, text("[pick("You dance around","You chase your tail")].")) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) - O << text("[] [pick("dances around","chases its tail")].", src) + to_chat(O, text("[] [pick("dances around","chases its tail")].", src)) + for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) dir = i sleep(1) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 524cffc9979..2de110a2fb4 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -51,7 +51,8 @@ /*/mob/living/simple_animal/crab/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/wirecutters)) if(prob(50)) - user << "\red \b This kills the crab." + to_chat(user, "\red \b This kills the crab.") + health -= 20 death() else @@ -70,7 +71,8 @@ if ((M.client && !( M.blinded ))) M.show_message("\blue [user] applies the [MED] on [src]") else - user << "\blue this [src] is dead, medical items won't bring it back to life." + to_chat(user, "\blue this [src] is dead, medical items won't bring it back to life.") + else if(O.force) health -= O.force @@ -78,7 +80,8 @@ if ((M.client && !( M.blinded ))) M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else - usr << "\red This weapon is ineffective, it does no damage." + to_chat(usr, "\red This weapon is ineffective, it does no damage.") + for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") @@ -104,14 +107,16 @@ inventory_head.loc = src.loc inventory_head = null else - usr << "\red There is nothing to remove from its [remove_from]." + to_chat(usr, "\red There is nothing to remove from its [remove_from].") + return if("mask") if(inventory_mask) inventory_mask.loc = src.loc inventory_mask = null else - usr << "\red There is nothing to remove from its [remove_from]." + to_chat(usr, "\red There is nothing to remove from its [remove_from].") + return //show_inv(usr) //Commented out because changing Ian's name and then calling up his inventory opens a new inventory...which is annoying. @@ -122,12 +127,14 @@ return var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) - usr << "\red You have nothing in your hand to put on its [add_to]." + to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") + return switch(add_to) if("head") if(inventory_head) - usr << "\red It's is already wearing something." + to_chat(usr, "\red It's is already wearing something.") + return else var/obj/item/item_to_add = usr.get_active_hand() @@ -169,7 +176,8 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "\red It doesn't seem too keen on wearing that item." + to_chat(usr, "\red It doesn't seem too keen on wearing that item.") + return usr.drop_item() @@ -232,7 +240,8 @@ if("mask") if(inventory_mask) - usr << "\red It's already wearing something." + to_chat(usr, "\red It's already wearing something.") + return else var/obj/item/item_to_add = usr.get_active_hand() @@ -248,7 +257,8 @@ ) if( ! ( item_to_add.type in allowed_types ) ) - usr << "\red This object won't fit." + to_chat(usr, "\red This object won't fit.") + return usr.drop_item() diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index dce5fecc2b7..6c1fb0486dc 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -53,8 +53,10 @@ //Let people pick the little buggers up. if(M.a_intent == I_HELP) if(M.species && M.species.name == "Diona") - M << "You feel your being twine with that of [src] as it merges with your biomass." - src << "You feel your being twine with that of [M] as you merge with its biomass." + to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") + + to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") + src.verbs += /mob/living/simple_animal/diona/proc/split src.verbs -= /mob/living/simple_animal/diona/proc/merge src.forceMove(M) @@ -87,10 +89,12 @@ if(!M || !src || !(src.Adjacent(M))) return if(istype(M,/mob/living/carbon/human)) - M << "You feel your being twine with that of [src] as it merges with your biomass." + to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") + M.status_flags |= PASSEMOTES - src << "You feel your being twine with that of [M] as you merge with its biomass." + to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") + src.loc = M src.verbs += /mob/living/simple_animal/diona/proc/split src.verbs -= /mob/living/simple_animal/diona/proc/merge @@ -106,8 +110,10 @@ src.verbs -= /mob/living/simple_animal/diona/proc/split return - src.loc << "You feel a pang of loss as [src] splits away from your biomass." - src << "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground." + to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.") + + to_chat(src, "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground.") + var/mob/living/M = src.loc @@ -163,11 +169,13 @@ set desc = "Grow to a more complex form." if(donors.len < 5) - src << "You need more blood in order to ascend to a new state of consciousness..." + to_chat(src, "You need more blood in order to ascend to a new state of consciousness...") + return if(nutrition < 500) - src << "You need to binge on weeds in order to have the energy to grow..." + to_chat(src, "You need to binge on weeds in order to have the energy to grow...") + return src.split() @@ -210,11 +218,13 @@ if(!M || !src) return if(M.species.flags & NO_BLOOD) - src << "That donor has no blood to take." + to_chat(src, "That donor has no blood to take.") + return if(donors.Find(M.real_name)) - src << "That donor offers you nothing new." + to_chat(src, "That donor offers you nothing new.") + return src.visible_message("[src] flicks out a feeler and neatly steals a sample of [M]'s blood.","You flick out a feeler and neatly steal a sample of [M]'s blood.") @@ -232,12 +242,15 @@ if(donors.len == 5) ready_evolve = 1 - src << "You feel ready to move on to your next stage of growth." + to_chat(src, "You feel ready to move on to your next stage of growth.") + else if(donors.len == 3) universal_understand = 1 - src << "You feel your awareness expand, and realize you know how to understand the creatures around you." + to_chat(src, "You feel your awareness expand, and realize you know how to understand the creatures around you.") + else - src << "The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind." + to_chat(src, "The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind.") + /mob/living/simple_animal/diona/put_in_hands(obj/item/W) @@ -246,7 +259,8 @@ W.dropped() /mob/living/simple_animal/diona/put_in_active_hand(obj/item/W) - src << "You don't have any hands!" + to_chat(src, "You don't have any hands!") + return /mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null) 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 f3e77854882..9e5086fd0cc 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -81,9 +81,11 @@ G.reagents.add_reagent("milk", transfered) milk_content -= transfered else if(G.reagents.total_volume >= G.volume) - user << "\red \The [O] is full." + to_chat(user, "\red \The [O] is full.") + else - user << "\red The udder is dry. Wait a bit longer..." + to_chat(user, "\red The udder is dry. Wait a bit longer...") + else ..() @@ -125,9 +127,11 @@ G.reagents.add_reagent("milk", transfered) milk_content -= transfered else if(G.reagents.total_volume >= G.volume) - user << "\red \The [O] is full." + to_chat(user, "\red \The [O] is full.") + else - user << "\red The udder is dry. Wait a bit longer..." + to_chat(user, "\red The udder is dry. Wait a bit longer...") + else ..() @@ -148,7 +152,8 @@ "[src] looks at you pleadingly", "[src] looks at you with a resigned expression.", "[src] seems resigned to its fate.") - M << pick(responses) + to_chat(M, pick(responses)) + else ..() @@ -245,11 +250,14 @@ var/global/chicken_count = 0 user.drop_item() qdel(O) eggsleft += rand(1, 4) - //world << eggsleft +// to_chat(world, eggsleft) + else - user << "\blue [name] doesn't seem hungry!" + to_chat(user, "\blue [name] doesn't seem hungry!") + else - user << "\blue [name] doesn't seem interested in [O]!" + to_chat(user, "\blue [name] doesn't seem interested in [O]!") + else ..() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index c24da570653..dcb54f0eacc 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -36,7 +36,8 @@ ..() if(prob(speak_chance)) for(var/mob/M in view()) - M << 'sound/effects/mousesqueek.ogg' + to_chat(M, 'sound/effects/mousesqueek.ogg') + /mob/living/simple_animal/mouse/Life() . = ..() @@ -104,15 +105,18 @@ // return 1 /mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things - src << "You are too small to pull anything." + to_chat(src, "You are too small to pull anything.") + return /mob/living/simple_animal/mouse/Crossed(AM as mob|obj) if( ishuman(AM) ) if(!stat) var/mob/M = AM - M << "\blue \icon[src] Squeek!" - M << 'sound/effects/mousesqueek.ogg' + to_chat(M, "\blue \icon[src] Squeek!") + + to_chat(M, 'sound/effects/mousesqueek.ogg') + ..() /mob/living/simple_animal/mouse/death() diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm index e03c8f36ff8..79e13f85d3d 100644 --- a/code/modules/mob/living/simple_animal/friendly/slime.dm +++ b/code/modules/mob/living/simple_animal/friendly/slime.dm @@ -25,7 +25,8 @@ var/mob/tmob = AM if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) - src << "\red You fail to push [tmob]'s fat ass out of the way." + to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") + now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index 491f56f74a7..c484f6b6164 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -46,10 +46,12 @@ if(istype(O, /obj/item/device/mmi) || istype(O, /obj/item/device/mmi/posibrain)) var/obj/item/device/mmi/B = O if(src.mmi) //There's already a brain in it. - user << "\red There's already a brain in [src]!" + to_chat(user, "\red There's already a brain in [src]!") + return if(!B.brainmob) - user << "\red Sticking an empty MMI into the frame would sort of defeat the purpose." + to_chat(user, "\red Sticking an empty MMI into the frame would sort of defeat the purpose.") + return if(!B.brainmob.key) var/ghost_can_reenter = 0 @@ -63,18 +65,22 @@ ghost_can_reenter = 1 break if(!ghost_can_reenter) - user << "[O] is completely unresponsive; there's no point." + to_chat(user, "[O] is completely unresponsive; there's no point.") + return if(B.brainmob.stat == DEAD) - user << "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose." + to_chat(user, "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose.") + return if(jobban_isbanned(B.brainmob, "Cyborg") || jobban_isbanned(B.brainmob,"nonhumandept")) - user << "\red [O] does not seem to fit." + to_chat(user, "\red [O] does not seem to fit.") + return - user << "\blue You install [O] in [src]!" + to_chat(user, "\blue You install [O] in [src]!") + user.drop_item() src.mmi = O @@ -95,13 +101,16 @@ for(var/mob/W in viewers(user, null)) W.show_message(text("\red [user] has spot-welded some of the damage to [src]!"), 1) else - user << "\blue [src] is undamaged!" + to_chat(user, "\blue [src] is undamaged!") + else - user << "Need more welding fuel!" + to_chat(user, "Need more welding fuel!") + return else if(istype(O, /obj/item/weapon/card/id)||istype(O, /obj/item/device/pda)) if (!mmi) - user << "\red There's no reason to swipe your ID - the spiderbot has no brain to remove." + to_chat(user, "\red There's no reason to swipe your ID - the spiderbot has no brain to remove.") + return 0 var/obj/item/weapon/card/id/id_card @@ -113,7 +122,8 @@ id_card = pda.id if(access_robotics in id_card.access) - user << "\blue You swipe your access card and pop the brain out of [src]." + to_chat(user, "\blue You swipe your access card and pop the brain out of [src].") + eject_brain() if(held_item) @@ -122,7 +132,8 @@ return 1 else - user << "\red You swipe your card, with no effect." + to_chat(user, "\red You swipe your card, with no effect.") + return 0 else @@ -135,21 +146,27 @@ if ((M.client && !( M.blinded ))) M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else - usr << "\red This weapon is ineffective, it does no damage." + to_chat(usr, "\red This weapon is ineffective, it does no damage.") + for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") /mob/living/simple_animal/spiderbot/emag_act(user as mob) if (emagged) - user << "\red [src] is already overloaded - better run." + to_chat(user, "\red [src] is already overloaded - better run.") + return 0 else emagged = 1 - user << "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time." - spawn(100) src << "\red Your cell seems to be outputting a lot of power..." - spawn(200) src << "\red Internal heat sensors are spiking! Something is badly wrong with your cell!" - spawn(300) src.explode() + to_chat(user, "\blue You short out the security protocols and overload [src]'s cell, priming it to explode in a short time.") + spawn(100) + to_chat(src, "\red Your cell seems to be outputting a lot of power...") + spawn(200) + to_chat(src, "\red Internal heat sensors are spiking! Something is badly wrong with your cell!") + + spawn(300) + src.explode() /mob/living/simple_animal/spiderbot/proc/transfer_personality(var/obj/item/device/mmi/M as obj) @@ -228,7 +245,8 @@ return if(!held_item) - usr << "\red You have nothing to drop!" + to_chat(usr, "\red You have nothing to drop!") + return 0 if(istype(held_item, /obj/item/weapon/grenade)) @@ -256,7 +274,8 @@ return -1 if(held_item) - src << "\red You are already holding \the [held_item]" + to_chat(src, "\red You are already holding \the [held_item]") + return 1 var/list/items = list() @@ -273,13 +292,16 @@ selection.loc = src visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.") return held_item - src << "\red \The [selection] is too far away." + to_chat(src, "\red \The [selection] is too far away.") + return 0 - src << "\red There is nothing of interest to take." + to_chat(src, "\red There is nothing of interest to take.") + return 0 /mob/living/simple_animal/spiderbot/examine(mob/user) ..(user) if(src.held_item) - user << "It is carrying \a [src.held_item] \icon[src.held_item]." + to_chat(user, "It is carrying \a [src.held_item] \icon[src.held_item].") + 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 9de16829259..29d4ed31406 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -15,7 +15,8 @@ if(L.reagents) L.reagents.add_reagent("spidertoxin", poison_per_bite) if(prob(poison_per_bite)) - L << "You feel a tiny prick." + to_chat(L, "You feel a tiny prick.") + L.reagents.add_reagent(poison_type, poison_per_bite) @@ -230,9 +231,11 @@ var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) if(E) - src << "There is already a cluster of eggs here!" + to_chat(src, "There is already a cluster of eggs here!") + else if(!fed) - src << "You are too hungry to do this!" + to_chat(src, "You are too hungry to do this!") + else if(busy != LAYING_EGGS) busy = LAYING_EGGS src.visible_message("\the [src] begins to lay a cluster of eggs.") diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index b470f0506ff..7aa3e8f0203 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -44,10 +44,12 @@ var/mob/living/carbon/C = target if(C.stat == DEAD) if(C.status_flags & XENO_HOST) - src << "A foreign presence repels us from this body. Perhaps we should try to infest another?" + to_chat(src, "A foreign presence repels us from this body. Perhaps we should try to infest another?") + return Infect(target) - src << "With our egg laid, our death approaches rapidly..." + to_chat(src, "With our egg laid, our death approaches rapidly...") + spawn(100) death() return diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index bb5fcb8b23e..ade260176ea 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -296,16 +296,19 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(inert) - user << "[src] have become inert, its healing properties are no more." + to_chat(user, "[src] have become inert, its healing properties are no more.") + return else if(H.stat == DEAD) - user << "[src] are useless on the dead." + to_chat(user, "[src] are useless on the dead.") + return if(H != user) H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!") else - user << "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments." + to_chat(user, "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments.") + playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) H.revive() qdel(src) @@ -483,10 +486,12 @@ var/current_armor = C.armor if(current_armor.["melee"] < 80) current_armor.["melee"] = min(current_armor.["melee"] + 10, 80) - user << "You strengthen [target], improving its resistance against melee attacks." + to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") + qdel(src) else - user << "You can't improve [C] any further." + to_chat(user, "You can't improve [C] any further.") + return if(istype(target, /obj/mecha/working/ripley)) var/obj/mecha/D = target @@ -496,19 +501,23 @@ damage_absorption["bullet"] = damage_absorption["bullet"] - 0.05 damage_absorption["fire"] = damage_absorption["fire"] - 0.05 damage_absorption["laser"] = damage_absorption["laser"] - 0.025 - user << "You strengthen [target], improving its resistance against melee attacks." + to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") + qdel(src) if(D.icon_state == "ripley-open") D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open") D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." else - user << "You can't add armour onto the mech while someone is inside!" + to_chat(user, "You can't add armour onto the mech while someone is inside!") + if(damage_absorption.["brute"] == 0.3) if(D.icon_state == "ripley-open") D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open") D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter." else - user << "You can't add armour onto the mech while someone is inside!" + to_chat(user, "You can't add armour onto the mech while someone is inside!") + else - user << "You can't improve [D] any further!" + to_chat(user, "You can't improve [D] any further!") + return \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 0555ae10ef7..58a44d686f6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -36,9 +36,11 @@ /mob/living/simple_animal/hostile/mushroom/examine(mob/user) ..(user) if(health >= maxHealth) - user << "It looks healthy." + to_chat(user, "It looks healthy.") + else - user << "It looks like it's been roughed up." + to_chat(user, "It looks like it's been roughed up.") + /mob/living/simple_animal/hostile/mushroom/Life() ..() @@ -130,7 +132,8 @@ Recover() qdel(I) else - user << "[src] won't eat it!" + to_chat(user, "[src] won't eat it!") + return if(I.force) Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 8ca393bb2d1..dd782663516 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -64,7 +64,8 @@ if(can_be_seen(NewLoc)) icon_state = "angelseen" if(client) - src << "You cannot move, there are eyes on you!" + to_chat(src, "You cannot move, there are eyes on you!") + return 0 icon_state = "angel" return ..() @@ -101,7 +102,8 @@ if(can_be_seen()) icon_state = "angelseen" if(client) - src << "You cannot attack, there are eyes on you!" + to_chat(src, "You cannot attack, there are eyes on you!") + return icon_state = "angelattack" ..() diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 434d1739b9e..15728458cc2 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -62,7 +62,8 @@ visible_message("\red \b [src] blocks the [O] with its shield! ") playsound(loc, O.hitsound, 25, 1, -1) else - usr << "\red This weapon is ineffective, it does no damage." + to_chat(usr, "\red This weapon is ineffective, it does no damage.") + visible_message("\red [user] gently taps [src] with the [O]. ") diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index 930eb144af8..6f7d0a5a07c 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -124,10 +124,14 @@ melee_damage_upper = 25 //that's gonna leave a mark, for sure /mob/living/simple_animal/hostile/winter/santa/stage_4/death() - world << "
" - world << "THE FAT MAN HAS FALLEN!" - world << "SANTA CLAUS HAS BEEN DEFEATED!" - world << "
" + to_chat(world, "
") + + to_chat(world, "THE FAT MAN HAS FALLEN!") + + to_chat(world, "SANTA CLAUS HAS BEEN DEFEATED!") + + to_chat(world, "
") + ..() var/obj/item/weapon/grenade/clusterbuster/xmas/X = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src)) var/obj/item/weapon/grenade/clusterbuster/xmas/Y = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 9a53f6bfa35..7c3dc5d0516 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -157,18 +157,21 @@ if(copytext(possible_phrase,1,3) in department_radio_keys) possible_phrase = copytext(possible_phrase,3,length(possible_phrase)) else - usr << "\red There is nothing to remove from its [remove_from]." + to_chat(usr, "\red There is nothing to remove from its [remove_from].") + return show_inv(usr) else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) - usr << "\red You have nothing in your hand to put on its [add_to]." + to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") + return switch(add_to) if("ears") if(ears) - usr << "\red It's already wearing something." + to_chat(usr, "\red It's already wearing something.") + return else var/obj/item/item_to_add = usr.get_active_hand() @@ -176,7 +179,8 @@ return if( !istype(item_to_add, /obj/item/device/radio/headset) ) - usr << "\red This object won't fit." + to_chat(usr, "\red This object won't fit.") + return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -184,7 +188,8 @@ usr.drop_item() headset_to_add.loc = src src.ears = headset_to_add - usr << "You fit the headset onto [src]." + to_chat(usr, "You fit the headset onto [src].") + clearlist(available_channels) for(var/ch in headset_to_add.channels) @@ -568,7 +573,8 @@ return -1 if(held_item) - src << "\red You are already holding the [held_item]" + to_chat(src, "\red You are already holding the [held_item]") + return 1 for(var/obj/item/I in view(1,src)) @@ -584,7 +590,8 @@ visible_message("[src] grabs the [held_item]!", "\blue You grab the [held_item]!", "You hear the sounds of wings flapping furiously.") return held_item - src << "\red There is nothing of interest to take." + to_chat(src, "\red There is nothing of interest to take.") + return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -596,7 +603,8 @@ return -1 if(held_item) - src << "\red You are already holding the [held_item]" + to_chat(src, "\red You are already holding the [held_item]") + return 1 var/obj/item/stolen_item = null @@ -615,7 +623,8 @@ visible_message("[src] grabs the [held_item] out of [C]'s hand!", "\blue You snag the [held_item] out of [C]'s hand!", "You hear the sounds of wings flapping furiously.") return held_item - src << "\red There is nothing of interest to take." + to_chat(src, "\red There is nothing of interest to take.") + return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -639,7 +648,8 @@ return -1 if(!held_item) - usr << "\red You have nothing to drop!" + to_chat(usr, "\red You have nothing to drop!") + return 0 if(!drop_gently) @@ -647,11 +657,13 @@ var/obj/item/weapon/grenade/G = held_item G.loc = src.loc G.prime() - src << "You let go of the [held_item]!" + to_chat(src, "You let go of the [held_item]!") + held_item = null return 1 - src << "You drop the [held_item]." + to_chat(src, "You drop the [held_item].") + held_item.loc = src.loc held_item = null @@ -672,7 +684,8 @@ src.loc = AM.loc icon_state = "parrot_sit" return - src << "\red There is no perch nearby to sit on." + to_chat(src, "\red There is no perch nearby to sit on.") + return /* diff --git a/code/modules/mob/living/simple_animal/powers.dm b/code/modules/mob/living/simple_animal/powers.dm index 060c85fe4d0..9df6a9c8110 100644 --- a/code/modules/mob/living/simple_animal/powers.dm +++ b/code/modules/mob/living/simple_animal/powers.dm @@ -8,13 +8,17 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 - src << text("\green You are now hiding.") + to_chat(src, text("\green You are now hiding.")) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) - O << text("[] scurries to the ground!", src) + to_chat(O, text("[] scurries to the ground!", src)) + else layer = MOB_LAYER - src << text("\green You have stopped hiding.") + to_chat(src, text("\green You have stopped hiding.")) + for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) - O << text("[] slowly peaks up from the ground...", src) \ No newline at end of file + to_chat(O, text("[] slowly peaks up from the ground...", src)) + diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 124cacc0a8f..c9b801734e8 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -48,7 +48,8 @@ if ((M.client && !( M.blinded ))) M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else - usr << "\red This weapon is ineffective, it does no damage." + to_chat(usr, "\red This weapon is ineffective, it does no damage.") + for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 362ec626f2b..a92410d069f 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -385,7 +385,8 @@ /mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) - M << "You cannot attack people before the game has started." + to_chat(M, "You cannot attack people before the game has started.") + return if(M.Victim) return // can't attack while eating! @@ -423,13 +424,16 @@ M.show_message("\blue [user] applies [MED] on [src]") return else - user << "\blue [MED] won't help at all." + to_chat(user, "\blue [MED] won't help at all.") + return else - user << "\blue [src] is at full health." + to_chat(user, "\blue [src] is at full health.") + return else - user << "\blue [src] is dead, medical items won't bring it back to life." + to_chat(user, "\blue [src] is dead, medical items won't bring it back to life.") + return else if(can_collar && !collar && istype(O, /obj/item/clothing/accessory/petcollar)) var/obj/item/clothing/accessory/petcollar/C = O @@ -438,7 +442,8 @@ collar = C collar.equipped(src) regenerate_icons() - usr << "You put \the [C] around \the [src]'s neck." + to_chat(usr, "You put \the [C] around \the [src]'s neck.") + if(C.tagname) name = C.tagname real_name = C.tagname @@ -655,14 +660,16 @@ return if(collar) if(collar.flags & NODROP) - usr << "\The [collar] is stuck too hard to [src] for you to remove!" + to_chat(usr, "\The [collar] is stuck too hard to [src] for you to remove!") + return collar.dropped(src) collar.forceMove(src.loc) collar = null regenerate_icons() else - usr << "There is nothing to remove from its [remove_from]." + to_chat(usr, "There is nothing to remove from its [remove_from].") + return show_inv(usr) else if(href_list["add_inv"]) @@ -683,7 +690,8 @@ collar = C collar.equipped(src) regenerate_icons() - usr << "You put \the [C] around \the [src]'s neck." + to_chat(usr, "You put \the [C] around \the [src]'s neck.") + if(C.tagname) name = C.tagname real_name = C.tagname @@ -695,4 +703,4 @@ . |= collar.GetAccess() /mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion - return + return diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm index 7e0f0071fe7..c78645ce45d 100644 --- a/code/modules/mob/living/simple_animal/tribbles.dm +++ b/code/modules/mob/living/simple_animal/tribbles.dm @@ -53,9 +53,11 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, /mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/scalpel)) - user << "You try to neuter the tribble, but it's moving too much and you fail!" + to_chat(user, "You try to neuter the tribble, but it's moving too much and you fail!") + else if(istype(O, /obj/item/weapon/cautery)) - user << "You try to un-neuter the tribble, but it's moving too much and you fail!" + to_chat(user, "You try to un-neuter the tribble, but it's moving too much and you fail!") + ..() @@ -96,7 +98,8 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, /obj/item/toy/tribble/attack_self(mob/user as mob) //hug that tribble (and play a sound if we add one) ..() - user << "You nuzzle the tribble and it trills softly." + to_chat(user, "You nuzzle the tribble and it trills softly.") + /obj/item/toy/tribble/dropped(mob/user as mob) //now you can't item form them to get rid of them all so easily ..() @@ -107,17 +110,20 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, T.icon_dead = "[src.icon_state]_dead" T.gestation = src.gestation - user << "The tribble gets up and wanders around." + to_chat(user, "The tribble gets up and wanders around.") + qdel(src) /obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering ..() if(istype(O, /obj/item/weapon/scalpel) && src.gestation != null) gestation = null - user << "You neuter the tribble so that it can no longer re-produce." + to_chat(user, "You neuter the tribble so that it can no longer re-produce.") + else if (istype(O, /obj/item/weapon/cautery) && src.gestation == null) gestation = 0 - user << "You fuse some recently cut tubes together, it should be able to reproduce again." + to_chat(user, "You fuse some recently cut tubes together, it should be able to reproduce again.") + @@ -195,10 +201,12 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, if (src.destroyed) return else - usr << text("\blue You kick the lab cage.") + to_chat(usr, text("\blue You kick the lab cage.")) + for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << text("\red [] kicks the lab cage.", usr) + to_chat(O, text("\red [] kicks the lab cage.", usr)) + src.health -= 2 healthcheck() return diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm index e48c7f81d3d..78fff8e8c86 100644 --- a/code/modules/mob/living/simple_animal/vox.dm +++ b/code/modules/mob/living/simple_animal/vox.dm @@ -46,7 +46,8 @@ if ((M.client && !( M.blinded ))) M.show_message("\red \b The [O] bounces harmlessly off of [src]. ") else - usr << "\red This weapon is ineffective, it does no damage." + to_chat(usr, "\red This weapon is ineffective, it does no damage.") + for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") @@ -60,10 +61,12 @@ if(quills<=0) return - src << "\red You launch a razor-sharp quill at [target]!" + to_chat(src, "\red You launch a razor-sharp quill at [target]!") + for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) - O << "\red [src] launches a razor-sharp quill at [target]!" + to_chat(O, "\red [src] launches a razor-sharp quill at [target]!") + var/obj/item/weapon/arrow/quill/Q = new(loc) Q.fingerprintslast = src.ckey @@ -71,7 +74,8 @@ quills-- spawn(100) - src << "\red You feel a fresh quill slide into place." + to_chat(src, "\red You feel a fresh quill slide into place.") + quills++ /mob/living/simple_animal/vox/armalis/verb/message_mob() @@ -93,15 +97,18 @@ var/mob/M = targets[target] if(istype(M, /mob/dead/observer) || M.stat == DEAD) - src << "Not even the armalis can speak to the dead." + to_chat(src, "Not even the armalis can speak to the dead.") + return - M << "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]" + to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") + if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == "Vox") return - H << "\red Your nose begins to bleed..." + to_chat(H, "\red Your nose begins to bleed...") + H.drip(1) /mob/living/simple_animal/vox/armalis/verb/shriek() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 370e029200b..739c70e2446 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -46,7 +46,8 @@ t+= "\blue Plasma : [environment.toxins] \n" t+= "\blue Carbon Dioxide: [environment.carbon_dioxide] \n" for(var/datum/gas/trace_gas in environment.trace_gases) - usr << "\blue [trace_gas.type]: [trace_gas.moles] \n" + to_chat(usr, "\blue [trace_gas.type]: [trace_gas.moles] \n") + usr.show_message(t, 1) @@ -71,9 +72,11 @@ return // Added voice muffling for Issue 41. if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2)) - src << "... You can almost hear someone talking ..." + to_chat(src, "... You can almost hear someone talking ...") + else - src << msg + to_chat(src, msg) + return // Show a message to all mobs in sight of this one @@ -171,7 +174,9 @@ if (istype(W, /obj/item/clothing)) var/obj/item/clothing/C = W if(C.rig_restrict_helmet) - src << "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)" // Stop eva helms equipping. + to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping. + + else equip_to_slot_if_possible(C, slot) else @@ -206,7 +211,9 @@ qdel(W) else if(!disable_warning) - src << "\red You are unable to equip that." //Only print if del_on_fail is false + to_chat(src, "\red You are unable to equip that.")//Only print if del_on_fail is false + + return 0 equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. @@ -348,7 +355,8 @@ var/list/slot_equipment_priority = list( \ if(slot_belt) if(!H.w_uniform) if(!disable_warning) - H << "\red You need a jumpsuit before you can attach this [name]." + to_chat(H, "\red You need a jumpsuit before you can attach this [name].") + return 0 if( !(slot_flags & SLOT_BELT) ) return 0 @@ -408,7 +416,8 @@ var/list/slot_equipment_priority = list( \ if(slot_wear_id) if(!H.w_uniform) if(!disable_warning) - H << "\red You need a jumpsuit before you can attach this [name]." + to_chat(H, "\red You need a jumpsuit before you can attach this [name].") + return 0 if( !(slot_flags & SLOT_ID) ) return 0 @@ -423,7 +432,8 @@ var/list/slot_equipment_priority = list( \ return 0 if(!H.w_uniform) if(!disable_warning) - H << "\red You need a jumpsuit before you can attach this [name]." + to_chat(H, "\red You need a jumpsuit before you can attach this [name].") + return 0 if(slot_flags & SLOT_DENYPOCKET) return @@ -434,7 +444,8 @@ var/list/slot_equipment_priority = list( \ return 0 if(!H.w_uniform) if(!disable_warning) - H << "\red You need a jumpsuit before you can attach this [name]." + to_chat(H, "\red You need a jumpsuit before you can attach this [name].") + return 0 if(slot_flags & SLOT_DENYPOCKET) return 0 @@ -444,15 +455,18 @@ var/list/slot_equipment_priority = list( \ if(slot_s_store) if(!H.wear_suit) if(!disable_warning) - H << "\red You need a suit before you can attach this [name]." + to_chat(H, "\red You need a suit before you can attach this [name].") + return 0 if(!H.wear_suit.allowed) if(!disable_warning) - usr << "You somehow have a suit with no defined allowed items for suit storage, stop that." + to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.") + return 0 if(src.w_class > 4) if(!disable_warning) - usr << "The [name] is too big to attach." + to_chat(usr, "The [name] is too big to attach.") + return 0 if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) ) if(H.s_store) @@ -519,7 +533,8 @@ var/list/slot_equipment_priority = list( \ set category = "IC" if((is_blind(src) || usr.stat) && !isobserver(src)) - src << "Something is there but you can't see it." + to_chat(src, "Something is there but you can't see it.") + return 1 face_atom(A) @@ -625,7 +640,8 @@ var/list/slot_equipment_priority = list( \ if(mind) mind.show_memory(src) else - src << "The game appears to have misplaced your mind datum, so we can't show you your notes." + to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.") + /mob/verb/add_memory(msg as message) set name = "Add Note" @@ -637,7 +653,8 @@ var/list/slot_equipment_priority = list( \ if(mind) mind.store_memory(msg) else - src << "The game appears to have misplaced your mind datum, so we can't show you your notes." + to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.") + /mob/proc/store_memory(msg as message, popup, sane = 1) msg = copytext(msg, 1, MAX_MESSAGE_LEN) @@ -656,7 +673,8 @@ var/list/slot_equipment_priority = list( \ /mob/proc/update_flavor_text() set src in usr if(usr != src) - usr << "No." + to_chat(usr, "No.") + var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null if(msg != null) @@ -684,16 +702,19 @@ var/list/slot_equipment_priority = list( \ set category = "OOC" if (!abandon_allowed) - usr << "Respawning is disabled." + to_chat(usr, "Respawning is disabled.") + return if (stat != DEAD || !ticker) - usr << "You must be dead to use this!" + to_chat(usr, "You must be dead to use this!") + return log_game("[key_name(usr)] has respawned.") - usr << "Make sure to play a different character, and please roleplay correctly!" + to_chat(usr, "Make sure to play a different character, and please roleplay correctly!") + if(!client) log_game("[key_name(usr)] respawn failed due to disconnect.") @@ -722,7 +743,8 @@ var/list/slot_equipment_priority = list( \ if(client.holder && (client.holder.rights & R_ADMIN)) is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) - usr << "\blue You must be observing to use this!" + to_chat(usr, "\blue You must be observing to use this!") + return if(is_admin && stat == DEAD) @@ -937,7 +959,8 @@ var/list/slot_equipment_priority = list( \ /mob/proc/see(message) if(!is_active()) return 0 - src << message + to_chat(src, message) + return 1 /mob/proc/is_muzzled() @@ -1185,11 +1208,13 @@ mob/proc/yank_out_object() usr.changeNext_move(CLICK_CD_RESIST) if(usr.stat == 1) - usr << "You are unconcious and cannot do that!" + to_chat(usr, "You are unconcious and cannot do that!") + return if(usr.restrained()) - usr << "You are restrained and cannot do that!" + to_chat(usr, "You are restrained and cannot do that!") + return var/mob/S = src @@ -1203,17 +1228,21 @@ mob/proc/yank_out_object() valid_objects = get_visible_implants(0) if(!valid_objects.len) if(self) - src << "You have nothing stuck in your body that is large enough to remove." + to_chat(src, "You have nothing stuck in your body that is large enough to remove.") + else - U << "[src] has nothing stuck in their wounds that is large enough to remove." + to_chat(U, "[src] has nothing stuck in their wounds that is large enough to remove.") + return var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects if(self) - src << "You attempt to get a good grip on [selection] in your body." + to_chat(src, "You attempt to get a good grip on [selection] in your body.") + else - U << "You attempt to get a good grip on [selection] in [S]'s body." + to_chat(U, "You attempt to get a good grip on [selection] in [S]'s body.") + if(!do_after(U, 80, target = S)) return @@ -1268,11 +1297,13 @@ mob/proc/yank_out_object() set category = "Ghost" if(jobban_isbanned(usr, "NPC")) - usr << "You are banned from playing as NPC's." + to_chat(usr, "You are banned from playing as NPC's.") + return if(!ticker || ticker.current_state < 3) - src << "You can't respawn as an NPC before the game starts!" + to_chat(src, "You can't respawn as an NPC before the game starts!") + return if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer))) @@ -1296,7 +1327,8 @@ mob/proc/yank_out_object() spawn(5) respawnable_list += usr else - usr << "You are not dead or you have given up your right to be respawned!" + to_chat(usr, "You are not dead or you have given up your right to be respawned!") + return @@ -1305,7 +1337,8 @@ mob/proc/yank_out_object() if(client.time_died_as_mouse && timedifference <= mouse_respawn_time * 600) var/timedifference_text timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss") - src << "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left." + to_chat(src, "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.") + return //find a viable mouse candidate @@ -1319,11 +1352,13 @@ mob/proc/yank_out_object() vent_found = pick(found_vents) host = new /mob/living/simple_animal/mouse(vent_found.loc) else - src << "Unable to find any unwelded vents to spawn mice at." + to_chat(src, "Unable to find any unwelded vents to spawn mice at.") + if(host) host.ckey = src.ckey - host << "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent." + to_chat(host, "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.") + /mob/proc/assess_threat() //For sec bot threat assessment return diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index f5a61359a01..72e3286525f 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -262,7 +262,8 @@ hud.icon_state = "reinforce1" else if(state < GRAB_NECK) if(isslime(affecting)) - assailant << "You squeeze [affecting], but nothing interesting happens." + to_chat(assailant, "You squeeze [affecting], but nothing interesting happens.") + return assailant.visible_message("[assailant] has reinforced \his grip on [affecting] (now neck)!") @@ -318,7 +319,8 @@ switch(assailant.a_intent) if(I_HELP) /*if(force_down) - assailant << "You no longer pin [affecting] to the ground." + to_chat(assailant, "You no longer pin [affecting] to the ground.") + force_down = 0 return*///This is a very basic demonstration of a new feature based on attacking someone with the grab, based on intent. //This specific example would allow you to stop pinning people to the floor without moving away from them. @@ -345,18 +347,22 @@ /*if(last_hit_zone == "eyes") if(state < GRAB_NECK) - assailant << "You require a better grab to do this." + to_chat(assailant, "You require a better grab to do this.") + return if((affected.head && affected.head.flags & HEADCOVERSEYES) || \ (affected.wear_mask && affected.wear_mask.flags & MASKCOVERSEYES) || \ (affected.glasses && affected.glasses.flags & GLASSESCOVERSEYES)) - assailant << "You're going to need to remove the eye covering first." + to_chat(assailant, "You're going to need to remove the eye covering first.") + return if(!affected.internal_organs_by_name["eyes"]) - assailant << "You cannot locate any eyes on [affecting]!" + to_chat(assailant, "You cannot locate any eyes on [affecting]!") + return assailant.visible_message("[assailant] presses \his fingers into [affecting]'s eyes!") - affecting << "You feel immense pain as digits are being pressed into your eyes!" + to_chat(affecting, "You feel immense pain as digits are being pressed into your eyes!") + assailant.attack_log += text("\[[time_stamp()]\] Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])") affecting.attack_log += text("\[[time_stamp()]\] Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])") msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.") @@ -364,12 +370,15 @@ eyes.damage += rand(3,4) if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) - M << "\red You go blind!"*///This is a demonstration of adding a new damaging type based on intent as well as hitzone. + to_chat(M, "\red You go blind!")*///This is a demonstration of adding a new damaging type based on intent as well as hitzone. + + //This specific example would allow you to squish people's eyes with a GRAB_NECK. if(I_DISARM) //This checks that the user is on disarm intent. /* if(state < GRAB_AGGRESSIVE) - assailant << "You require a better grab to do this." + to_chat(assailant, "You require a better grab to do this.") + return if(!force_down) assailant.visible_message("[user] is forcing [affecting] to the ground!") @@ -381,7 +390,8 @@ affecting.set_dir(SOUTH) //face up return else - assailant << "You are already pinning [affecting] to the ground." + to_chat(assailant, "You are already pinning [affecting] to the ground.") + return*///This is an example of something being done with an agressive grab + disarm intent. return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 834592eb9c5..9abffc4284c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -473,7 +473,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set category = "IC" if(usr.sleeping) - usr << "\red You are already sleeping" + to_chat(usr, "\red You are already sleeping") + return else if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes") @@ -484,7 +485,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) set category = "IC" resting = !resting - src << "\blue You are now [resting ? "resting" : "getting up"]" + to_chat(src, "\blue You are now [resting ? "resting" : "getting up"]") + /proc/is_blind(A) if(iscarbon(A)) @@ -554,14 +556,17 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) else // Everyone else (dead people who didn't ghost yet, etc.) lname = name lname = "[lname] " - M << "[lname][follow][message]" + to_chat(M, "[lname][follow][message]") + /proc/notify_ghosts(var/message, var/ghost_sound = null) //Easy notification of ghosts. for(var/mob/dead/observer/O in player_list) if(O.client) - O << "[message]" + to_chat(O, "[message]") + if(ghost_sound) - O << sound(ghost_sound) + to_chat(O, sound(ghost_sound)) + /mob/proc/switch_to_camera(var/obj/machinery/camera/C) if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove)) @@ -642,7 +647,8 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) break if(newname) break //That's a suitable name! - src << "Sorry, that [role]-name wasn't appropriate, please try another. It's possibly too long/short, has bad characters or is already taken." + to_chat(src, "Sorry, that [role]-name wasn't appropriate, please try another. It's possibly too long/short, has bad characters or is already taken.") + if(!newname) //we'll stick with the oldname then return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 22a41279401..71ab4ba944f 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -50,12 +50,14 @@ var/mob/living/silicon/robot/R = usr var/module = R.get_selected_module() if(!module) - usr << "\red You have no module selected." + to_chat(usr, "\red You have no module selected.") + return R.cycle_modules() R.uneq_numbered(module) else - usr << "\red This mob type cannot throw items." + to_chat(usr, "\red This mob type cannot throw items.") + return @@ -63,17 +65,20 @@ if(iscarbon(usr)) var/mob/living/carbon/C = usr if(!C.get_active_hand()) - usr << "\red You have nothing to drop in your hand." + to_chat(usr, "\red You have nothing to drop in your hand.") + return drop_item() else if(isrobot(usr)) var/mob/living/silicon/robot/R = usr if(!R.get_selected_module()) - usr << "\red You have no module selected." + to_chat(usr, "\red You have no module selected.") + return R.deselect_module(R.get_selected_module()) else - usr << "\red This mob type cannot drop items." + to_chat(usr, "\red This mob type cannot drop items.") + return //This gets called when you press the delete button. @@ -81,7 +86,8 @@ set hidden = 1 if(!usr.pulling) - usr << "\blue You are not pulling anything." + to_chat(usr, "\blue You are not pulling anything.") + return usr.stop_pulling() @@ -227,13 +233,15 @@ for(var/mob/M in range(mob, 1)) if(M.pulling == mob) if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M)) - src << "\blue You're restrained! You can't move!" + to_chat(src, "\blue You're restrained! You can't move!") + return 0 else M.stop_pulling() if(mob.pinned.len) - src << "\blue You're pinned to a wall by [mob.pinned[1]]!" + to_chat(src, "\blue You're pinned to a wall by [mob.pinned[1]]!") + return 0 var/turf/T = mob.loc @@ -392,7 +400,8 @@ if(3) //Incorporeal move, but blocked by holy-watered tiles var/turf/simulated/floor/stepTurf = get_step(L, direct) if(stepTurf.flags & NOJAUNT) - L << "Holy energies block your path." + to_chat(L, "Holy energies block your path.") + L.notransform = 1 spawn(2) L.notransform = 0 @@ -439,7 +448,8 @@ if(movement_dir && dense_object_backup) if(dense_object_backup.newtonian_move(turn(movement_dir, 180))) //You're pushing off something movable, so it moves - src << "You push off of [dense_object_backup] to propel yourself." + to_chat(src, "You push off of [dense_object_backup] to propel yourself.") + return 1 diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index 33428a9c096..d60c4d7d9a0 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -5,7 +5,8 @@ /mob/proc/change_mob_type(var/new_type = null, var/turf/location = null, var/new_name = null as text, var/delete_old_mob = 0 as num, var/forcekey = 0) if(istype(src,/mob/new_player)) - usr << "\red cannot convert players who have not entered yet." + to_chat(usr, "\red cannot convert players who have not entered yet.") + return if(!new_type) @@ -15,11 +16,13 @@ new_type = text2path(new_type) if( !ispath(new_type) ) - usr << "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder." + to_chat(usr, "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder.") + return if( new_type == /mob/new_player ) - usr << "\red cannot convert into a new_player mob type." + to_chat(usr, "\red cannot convert into a new_player mob type.") + return var/mob/M @@ -29,7 +32,8 @@ M = new new_type( src.loc ) if(!M || !ismob(M)) - usr << "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder." + to_chat(usr, "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder.") + qdel(M) return diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index b29267f9c3b..44db9388315 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -1,7 +1,8 @@ /mob/new_player/Login() update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying if(join_motd) - src << "
[join_motd]
" + to_chat(src, "
[join_motd]
") + if(!mind) mind = new /datum/mind(key) @@ -43,4 +44,5 @@ for(var/client/C in clients) tally++ if(tally > config.player_overflow_cap) - src << link(config.overflow_server_url) \ No newline at end of file + src << link(config.overflow_server_url) + diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 0f493a22dab..d539b051208 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -118,12 +118,15 @@ var/mob/dead/observer/observer = new() src << browse(null, "window=playersetup") spawning = 1 - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo + + observer.started_as_observer = 1 close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") - src << "\blue Now teleporting." + to_chat(src, "\blue Now teleporting.") + observer.loc = O.loc observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. client.prefs.update_preview_icon(1) @@ -143,13 +146,15 @@ if(href_list["late_join"]) if(!ticker || ticker.current_state != GAME_STATE_PLAYING) - usr << "\red The round is either not ready, or has already finished..." + to_chat(usr, "\red The round is either not ready, or has already finished...") + return if(client.prefs.species in whitelisted_species) if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) - src << alert("You are currently not whitelisted to play [client.prefs.species].") + to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species].")) + return 0 LateChoices() @@ -160,12 +165,14 @@ if(href_list["SelectedJob"]) if(!enter_allowed) - usr << "\blue There is an administrative lock on entering the game!" + to_chat(usr, "\blue There is an administrative lock on entering the game!") + return if(client.prefs.species in whitelisted_species) if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) - src << alert("You are currently not whitelisted to play [client.prefs.species].") + to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species].")) + return 0 AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint) @@ -206,7 +213,8 @@ var/id_max = text2num(href_list["maxid"]) if( (id_max - id_min) > 100 ) //Basic exploit prevention - usr << "The option ID difference is too big. Please contact administration or the database admin." + to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.") + return for(var/optionid = id_min; optionid <= id_max; optionid++) @@ -225,7 +233,8 @@ var/id_max = text2num(href_list["maxoptionid"]) if( (id_max - id_min) > 100 ) //Basic exploit prevention - usr << "The option ID difference is too big. Please contact administration or the database admin." + to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.") + return for(var/optionid = id_min; optionid <= id_max; optionid++) @@ -257,13 +266,16 @@ if (src != usr) return 0 if(!ticker || ticker.current_state != GAME_STATE_PLAYING) - usr << "\red The round is either not ready, or has already finished..." + to_chat(usr, "\red The round is either not ready, or has already finished...") + return 0 if(!enter_allowed) - usr << "\blue There is an administrative lock on entering the game!" + to_chat(usr, "\blue There is an administrative lock on entering the game!") + return 0 if(!IsJobAvailable(rank)) - src << alert("[rank] is not available. Please try another.") + to_chat(src, alert("[rank] is not available. Please try another.")) + return 0 job_master.AssignRole(src, rank, 1) @@ -302,7 +314,8 @@ character.loc = pick(S.turfs) join_message = S.msg else - character << "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead." + to_chat(character, "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") + character.loc = pick(latejoin) join_message = "has arrived on the station" else @@ -415,7 +428,9 @@ client.prefs.real_name = random_name(client.prefs.gender) client.prefs.copy_to(new_character) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo + + if(mind) mind.active = 0 //we wish to transfer the key manually diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index d9e240936d7..11aa3b9a084 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -59,7 +59,8 @@ break if(!found) - usr << "\red Poll question details not found." + to_chat(usr, "\red Poll question details not found.") + return switch(polltype) @@ -316,7 +317,8 @@ break if(!validpoll) - usr << "\red Poll is not valid." + to_chat(usr, "\red Poll is not valid.") + return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]") @@ -329,7 +331,8 @@ break if(!validoption) - usr << "\red Poll option is not valid." + to_chat(usr, "\red Poll option is not valid.") + return var/alreadyvoted = 0 @@ -343,11 +346,13 @@ break if(!multichoice && alreadyvoted) - usr << "\red You already voted in this poll." + to_chat(usr, "\red You already voted in this poll.") + return if(multichoice && (alreadyvoted >= multiplechoiceoptions)) - usr << "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error." + to_chat(usr, "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.") + return var/adminrank = "Player" @@ -358,7 +363,8 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]')") insert_query.Execute() - usr << "\blue Vote successful." + to_chat(usr, "\blue Vote successful.") + usr << browse(null,"window=playerpoll") @@ -383,7 +389,8 @@ break if(!validpoll) - usr << "\red Poll is not valid." + to_chat(usr, "\red Poll is not valid.") + return var/alreadyvoted = 0 @@ -396,7 +403,8 @@ break if(alreadyvoted) - usr << "\red You already sent your feedback for this poll." + to_chat(usr, "\red You already sent your feedback for this poll.") + return var/adminrank = "Player" @@ -410,13 +418,15 @@ replytext = replacetext(replytext, "%BR%", "
") if(!text_pass) - usr << "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again." + to_chat(usr, "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again.") + return var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')") insert_query.Execute() - usr << "\blue Feedback logging successful." + to_chat(usr, "\blue Feedback logging successful.") + usr << browse(null,"window=playerpoll") @@ -441,7 +451,8 @@ break if(!validpoll) - usr << "\red Poll is not valid." + to_chat(usr, "\red Poll is not valid.") + return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]") @@ -454,7 +465,8 @@ break if(!validoption) - usr << "\red Poll option is not valid." + to_chat(usr, "\red Poll option is not valid.") + return var/alreadyvoted = 0 @@ -467,7 +479,8 @@ break if(alreadyvoted) - usr << "\red You already voted in this poll." + to_chat(usr, "\red You already voted in this poll.") + return var/adminrank = "Player" @@ -478,5 +491,6 @@ var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_vote")] (id ,datetime ,pollid ,optionid ,ckey ,ip ,adminrank, rating) VALUES (null, Now(), [pollid], [optionid], '[usr.ckey]', '[usr.client.address]', '[adminrank]', [(isnull(rating)) ? "null" : rating])") insert_query.Execute() - usr << "\blue Vote successful." + to_chat(usr, "\blue Vote successful.") + usr << browse(null,"window=playerpoll") \ No newline at end of file diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index cc4aafb64e8..5cb41408c45 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -42,11 +42,13 @@ /mob/proc/say_dead(var/message) if(!src.client.holder) if(!config.dsay_allowed) - src << "Deadchat is globally muted." + to_chat(src, "Deadchat is globally muted.") + return if(client && !(client.prefs.toggles & CHAT_DEAD)) - usr << "You have deadchat muted." + to_chat(usr, "You have deadchat muted.") + return say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], \"[message]\"", src) diff --git a/code/modules/mob/spirit/mask/mask.dm b/code/modules/mob/spirit/mask/mask.dm index c121d5684d0..2777905e9d4 100644 --- a/code/modules/mob/spirit/mask/mask.dm +++ b/code/modules/mob/spirit/mask/mask.dm @@ -18,7 +18,8 @@ if (cultist) follow_cultist(cultist.owner) cult_log("[key_name_admin(src)] started following [key_name_admin(cultist)].") - src << "You start following [cultist.get_display_name()]." + to_chat(src, "You start following [cultist.get_display_name()].") + /mob/spirit/mask/verb/urge_cultist() @@ -31,7 +32,8 @@ if (cultist.owner) var/newUrge = stripped_input(usr, "", "Set Urge", "") cultist.set_urge(newUrge) - src << "You urge [cultist.owner.name] to [newUrge]." + to_chat(src, "You urge [cultist.owner.name] to [newUrge].") + cult_log("controlled by [key_name_admin(src)] has urged [key_name_admin(cultist.owner)] to [newUrge].") /mob/spirit/mask/verb/set_cult_name() @@ -45,7 +47,8 @@ if (!newName) return cultist.set_cult_name(newName) - src << "You grant [cultist.owner.name] the secret name of [newName]." + to_chat(src, "You grant [cultist.owner.name] the secret name of [newName].") + if (cultist.owner) cult_log("[key_name_admin(src)] has set [key_name_admin(cultist.owner)] to \'[newName]\'") @@ -58,7 +61,8 @@ var/newUrge = stripped_input(usr, "Please choose an urge.", "Set Urge", "") for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints) viewpoint.set_urge(newUrge) - src << "You urge the entire cult to [newUrge]." + to_chat(src, "You urge the entire cult to [newUrge].") + cult_log("[key_name_admin(src)] has urged the entire cult to [newUrge]") @@ -88,7 +92,8 @@ spawn(0) var/newName = stripped_input(src, "Please pick a name.", "Pick Name for Mask", "") name = newName ? newName : "Mask of Nar'sie" - src << "You have set your name to [name]." + to_chat(src, "You have set your name to [name].") + /mob/spirit/mask/proc/pick_cultist() @@ -133,9 +138,11 @@ flicker_mask(usr) for(var/datum/mind/H in ticker.mode.cult) if (H.current) - H.current << "[usr.name]: [input]" + to_chat(H.current, "[usr.name]: [input]") + for(var/mob/spirit/spirit in spirits) - spirit << "[usr.name]: [input]" + to_chat(spirit, "[usr.name]: [input]") + /obj/effect/proc_holder/spell/aoe_turf/shatter_lights @@ -194,7 +201,8 @@ var/talisman = input("Pick a talisman type", "Talisman", null, null) as null|anything in talismans var/imbue_value = talismans[talisman] if (!talisman) - usr << "You choose not to create a talisman." + to_chat(usr, "You choose not to create a talisman.") + revert_cast(usr) return @@ -206,7 +214,8 @@ if ("Teleport") var/target_rune = input("Pick a teleport target", "Teleport Rune", null, null) as null|anything in engwords if (!target_rune) - usr << "You choose not to create a talisman." + to_chat(usr, "You choose not to create a talisman.") + revert_cast(usr) return summon_type = list(/obj/item/weapon/paper/talisman) diff --git a/code/modules/mob/spirit/movement.dm b/code/modules/mob/spirit/movement.dm index b5ac53fbeae..65b2a8c1bbe 100644 --- a/code/modules/mob/spirit/movement.dm +++ b/code/modules/mob/spirit/movement.dm @@ -36,10 +36,12 @@ mob/spirit/proc/Spirit_Move(direct) var/mob/spirit/U = usr if (!currentView) - U << "As a spirit, you may only track cultists." + to_chat(U, "As a spirit, you may only track cultists.") + U.follow_target = target - U << "Now following [currentView.get_cult_name()]." + to_chat(U, "Now following [currentView.get_cult_name()].") + spawn (0) while (U.follow_target == target) @@ -58,4 +60,5 @@ mob/spirit/verb/toggle_acceleration() set name = "Toggle Acceleration" acceleration = !acceleration - usr << "Acceleration has been toggled [acceleration ? "on" : "off"]." \ No newline at end of file + to_chat(usr, "Acceleration has been toggled [acceleration ? "on" : "off"].") + diff --git a/code/modules/mob/spirit/spirit.dm b/code/modules/mob/spirit/spirit.dm index b5295a0d85f..116191ef851 100644 --- a/code/modules/mob/spirit/spirit.dm +++ b/code/modules/mob/spirit/spirit.dm @@ -57,12 +57,15 @@ mob/spirit/Topic(href, href_list) return ..() - usr << "Spirit Href = [href]" + to_chat(usr, "Spirit Href = [href]") + for (var/tempref in href_list) - usr << "Spirit href list [tempref] = [href_list[tempref]]" + to_chat(usr, "Spirit href list [tempref] = [href_list[tempref]]") + if (href_list["track"]) - usr << "Got to tracking." + to_chat(usr, "Got to tracking.") + var/mob/target = locate(href_list["track"]) in mob_list var/mob/spirit/A = locate(href_list["track2"]) in spirits if(A && target) diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm index 85599a52b62..240672b21a7 100644 --- a/code/modules/mob/spirit/viewpoint.dm +++ b/code/modules/mob/spirit/viewpoint.dm @@ -36,9 +36,11 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() set name = "Check Urge" set src in usr if (src.urge) - owner << "\red \b You feel the urge to [src.urge]" + to_chat(owner, "\red \b You feel the urge to [src.urge]") + else - owner << "\b You feel no supernatural compulsions." + to_chat(owner, "\b You feel no supernatural compulsions.") + /obj/cult_viewpoint/verb/reach_out() @@ -49,10 +51,14 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() for(var/mob/spirit/mask/currentMask in spirits) if (currentMask.is_active()) - owner << "\red \b You feel the reassuring presence of your god." - currentMask << "[get_display_name()] has reached out to you." + to_chat(owner, "\red \b You feel the reassuring presence of your god.") + + to_chat(currentMask, "[get_display_name()] has reached out to you.") + + return - owner << "\b You feel a chilling absence." + to_chat(owner, "\b You feel a chilling absence.") + handle_missing_mask() @@ -63,11 +69,14 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() set src in usr switch(favor) if(FAVOR_PLEASED) - owner << "\red \b You bask in your gods favor." + to_chat(owner, "\red \b You bask in your gods favor.") + if(FAVOR_INDIFFERENT) - owner << "\red \b You feel nothing." + to_chat(owner, "\red \b You feel nothing.") + if(FAVOR_DISPLEASED) - owner << "\red \b You cringe at your gods displeasure." + to_chat(owner, "\red \b You cringe at your gods displeasure.") + /obj/cult_viewpoint/verb/pray_to_mask() @@ -81,10 +90,13 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() return cult_log("[key_name(usr,0)](Pray):[input]") - owner << "You pray to Nar'Sie: [input]" + to_chat(owner, "You pray to Nar'Sie: [input]") + for(var/mob/spirit/spirit in spirits) - spirit << "[get_display_name()] prays : [input]" + to_chat(spirit, "[get_display_name()] prays : [input]") + + // PROCS /obj/cult_viewpoint/proc/set_favor(var/newFavor) @@ -120,10 +132,12 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() return FALSE if (newName) cult_name = newName - owner << "\red \b You have been blessed with the secret name of '[newName]'." + to_chat(owner, "\red \b You have been blessed with the secret name of '[newName]'.") + else cult_name = null - owner << "\red \b Your god has taken your secret name." + to_chat(owner, "\red \b Your god has taken your secret name.") + /obj/cult_viewpoint/proc/get_display_name() @@ -159,7 +173,8 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() else return else - owner << "\b You cannot become a mask of Nar'Sie because a Mask already exists." + to_chat(owner, "\b You cannot become a mask of Nar'Sie because a Mask already exists.") + mask_has_been_found() return diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 26e2497ac0c..6ecf69a81b1 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -28,7 +28,9 @@ /mob/proc/AIize() if(client) - src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // stop the jams for AIs + to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jams for AIs + + var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect. O.invisibility = 0 O.aiRestorePowerRoutine = 0 @@ -53,7 +55,8 @@ continue loc_landmark = tripai if (!loc_landmark) - O << "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone." + to_chat(O, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.") + for(var/obj/effect/landmark/start/sloc in landmarks_list) if (sloc.name == "AI") loc_landmark = sloc @@ -106,8 +109,10 @@ "You hear strange noise, you can't quite place it.") qdel(src) - new_spirit << "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god." - new_spirit << "Your job is to help your acolytes complete their goals. Be spooky. Do evil." + to_chat(new_spirit, "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.") + + to_chat(new_spirit, "Your job is to help your acolytes complete their goals. Be spooky. Do evil.") + new_spirit.set_name() @@ -208,7 +213,8 @@ new_xeno.a_intent = I_HARM new_xeno.key = key - new_xeno << "You are now an alien." + to_chat(new_xeno, "You are now an alien.") + new_xeno.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -244,7 +250,8 @@ else new_slime.key = key - new_slime << "You are now a slime. Skreee!" + to_chat(new_slime, "You are now a slime. Skreee!") + new_slime.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -267,7 +274,8 @@ new_corgi.a_intent = I_HARM new_corgi.key = key - new_corgi << "You are now a Corgi. Yap Yap!" + to_chat(new_corgi, "You are now a Corgi. Yap Yap!") + new_corgi.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -298,7 +306,8 @@ new_mob.a_intent = I_HARM - new_mob << "You suddenly feel more... animalistic." + to_chat(new_mob, "You suddenly feel more... animalistic.") + new_mob.update_pipe_vision() spawn() qdel(src) @@ -313,7 +322,8 @@ new_mob.key = key new_mob.a_intent = I_HARM - new_mob << "You feel more... animalistic" + to_chat(new_mob, "You feel more... animalistic") + new_mob.update_pipe_vision() qdel(src) diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index f2e4595a35b..bd232accab6 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -83,7 +83,8 @@ var/global/image/typing_indicator set desc = "Toggles showing an indicator when you are typing emote or say message." prefs.toggles ^= SHOW_TYPING prefs.save_preferences(src) - src << "You will [(prefs.toggles & SHOW_TYPING) ? "no longer" : "now"] display a typing indicator." + to_chat(src, "You will [(prefs.toggles & SHOW_TYPING) ? "no longer" : "now"] display a typing indicator.") + // Clear out any existing typing indicator. if(prefs.toggles & SHOW_TYPING) diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index 6888702ea83..d4fdb1e368c 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -6,7 +6,8 @@ return 1 var/turf/T = get_turf(nano_host()) if (!T || !(T.z in config.player_levels)) - usr << "Unable to establish a connection: You're too far away from the station!" + to_chat(usr, "Unable to establish a connection: You're too far away from the station!") + return 0 if(href_list["track"]) if(isAI(usr)) diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm index 93d68c2bf12..e8ae6b8b748 100644 --- a/code/modules/nano/modules/law_manager.dm +++ b/code/modules/nano/modules/law_manager.dm @@ -134,15 +134,18 @@ return 1 if(href_list["notify_laws"]) - owner << "Law Notice" + to_chat(owner, "Law Notice") + owner.laws.show_laws(owner) if(isAI(owner)) var/mob/living/silicon/ai/AI = owner for(var/mob/living/silicon/robot/R in AI.connected_robots) - R << "Law Notice" + to_chat(R, "Law Notice") + R.laws.show_laws(R) if(usr != owner) - usr << "Laws displayed." + to_chat(usr, "Laws displayed.") + return 1 return 0 diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm index 44154cdb675..1518da77b78 100644 --- a/code/modules/nano/nanomapgen.dm +++ b/code/modules/nano/nanomapgen.dm @@ -32,19 +32,22 @@ endY = world.maxy if (currentZ < 0 || currentZ > world.maxz) - usr << "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]" + to_chat(usr, "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]") + sleep(3) return NANOMAP_TERMINALERR if (startX > endX) - usr << "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])" + to_chat(usr, "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])") + sleep(3) return NANOMAP_TERMINALERR if (startY > endX) - usr << "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])" + to_chat(usr, "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])") + sleep(3) return NANOMAP_TERMINALERR @@ -55,7 +58,8 @@ return NANOMAP_TERMINALERR log_to_dd("NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") - usr << "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])" + to_chat(usr, "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") + var/count = 0; for(var/WorldX = startX, WorldX <= endX, WorldX++) @@ -82,7 +86,8 @@ log_to_dd("NanoMapGen: Done.") - usr << "NanoMapGen: Done. File [mapFilename] uploaded to your cache." + to_chat(usr, "NanoMapGen: Done. File [mapFilename] uploaded to your cache.") + if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION) return NANOMAP_BADOUTPUT diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 6b78745c97f..890c904d118 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -456,7 +456,9 @@ nanoui is used to open and update nano browser uis var/list/send_data = get_send_data(data) - //user << list2json_usecache(send_data) // used for debugging //NANO DEBUG HOOK +// to_chat(user, list2json_usecache(send_data))// used for debugging //NANO DEBUG HOOK + + user << output(list2params(list(list2json_usecache(send_data))),"[window_id].browser:receiveUpdateData") /** diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 58c2036848a..85ff99ace23 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -65,7 +65,8 @@ msg = "Your Energy Katana lands at your feet!" if(msg) - user << "[msg]" + to_chat(user, "[msg]") + /obj/item/weapon/katana/energy/New() ..() diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm index 7b230c1e011..441aa02109f 100644 --- a/code/modules/ninja/martial_art.dm +++ b/code/modules/ninja/martial_art.dm @@ -21,7 +21,8 @@ if(!used) user.visible_message("You stick the [src]'s needle into your arm and press the button.", \ "[user] sticks the [src]'s needle \his arm and presses the button.") - user << "The nanomachines in the [src] flow through your bloodstream." + to_chat(user, "The nanomachines in the [src] flow through your bloodstream.") + var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) @@ -31,7 +32,8 @@ desc = "A strange autoinjector made of a black metal.
It appears to be used up and empty." return 0 else - user << "The [src] has been used already!" + to_chat(user, "The [src] has been used already!") + return 1 // Ninja martial art datum @@ -45,7 +47,8 @@ /datum/martial_art/ninja_martial_art/teach(var/mob/living/carbon/human/H,var/make_temporary=0) ..() H.middleClickOverride = new /datum/middleClickOverride/ninja_martial_art() - H << "You have been taugh the ways of the Creeping Widow.
\ + to_chat(H, "You have been taugh the ways of the Creeping Widow.
\) + Your stikes on harm intent will deal more damage.
Using middle mouse button on a nearby person while on harm intent will send them flying backwards.
\ Your grabs will instantly be aggressive while you are using this style.
Using middle mouse button while on harm intent and behind a person will put them in a silencing choke hold.
\ Using middle mouse button on a nearby person while on disarm intent will wrench their wrist, causing them to drop what they are holding." @@ -64,7 +67,8 @@ D.Stun(1) spawn(50) has_focus = 1 return 1 - A << "You are not focused enough to use that move yet!" + to_chat(A, "You are not focused enough to use that move yet!") + return 0 return A.pointed(D) @@ -72,11 +76,13 @@ if(!D.stat && !D.weakened) A.face_atom(D) if(A.dir != D.dir) // If the user's direction is not the same as the target's after A.face_atom(D) you are not behind them, and cannot use this ability. - A << "You cannot grab [D] from that angle!" + to_chat(A, "You cannot grab [D] from that angle!") + return 0 if(has_choke_hold) // Are we already choking someone? - A<< "You are have a target in your grip!" + to_chat(A, "You are have a target in your grip!") + return 0 has_choke_hold = 1 @@ -105,8 +111,10 @@ I++ sleep(5) - A << "You feel [D] go limp in your grip." - D << "You feel your consciousness slip away as [A] strangles you!" + to_chat(A, "You feel [D] go limp in your grip.") + + to_chat(D, "You feel your consciousness slip away as [A] strangles you!") + D.AdjustParalysis(20) has_choke_hold = 0 @@ -131,7 +139,8 @@ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) spawn(50) has_focus = 1 return 1 - A << "You are not focused enough to use that move yet!" + to_chat(A, "You are not focused enough to use that move yet!") + return 0 return A.pointed(D) diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm index b44eab056ee..7d5d8e3216d 100644 --- a/code/modules/ninja/suit/SpiderOS.dm +++ b/code/modules/ninja/suit/SpiderOS.dm @@ -9,7 +9,8 @@ if(!s_busy) display_spideros() else - affecting << "The interface is locked!" + to_chat(affecting, "The interface is locked!") + /obj/item/clothing/suit/space/space_ninja/proc/display_spideros() @@ -194,7 +195,8 @@ if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on. - U << "Your suit must be worn and active to use this function." + to_chat(U, "Your suit must be worn and active to use this function.") + U << browse(null, "window=spideros")//Closes the window. return @@ -217,7 +219,8 @@ display_to << browse(null, "window=spideros") return if(isnull(P)||P.toff)//So it doesn't freak out if the object no-longer exists. - display_to << "Error: unable to deliver message." + to_chat(display_to, "Error: unable to deliver message.") + display_spideros() return @@ -226,12 +229,15 @@ if("Inject") if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left. - display_to << "Error: the suit cannot perform this function. Out of [href_list["name"]]." + to_chat(display_to, "Error: the suit cannot perform this function. Out of [href_list["name"]].") + else reagents.reaction(U, 2) reagents.trans_id_to(U, href_list["tag"], href_list["tag"]=="nutriment"?5:a_transfer)//Nutriment is a special case since it's very potent. Shouldn't influence actual refill amounts or anything. - display_to << "Injecting..." - U << "You feel a tiny prick and a sudden rush of substance in to your veins." + to_chat(display_to, "Injecting...") + + to_chat(U, "You feel a tiny prick and a sudden rush of substance in to your veins.") + if("Trigger Ability") var/ability_name = href_list["name"]+href_list["cost"]//Adds the name and cost to create the full proc name. @@ -251,7 +257,8 @@ proc_arguments = pick(targets) safety = 0 if(!safety) - U << "[href_list["name"]] suddenly triggered!" + to_chat(U, "[href_list["name"]] suddenly triggered!") + call(src,ability_name)(proc_arguments) if("Eject Disk") @@ -265,11 +272,13 @@ t_disk.loc = T t_disk = null else - U << "ERROR: Could not eject disk." + to_chat(U, "ERROR: Could not eject disk.") + if("Copy to Disk") var/datum/tech/current_data = locate(href_list["target"]) - U << "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk." + to_chat(U, "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk.") + t_disk.stored = current_data diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index bfcc4330dc2..f676132c335 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -30,19 +30,24 @@ Contents: /obj/item/clothing/suit/space/space_ninja/proc/toggle_suit_lock(mob/living/carbon/human/user) if(!suitActive) if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja)) - user<< "ERROR: Unable to locate user.\nABORTING..." + to_chat(user, "ERROR: Unable to locate user.\nABORTING...") + return 0 if(!istype(user.head, /obj/item/clothing/head/helmet/space/space_ninja)) - user<< "ERROR: Unable to locate hood.\nABORTING..." + to_chat(user, "ERROR: Unable to locate hood.\nABORTING...") + return 0 if(!istype(user.gloves, /obj/item/clothing/gloves/space_ninja)) - user<< "ERROR: Unable to locate gloves.\nABORTING..." + to_chat(user, "ERROR: Unable to locate gloves.\nABORTING...") + return 0 if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja)) - user<< "ERROR: Unable to locate foot gear.\nABORTING..." + to_chat(user, "ERROR: Unable to locate foot gear.\nABORTING...") + return 0 if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) - user<< "ERROR: Unable to locate mask.\nABORTING..." + to_chat(user, "ERROR: Unable to locate mask.\nABORTING...") + return 0 suitHood = user.head diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index 760f6648452..fb834cdb469 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -5,7 +5,8 @@ if(istype(I, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/CELL if(CELL.maxcharge > cell.maxcharge && suitGloves) - U << "Higher maximum capacity detected.\nUpgrading..." + to_chat(U, "Higher maximum capacity detected.\nUpgrading...") + if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = U)) U.drop_item() CELL.loc = src @@ -17,8 +18,10 @@ old_cell.corrupt() old_cell.updateicon() cell = CELL - U << "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%" + to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%") + else - U << "Procedure interrupted. Protocol terminated." + to_chat(U, "Procedure interrupted. Protocol terminated.") + return ..() \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 7c84bef5aa3..a93c8680975 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -8,34 +8,42 @@ if(usr.mind.special_role == "Ninja") if(suitBusy) - usr << "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time." + to_chat(usr, "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time.") + return suitBusy = 1 if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes")) - usr << "Now de-initializing..." + to_chat(usr, "Now de-initializing...") + sleep(15) - usr << "Logging off, [usr.real_name]. Shutting down SpiderOS." + to_chat(usr, "Logging off, [usr.real_name]. Shutting down SpiderOS.") + sleep(10) - usr<< "Primary system status: OFFLINE.\nBackup system status: OFFLINE." + to_chat(usr, "Primary system status: OFFLINE.\nBackup system status: OFFLINE.") + sleep(5) - usr<< "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE." + to_chat(usr, "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.") + //TODO: Shut down any active abilities sleep(10) - usr<< "Disconnecting neural-net interface... Success." + to_chat(usr, "Disconnecting neural-net interface... Success.") + usr.hud_used.instantiate() usr.regenerate_icons() sleep(5) - usr<< "Disengaging neural-net interface... Success." + to_chat(usr, "Disengaging neural-net interface... Success.") + sleep(10) - usr<< "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED." + to_chat(usr, "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED.") + //TODO: Grant verbs toggle_suit_lock(usr) usr.regenerate_icons() @@ -43,44 +51,56 @@ suitActive = 0 else if(!suitActive) // Activate the suit. - usr << "Now initializing..." + to_chat(usr, "Now initializing...") + sleep(15) - usr<< "Now establishing neural-net interface..." + to_chat(usr, "Now establishing neural-net interface...") + if(usr.mind.special_role != "Ninja") - usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." + to_chat(usr, "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") + return sleep(10) - usr<< "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding." + to_chat(usr, "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding.") + sleep(10) - usr<< "Securing external locking mechanism..." + to_chat(usr, "Securing external locking mechanism...") + if(!toggle_suit_lock(usr)) return sleep(5) - usr<< "Suit secured, extending neural-net interface..." + to_chat(usr, "Suit secured, extending neural-net interface...") + usr.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255) usr.regenerate_icons() sleep(10) - usr<< "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE" + to_chat(usr, "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE") + sleep(5) - usr<< "Primary system status: ONLINE.\nBackup system status: ONLINE." + to_chat(usr, "Primary system status: ONLINE.\nBackup system status: ONLINE.") + if(suitCell) - usr<< "Current energy capacity: [suitCell.charge]/[suitCell.maxcharge]." + to_chat(usr, "Current energy capacity: [suitCell.charge]/[suitCell.maxcharge].") + sleep(10) - usr<< "All systems operational. Welcome to SpiderOS, [usr.real_name]." + to_chat(usr, "All systems operational. Welcome to SpiderOS, [usr.real_name].") + //TODO: Grant ninja verbs here. suitBusy = 0 suitActive = 1 else suitBusy = 0 - usr << "NOTICE: Suit de-activation protocals aborted." + to_chat(usr, "NOTICE: Suit de-activation protocals aborted.") + else - usr << "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked." + to_chat(usr, "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") + return \ No newline at end of file diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index ae8357a5582..9599878593e 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -41,10 +41,12 @@ copy.name = "Copy - " + c.name copy.fields = c.fields copy.updateinfolinks() - usr << "You tear off the carbon-copy!" + to_chat(usr, "You tear off the carbon-copy!") + c.copied = 1 copy.iscopy = 1 copy.update_icon() c.update_icon() else - usr << "There are no more carbon copies attached to this paper!" \ No newline at end of file + to_chat(usr, "There are no more carbon copies attached to this paper!") + diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index fe9a5bb62f2..ce52a5e6b8c 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -49,7 +49,8 @@ W.loc = src if(istype(W, /obj/item/weapon/paper)) toppaper = W - user << "You clip the [W] onto \the [src]." + to_chat(user, "You clip the [W] onto \the [src].") + update_icon() else if(istype(toppaper) && istype(W, /obj/item/weapon/pen)) @@ -102,7 +103,8 @@ usr.drop_item() W.loc = src haspen = W - usr << "You slot the pen into \the [src]." + to_chat(usr, "You slot the pen into \the [src].") + else if(href_list["write"]) var/obj/item/weapon/P = locate(href_list["write"]) @@ -145,7 +147,8 @@ var/obj/item/P = locate(href_list["top"]) if(P && (P.loc == src) && istype(P, /obj/item/weapon/paper) ) toppaper = P - usr << "You move [P.name] to the top." + to_chat(usr, "You move [P.name] to the top.") + //Update everything attack_self(usr) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 14e3f0d1343..576c7e1ace7 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -44,9 +44,11 @@ var/list/alldepartments = list() /obj/machinery/photocopier/faxmachine/emag_act(user as mob) if(!emagged) emagged = 1 - user << "The transmitters realign to an unknown source!" + to_chat(user, "The transmitters realign to an unknown source!") + else - user << "You swipe the card through [src], but nothing happens." + to_chat(user, "You swipe the card through [src], but nothing happens.") + /obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] @@ -100,7 +102,8 @@ var/list/alldepartments = list() if(copyitem) copyitem.loc = usr.loc usr.put_in_hands(copyitem) - usr << "You take \the [copyitem] out of \the [src]." + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null else var/obj/item/I = usr.get_active_hand() @@ -108,7 +111,8 @@ var/list/alldepartments = list() usr.drop_item() copyitem = I I.loc = src - usr << "You insert \the [I] into \the [src]." + to_chat(usr, "You insert \the [I] into \the [src].") + flick(insert_anim, src) if(href_list["scan"]) @@ -265,4 +269,5 @@ var/list/alldepartments = list() for(var/client/C in admins) if(R_EVENT & C.holder.rights) - C << msg + to_chat(C, msg) + diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index e520aa1976e..f09eefd3e79 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -35,7 +35,8 @@ /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob, params) if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle) || istype(P, /obj/item/documents)) - user << "You put [P] in [src]." + to_chat(user, "You put [P] in [src].") + user.drop_item() P.loc = src icon_state = "[initial(icon_state)]-open" @@ -45,14 +46,17 @@ else if(istype(P, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + else - user << "You can't put [P] in [src]!" + to_chat(user, "You can't put [P] in [src]!") + /obj/structure/filingcabinet/attack_hand(mob/user as mob) if(contents.len <= 0) - user << "\The [src] is empty." + to_chat(user, "\The [src] is empty.") + return user.set_machine(src) @@ -77,9 +81,11 @@ I.loc = loc if(prob(25)) step_rand(I) - user << "You pull \a [I] out of [src] at random." + to_chat(user, "You pull \a [I] out of [src] at random.") + return - user << "You find nothing in [src]." + to_chat(user, "You find nothing in [src].") + /obj/structure/filingcabinet/Topic(href, href_list) if(href_list["retrieve"]) diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 173723bf4cb..7ff2875a6e5 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -32,7 +32,8 @@ if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/photo) || istype(W, /obj/item/weapon/paper_bundle) || istype(W, /obj/item/documents)) user.drop_item() W.loc = src - user << "You put the [W] into \the [src]." + to_chat(user, "You put the [W] into \the [src].") + update_icon() else if(istype(W, /obj/item/weapon/pen)) var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm index ec014d6a845..a8fca4f0831 100644 --- a/code/modules/paperwork/frames.dm +++ b/code/modules/paperwork/frames.dm @@ -70,7 +70,8 @@ name = initial(name) update_icon() else - user << "There is nothing to remove from \the [src]." + to_chat(user, "There is nothing to remove from \the [src].") + else if(istype(I, /obj/item/weapon/crowbar)) playsound(src, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] breaks down \the [src].", "You break down \the [src].") @@ -89,7 +90,8 @@ insert(I) update_icon() else - user << "\The [src] already contains \a [displayed]." + to_chat(user, "\The [src] already contains \a [displayed].") + else return ..() @@ -103,14 +105,17 @@ var/stuff_on_wall = 0 for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff if(istype(O, /obj/structure/sign)) - user << "\The [T] is far too cluttered to place \a [src]!" + to_chat(user, "\The [T] is far too cluttered to place \a [src]!") + return stuff_on_wall++ if(stuff_on_wall >= 4) - user << "\The [T] is far too cluttered to place \a [src]!" + to_chat(user, "\The [T] is far too cluttered to place \a [src]!") + return - user << "You start place \the [src] on \the [T]." + to_chat(user, "You start place \the [src] on \the [T].") + var/px = 0 var/py = 0 @@ -126,7 +131,8 @@ if(WEST) px = -32 else - user << "You cannot reach \the [T] from here!" + to_chat(user, "You cannot reach \the [T] from here!") + return user.unEquip(src) @@ -226,10 +232,12 @@ qdel(src) if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4)) if(explosive) - user << "There is already a device attached behind \the [src], remove it first." + to_chat(user, "There is already a device attached behind \the [src], remove it first.") + return 1 if(!tilted) - user << "\The [src] needs to be already tilted before being rigged with \the [I]." + to_chat(user, "\The [src] needs to be already tilted before being rigged with \the [I].") + return 1 user.visible_message("[user] is fiddling around behind \the [src].", "You begin to secure \the [I] behind \the [src].") if(do_after(user, 150, target = src)) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 940a797addc..bc03f335be8 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -15,22 +15,28 @@ return // don't set a label if(!labels_left) - user << "No labels left." + to_chat(user, "No labels left.") + return if(!label || !length(label)) - user << "No text set." + to_chat(user, "No text set.") + return if(length(A.name) + length(label) > 64) - user << "Label too big." + to_chat(user, "Label too big.") + return if(ishuman(A)) - user << "You can't label humans." + to_chat(user, "You can't label humans.") + return if(issilicon(A)) - user << "You can't label cyborgs." + to_chat(user, "You can't label cyborgs.") + return if(istype(A, /obj/item/weapon/reagent_containers/glass)) - user << "The label can't stick to the [A.name]. (Try using a pen)" + to_chat(user, "The label can't stick to the [A.name]. (Try using a pen)") + return user.visible_message("[user] labels [A] as [label].", \ @@ -41,13 +47,17 @@ mode = !mode icon_state = "labeler[mode]" if(mode) - user << "You turn on \the [src]." + to_chat(user, "You turn on \the [src].") + //Now let them chose the text. var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) - user << "Invalid text." + to_chat(user, "Invalid text.") + return label = str - user << "You set the text to '[str]'." + to_chat(user, "You set the text to '[str]'.") + else - user << "You turn off \the [src]." \ No newline at end of file + to_chat(user, "You turn off \the [src].") + diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index a07303bee43..fb4d7816dd9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -56,7 +56,8 @@ if(in_range(user, src) || istype(user, /mob/dead/observer)) show_content(user) else - user << "You have to go closer if you want to read it." + to_chat(user, "You have to go closer if you want to read it.") + /obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) @@ -81,7 +82,8 @@ set src in usr if((CLUMSY in usr.mutations) && prob(50)) - usr << "You cut yourself on the paper." + to_chat(usr, "You cut yourself on the paper.") + return var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN)) if((loc == usr && usr.stat == 0)) @@ -125,7 +127,8 @@ if(ishuman(M)) var/mob/living/carbon/human/H = M if(H == user) - user << "You wipe off your face with [src]." + to_chat(user, "You wipe off your face with [src].") + H.lip_style = null H.update_body() else @@ -311,7 +314,8 @@ qdel(src) else - user << "\red You must hold \the [P] steady to burn \the [src]." + to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + /obj/item/weapon/paper/Topic(href, href_list) ..() @@ -341,7 +345,8 @@ // check for exploits for(var/bad in paper_blacklist) if(findtext(t,bad)) - usr << "\blue You think to yourself, \"Hm.. this is only paper...\"" + to_chat(usr, "\blue You think to yourself, \"Hm.. this is only paper...\"") + log_admin("PAPER: [key_name(usr)] tried to use forbidden word in [src]: [bad].") message_admins("PAPER: [key_name_admin(usr)] tried to use forbidden word in [src]: [bad].") return @@ -377,7 +382,8 @@ if (istype(P, /obj/item/weapon/paper/carbon)) var/obj/item/weapon/paper/carbon/C = P if (!C.iscopy && !C.copied) - user << "Take off the carbon copy first." + to_chat(user, "Take off the carbon copy first.") + add_fingerprint(user) return var/obj/item/weapon/paper_bundle/B = new(src.loc) @@ -413,7 +419,8 @@ src.loc = get_turf(h_user) if(h_user.client) h_user.client.screen -= src h_user.put_in_hands(B) - user << "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name]." + to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].") + src.loc = B P.loc = B B.amount++ @@ -434,12 +441,14 @@ if(istype(P, /obj/item/weapon/stamp/clown)) if(!clown) - user << "You are totally unable to use the stamp. HONK!" + to_chat(user, "You are totally unable to use the stamp. HONK!") + return stamp(P) - user << "You stamp the paper with your rubber stamp." + to_chat(user, "You stamp the paper with your rubber stamp.") + else if(istype(P, /obj/item/weapon/lighter)) burnpaper(P, user) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 311971f326c..e43c47f01c3 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -24,14 +24,16 @@ if (istype(P, /obj/item/weapon/paper/carbon)) var/obj/item/weapon/paper/carbon/C = P if (!C.iscopy && !C.copied) - user << "Take off the carbon copy first." + to_chat(user, "Take off the carbon copy first.") + add_fingerprint(user) return amount++ if(screen == 2) screen = 1 - user << "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." + to_chat(user, "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + user.unEquip(P) P.loc = src if(istype(user,/mob/living/carbon/human)) @@ -42,7 +44,8 @@ amount++ if(screen == 2) screen = 1 - user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." + to_chat(user, "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + user.unEquip(W) W.loc = src else if(istype(W, /obj/item/weapon/lighter)) @@ -55,7 +58,8 @@ src.amount++ if(screen == 2) screen = 1 - user << "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." + to_chat(user, "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") + qdel(W) else if(istype(W, /obj/item/stack/tape_roll)) @@ -94,13 +98,15 @@ qdel(src) else - user << "\red You must hold \the [P] steady to burn \the [src]." + to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + /obj/item/weapon/paper_bundle/examine(mob/user) if(..(user, 1)) src.show_content(user) else - user << "It is too far away." + to_chat(user, "It is too far away.") + /obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob) var/dat @@ -162,7 +168,8 @@ if(href_list["remove"]) var/obj/item/weapon/W = src[page] usr.put_in_hands(W) - usr << "You remove the [W.name] from the bundle." + to_chat(usr, "You remove the [W.name] from the bundle.") + if(amount == 1) var/obj/item/weapon/paper/P = src[1] usr.unEquip(src) @@ -176,7 +183,8 @@ amount-- update_icon() else - usr << "You need to hold it in your hands to change pages." + to_chat(usr, "You need to hold it in your hands to change pages.") + if (istype(src.loc, /mob)) src.attack_self(src.loc) updateUsrDialog() @@ -200,7 +208,8 @@ set category = "Object" set src in usr - usr << "You loosen the bundle." + to_chat(usr, "You loosen the bundle.") + for(var/obj/O in src) O.loc = usr.loc O.layer = initial(O.layer) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index 552f55051d1..b5528b41375 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -54,7 +54,8 @@ if (H.hand) temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) - H << "You try to move your [temp.name], but cannot!" + to_chat(H, "You try to move your [temp.name], but cannot!") + return if(amount >= 1) amount-- @@ -75,9 +76,11 @@ P.loc = user.loc user.put_in_hands(P) - user << "You take [P] out of the [src]." + to_chat(user, "You take [P] out of the [src].") + else - user << "[src] is empty!" + to_chat(user, "[src] is empty!") + add_fingerprint(user) return @@ -89,7 +92,8 @@ user.drop_item() i.loc = src - user << "You put [i] in [src]." + to_chat(user, "You put [i] in [src].") + papers.Add(i) amount++ @@ -97,9 +101,11 @@ /obj/item/weapon/paper_bin/examine(mob/user) if(..(user, 1)) if(amount) - usr << "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin." + to_chat(usr, "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.") + else - usr << "There are no papers in the bin." + to_chat(usr, "There are no papers in the bin.") + /obj/item/weapon/paper_bin/update_icon() @@ -127,9 +133,11 @@ P = new /obj/item/weapon/paper/carbon P.loc = user.loc user.put_in_hands(P) - user << "You take [P] out of the [src]." + to_chat(user, "You take [P] out of the [src].") + else - user << "[src] is empty!" + to_chat(user, "[src] is empty!") + add_fingerprint(user) return diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 6bba24d2805..afea1699041 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -25,7 +25,8 @@ pressure_resistance = 2 /obj/item/weapon/pen/suicide_act(mob/user) - viewers(user) << "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku." + to_chat(viewers(user), "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.") + return (BRUTELOSS) /obj/item/weapon/pen/blue @@ -110,8 +111,10 @@ if(!force) if(M.can_inject(user, 1)) - user << "You stab [M] with the pen." -// M << "You feel a tiny prick!" + to_chat(user, "You stab [M] with the pen.") + +// to_chat(M, "You feel a tiny prick!") + . = 1 add_logs(M, user, "stabbed", object="[name]") @@ -161,7 +164,8 @@ hitsound = initial(hitsound) throwforce = initial(throwforce) playsound(user, 'sound/weapons/saberoff.ogg', 5, 1) - user << "[src] can now be concealed." + to_chat(user, "[src] can now be concealed.") + else on = 1 force = 18 @@ -172,7 +176,8 @@ hitsound = 'sound/weapons/blade1.ogg' throwforce = 35 playsound(user, 'sound/weapons/saberon.ogg', 5, 1) - user << "[src] is now active." + to_chat(user, "[src] is now active.") + update_icon() /obj/item/weapon/pen/edagger/update_icon() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 6630c24d46c..d7b67f42045 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -63,7 +63,8 @@ copyass() sleep(15) else - usr << "\The [copyitem] can't be copied by \the [src]." + to_chat(usr, "\The [copyitem] can't be copied by \the [src].") + break use_power(active_power_usage) @@ -72,11 +73,13 @@ if(copyitem) copyitem.loc = usr.loc usr.put_in_hands(copyitem) - usr << "You take \the [copyitem] out of \the [src]." + to_chat(usr, "You take \the [copyitem] out of \the [src].") + copyitem = null updateUsrDialog() else if(check_ass()) - ass << "You feel a slight pressure on your ass." + to_chat(ass, "You feel a slight pressure on your ass.") + updateUsrDialog() else if(href_list["min"]) if(copies > 1) @@ -117,25 +120,30 @@ user.drop_item() copyitem = O O.loc = src - user << "You insert \the [O] into \the [src]." + to_chat(user, "You insert \the [O] into \the [src].") + flick(insert_anim, src) updateUsrDialog() else - user << "There is already something in \the [src]." + to_chat(user, "There is already something in \the [src].") + else if(istype(O, /obj/item/device/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness user.drop_item() - user << "You insert the toner cartridge into \the [src]." + to_chat(user, "You insert the toner cartridge into \the [src].") + var/obj/item/device/toner/T = O toner += T.toner_amount qdel(O) updateUsrDialog() else - user << "This cartridge is not yet ready for replacement! Use up the rest of the toner." + to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") + else if(istype(O, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored - user << "You [anchored ? "wrench" : "unwrench"] \the [src]." + to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") + else if(istype(O, /obj/item/weapon/grab)) //For ass-copying. var/obj/item/weapon/grab/G = O if(ismob(G.affecting) && G.affecting != ass) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 133018743cc..679d466dfd7 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -67,13 +67,15 @@ qdel(src) else - user << "\red You must hold \the [P] steady to burn \the [src]." + to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") + /obj/item/weapon/photo/examine(mob/user) if(..(user, 1) || isobserver(user)) show(user) else - user << "It is too far away." + to_chat(user, "It is too far away.") + /obj/item/weapon/photo/proc/show(mob/user as mob) usr << browse_rsc(img, "tmp_photo.png") @@ -175,7 +177,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s var/nsize = input("Photo Size","Pick a size of resulting photo.") as null|anything in list(1,3,5,7) if(nsize) size = nsize - usr << "Camera will now take [size]x[size] photos." + to_chat(usr, "Camera will now take [size]x[size] photos.") + /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) return @@ -186,15 +189,18 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s src.icon_state = icon_on else src.icon_state = icon_off - user << "You switch the camera [on ? "on" : "off"]." + to_chat(user, "You switch the camera [on ? "on" : "off"].") + return /obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/device/camera_film)) if(pictures_left) - user << "[src] still has some film in it!" + to_chat(user, "[src] still has some film in it!") + return - user << "You insert [I] into [src]." + to_chat(user, "You insert [I] into [src].") + user.drop_item() qdel(I) pictures_left = pictures_max @@ -304,7 +310,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." - user << "[pictures_left] photos left." + to_chat(user, "[pictures_left] photos left.") + icon_state = icon_off on = 0 if(user.mind && !(user.mind.assigned_role == "Chaplain")) @@ -427,9 +434,11 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s /obj/item/device/camera/digital/captureimage(atom/target, mob/user, flag) if(saved_pictures.len >= max_storage) - user << "Maximum photo storage capacity reached." + to_chat(user, "Maximum photo storage capacity reached.") + return - user << "Picture saved." + to_chat(user, "Picture saved.") + var/x_c = target.x - (size-1)/2 var/y_c = target.y + (size-1)/2 var/z_c = target.z @@ -454,10 +463,12 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s set src in usr if(saved_pictures.len == 0) - usr << "No images saved." + to_chat(usr, "No images saved.") + return if(pictures_left == 0) - usr << "There is no film left to print." + to_chat(usr, "There is no film left to print.") + return var/datum/picture/P = null @@ -472,7 +483,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s set src in usr if(saved_pictures.len == 0) - usr << "No images saved" + to_chat(usr, "No images saved") + return var/datum/picture/P = null P = input("Select image to delete:",P) as null|anything in saved_pictures @@ -516,11 +528,13 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s camera.network = list("news") cameranet.removeCamera(camera) camera.c_tag = user.name - user << "You switch the camera [on ? "on" : "off"]." + to_chat(user, "You switch the camera [on ? "on" : "off"].") + /obj/item/device/videocam/examine(mob/user) if(..(user, 1)) - user << "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active." + to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.") + /obj/item/device/videocam/hear_talk(mob/M as mob, msg) if (camera && on) @@ -545,4 +559,5 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - user << pick(creepyasssounds) + to_chat(user, pick(creepyasssounds)) + diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index ec4d920eaaa..825124568c1 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -29,11 +29,14 @@ if(C.connected_ai) var/mob/A = P.fields["author"] C.connected_ai.aiCamera.injectaialbum(P, " (taken by [A.name])") - C.connected_ai << "Image recorded and saved by [name]" - usr << "Image recorded and saved to remote database" //feedback to the Cyborg player that the picture was taken + to_chat(C.connected_ai, "Image recorded and saved by [name]") + to_chat(usr, "Image recorded and saved to remote database")//feedback to the Cyborg player that the picture was taken + + else injectaialbum(P) - usr << "Image recorded" + to_chat(usr, "Image recorded") + /obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam) if(!cam) @@ -42,7 +45,8 @@ var/list/nametemp = list() var/find if(cam.aipictures.len == 0) - usr << "No images saved" + to_chat(usr, "No images saved") + return for(var/datum/picture/t in cam.aipictures) nametemp += t.fields["name"] @@ -61,7 +65,8 @@ var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() P.construct(selection) P.show(usr) - usr << P.desc + to_chat(usr, P.desc) + // TG uses a special garbage collector.. qdel(P) qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all. @@ -73,7 +78,8 @@ return cam.aipictures -= selection - usr << "Image deleted" + to_chat(usr, "Image deleted") + /obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user) var/mob/living/silicon/ai = user @@ -87,15 +93,18 @@ /obj/item/device/camera/siliconcam/proc/camera_mode_off() src.in_camera_mode = 0 - usr << "Camera Mode deactivated" + to_chat(usr, "Camera Mode deactivated") + /obj/item/device/camera/siliconcam/proc/camera_mode_on() src.in_camera_mode = 1 - usr << "Camera Mode activated" + to_chat(usr, "Camera Mode activated") + /obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, datum/picture/P) injectaialbum(P) - usr << "Image recorded" + to_chat(usr, "Image recorded") + /obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, datum/picture/P) injectmasteralbum(P) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index d54c4f47bc7..c491ae5559c 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -296,16 +296,19 @@ var/global/list/obj/item/device/pda/PDAs = list() start_program(find_program(/datum/data/pda/app/main_menu)) notifying_programs.Cut() overlays.Cut() - usr << "You press the reset button on \the [src]." + to_chat(usr, "You press the reset button on \the [src].") + else - usr << "You cannot do this while restrained." + to_chat(usr, "You cannot do this while restrained.") + /obj/item/device/pda/proc/remove_id() if (id) if (ismob(loc)) var/mob/M = loc M.put_in_hands(id) - usr << "You remove the ID from the [name]." + to_chat(usr, "You remove the ID from the [name].") + else id.forceMove(get_turf(src)) id = null @@ -322,9 +325,11 @@ var/global/list/obj/item/device/pda/PDAs = list() if(id) remove_id() else - usr << "This PDA does not have an ID in it." + to_chat(usr, "This PDA does not have an ID in it.") + else - usr << "You cannot do this while restrained." + to_chat(usr, "You cannot do this while restrained.") + /obj/item/device/pda/verb/verb_remove_pen() @@ -342,13 +347,16 @@ var/global/list/obj/item/device/pda/PDAs = list() var/mob/M = loc if(M.get_active_hand() == null) M.put_in_hands(O) - usr << "You remove \the [O] from \the [src]." + to_chat(usr, "You remove \the [O] from \the [src].") + return O.forceMove(get_turf(src)) else - usr << "This PDA does not have a pen in it." + to_chat(usr, "This PDA does not have a pen in it.") + else - usr << "You cannot do this while restrained." + to_chat(usr, "You cannot do this while restrained.") + /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. @@ -379,40 +387,47 @@ var/global/list/obj/item/device/pda/PDAs = list() cartridge.forceMove(src) cartridge.update_programs(src) update_shortcuts() - user << "You insert [cartridge] into [src]." + to_chat(user, "You insert [cartridge] into [src].") + if(cartridge.radio) cartridge.radio.hostpda = src else if(istype(C, /obj/item/weapon/card/id)) var/obj/item/weapon/card/id/idcard = C if(!idcard.registered_name) - user << "\The [src] rejects the ID." + to_chat(user, "\The [src] rejects the ID.") + return if(!owner) owner = idcard.registered_name ownjob = idcard.assignment ownrank = idcard.rank name = "PDA-[owner] ([ownjob])" - user << "Card scanned." + to_chat(user, "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) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) if( can_use(user) )//If they can still act. id_check(user, 2) - user << "You put the ID into \the [src]'s slot." + to_chat(user, "You put the ID into \the [src]'s slot.") + else if(istype(C, /obj/item/device/paicard) && !src.pai) user.drop_item() C.forceMove(src) pai = C - user << "You slot \the [C] into [src]." + to_chat(user, "You slot \the [C] into [src].") + else if(istype(C, /obj/item/weapon/pen)) var/obj/item/weapon/pen/O = locate() in src if(O) - user << "There is already a pen in \the [src]." + to_chat(user, "There is already a pen in \the [src].") + else user.drop_item() C.forceMove(src) - user << "You slide \the [C] into \the [src]." + to_chat(user, "You slide \the [C] into \the [src].") + /obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) if (istype(C, /mob/living/carbon) && scanmode) @@ -475,7 +490,8 @@ var/global/list/obj/item/device/pda/PDAs = list() if (in_range(src, usr) && loc == usr) if (t) if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) - usr << "The PDA softly beeps." + to_chat(usr, "The PDA softly beeps.") + close(usr) else t = sanitize(copytext(t, 1, 20)) diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm index 4ed82f69cf9..d012905ccd8 100644 --- a/code/modules/pda/ai.dm +++ b/code/modules/pda/ai.dm @@ -22,7 +22,8 @@ return var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) if(!M) - usr << "Cannot use messenger!" + to_chat(usr, "Cannot use messenger!") + var/list/plist = M.available_pdas() if (plist) var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist) @@ -40,7 +41,8 @@ return var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) if(!M) - usr << "Cannot use messenger!" + to_chat(usr, "Cannot use messenger!") + var/HTML = "AI PDA Message Log" for(var/index in M.tnote) if(index["sent"]) @@ -59,7 +61,8 @@ return var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) M.toff = !M.toff - usr << "PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!" + to_chat(usr, "PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!") + /obj/item/device/pda/ai/verb/cmd_toggle_pda_silent() @@ -71,7 +74,8 @@ return var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) M.notify_silent = !M.notify_silent - usr << "PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!" + to_chat(usr, "PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!") + /obj/item/device/pda/ai/can_use() var/mob/living/silicon/ai/AI = usr diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index 58403d108a9..70690af26ae 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -24,7 +24,8 @@ L = get(pda, /mob/living/silicon) if(L) - L << "\icon[pda] [message]" + to_chat(L, "\icon[pda] [message]") + nanomanager.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message if(!notify_silent) diff --git a/code/modules/pda/chatroom.dm b/code/modules/pda/chatroom.dm index f20a5bfb139..b965076971a 100644 --- a/code/modules/pda/chatroom.dm +++ b/code/modules/pda/chatroom.dm @@ -139,7 +139,8 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion")) /datum/data/pda/app/chatroom/proc/check_messaging_available() . = messaging_available() if(!.) - usr << "ERROR: Messaging server is not responding." + to_chat(usr, "ERROR: Messaging server is not responding.") + /datum/data/pda/app/chatroom/Topic(href, list/href_list) if(!pda.can_use()) diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index 7b9be0e31df..fb64add2b86 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -105,7 +105,8 @@ var/obj/item/device/pda/P = locate(href_list["target"]) if(!P) - usr << "PDA not found." + to_chat(usr, "PDA not found.") + var/datum/data/pda/messenger_plugin/plugin = locate(href_list["plugin"]) if(plugin && (plugin in pda.cartridge.messenger_plugins)) @@ -166,7 +167,8 @@ if(useMS && useTC) // only send the message if it's stable if(useTC != 2) // Does our recipient have a broadcaster on their level? - U << "ERROR: Cannot reach recipient." + to_chat(U, "ERROR: Cannot reach recipient.") + return useMS.send_pda_message("[P.owner]","[pda.owner]","[t]") tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"))) @@ -181,7 +183,8 @@ PM.notify("Message from [pda.owner] ([pda.ownjob]), \"[t]\" (Reply)") log_pda("[usr] (PDA: [src.name]) sent \"[t]\" to [P.name]") else - U << "ERROR: Messaging server is not responding." + to_chat(U, "ERROR: Messaging server is not responding.") + /datum/data/pda/app/messenger/proc/available_pdas() var/list/names = list() @@ -189,7 +192,8 @@ var/list/namecounts = list() if (toff) - usr << "Turn on your receiver in order to send messages." + to_chat(usr, "Turn on your receiver in order to send messages.") + return for(var/A in PDAs) diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm index b343d6b2ce3..1f8b1d06c69 100644 --- a/code/modules/pda/radio.dm +++ b/code/modules/pda/radio.dm @@ -31,7 +31,8 @@ /obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter) - //world << "Post: [freq]: [key]=[value], [key2]=[value2]" +// to_chat(world, "Post: [freq]: [key]=[value], [key2]=[value2]") + var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) if(!frequency) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm index 6d4feacb457..47c963d633a 100644 --- a/code/modules/pda/utilities.dm +++ b/code/modules/pda/utilities.dm @@ -68,9 +68,11 @@ if(istype(C, /mob/living/carbon/human)) var/mob/living/carbon/human/H = C if (!istype(H.dna, /datum/dna)) - user << "No fingerprints found on [H]" + to_chat(user, "No fingerprints found on [H]") + else - user << "[H]'s Fingerprints: [md5(H.dna.uni_identity)]" + to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]") + scan_blood(C, user) /datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) @@ -78,14 +80,17 @@ /datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user) if (!A.blood_DNA) - user << "No blood found on [A]" + to_chat(user, "No blood found on [A]") + if(A.blood_DNA) qdel(A.blood_DNA) else - user << "Blood found on [A]. Analysing..." + to_chat(user, "Blood found on [A]. Analysing...") + spawn(15) for(var/blood in A.blood_DNA) - user << "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]" + to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]") + /datum/data/pda/utility/scanmode/halogen base_name = "Halogen Counter" @@ -108,13 +113,17 @@ if(!isnull(A.reagents)) if(A.reagents.reagent_list.len > 0) var/reagents_length = A.reagents.reagent_list.len - user << "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found." + to_chat(user, "[reagents_length] chemical agent[reagents_length > 1 ? "s" : ""] found.") + for(var/re in A.reagents.reagent_list) - user << "\t [re]" + to_chat(user, "\t [re]") + else - user << "No active chemical agents found in [A]." + to_chat(user, "No active chemical agents found in [A].") + else - user << "No significant chemical agents found in [A]." + to_chat(user, "No significant chemical agents found in [A].") + /datum/data/pda/utility/scanmode/gas base_name = "Gas Scanner" @@ -194,6 +203,9 @@ // notehtml ISN'T set to allow user to get their old notes back. A better implementation would add a "scanned documents" // feature to the PDA, which would better convey the availability of the feature, but this will work for now. // Inform the user - user << "Paper scanned and OCRed to notekeeper." //concept of scanning paper copyright brainoblivion 2009 + to_chat(user, "Paper scanned and OCRed to notekeeper.")//concept of scanning paper copyright brainoblivion 2009 + + else - user << "Error scanning [A]." \ No newline at end of file + to_chat(user, "Error scanning [A].") + diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 22eaa83cf75..e3ff5b6a9c4 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -213,25 +213,33 @@ /obj/machinery/power/apc/examine(mob/user) if(..(user, 1)) if(stat & BROKEN) - user << "Looks broken." + to_chat(user, "Looks broken.") + return if(opened) if(has_electronics && terminal) - user << "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"]." + to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].") + else if (!has_electronics && terminal) - user << "There are some wires but no any electronics." + to_chat(user, "There are some wires but no any electronics.") + else if (has_electronics && !terminal) - user << "Electronics installed but not wired." + to_chat(user, "Electronics installed but not wired.") + else /* if (!has_electronics && !terminal) */ - user << "There is no electronics nor connected wires." + to_chat(user, "There is no electronics nor connected wires.") + else if (stat & MAINT) - user << "The cover is closed. Something wrong with it: it doesn't work." + to_chat(user, "The cover is closed. Something wrong with it: it doesn't work.") + else if (malfhack) - user << "The cover is broken. It may be hard to force it open." + to_chat(user, "The cover is broken. It may be hard to force it open.") + else - user << "The cover is closed." + to_chat(user, "The cover is closed.") + // update the APC icon to show the three base states // also add overlays for indicator lights @@ -416,10 +424,13 @@ if (istype(W, /obj/item/weapon/crowbar) && opened) if (has_electronics==1) if (terminal) - user << "Disconnect wires first." + to_chat(user, "Disconnect wires first.") + return playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) - user << "You are trying to remove the power control board..." //lpeters - fixed grammar issues + to_chat(user, "You are trying to remove the power control board...")//lpeters - fixed grammar issues + + if(do_after(user, 50, target = src)) if (has_electronics==1) has_electronics = 0 @@ -439,18 +450,21 @@ update_icon() else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) ) if(coverlocked && !(stat & MAINT)) - user << "The cover is locked and cannot be opened." + to_chat(user, "The cover is locked and cannot be opened.") + return else opened = 1 update_icon() else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside if(cell) - user << "There is a power cell already installed." + to_chat(user, "There is a power cell already installed.") + return else if (stat & MAINT) - user << "There is no connector for your power cell." + to_chat(user, "There is no connector for your power cell.") + return user.drop_item() W.loc = src @@ -463,55 +477,71 @@ else if (istype(W, /obj/item/weapon/screwdriver)) // haxing if(opened) if (cell) - user << "Close the APC first." //Less hints more mystery! + to_chat(user, "Close the APC first.")//Less hints more mystery! + + return else if (has_electronics==1 && terminal) has_electronics = 2 stat &= ~MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You screw the circuit electronics into place." + to_chat(user, "You screw the circuit electronics into place.") + else if (has_electronics==2) has_electronics = 1 stat |= MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You unfasten the electronics." + to_chat(user, "You unfasten the electronics.") + else /* has_electronics==0 */ - user << "There is nothing to secure." + to_chat(user, "There is nothing to secure.") + return update_icon() else if(emagged) - user << "The interface is broken." + to_chat(user, "The interface is broken.") + else wiresexposed = !wiresexposed - user << "The wires have been [wiresexposed ? "exposed" : "unexposed"]" + to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") + update_icon() else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card if(emagged) - user << "The interface is broken." + to_chat(user, "The interface is broken.") + else if(opened) - user << "You must close the cover to swipe an ID card." + to_chat(user, "You must close the cover to swipe an ID card.") + else if(wiresexposed) - user << "You must close the panel" + to_chat(user, "You must close the panel") + else if(stat & (BROKEN|MAINT)) - user << "Nothing happens." + to_chat(user, "Nothing happens.") + else if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN)) locked = !locked - user << "You [ locked ? "lock" : "unlock"] the APC interface." + to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.") + update_icon() else - user << "Access denied." + to_chat(user, "Access denied.") + else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) if (src.loc:intact) - user << "You must remove the floor plating in front of the APC first." + to_chat(user, "You must remove the floor plating in front of the APC first.") + return var/obj/item/stack/cable_coil/C = W if(C.amount < 10) - user << "You need more wires." + to_chat(user, "You need more wires.") + return - user << "You start adding cables to the APC frame..." + to_chat(user, "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.amount >= 10 && !terminal && opened && has_electronics != 2) @@ -530,9 +560,11 @@ terminal.connect_to_network() else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2) if (src.loc:intact) - user << "You must remove the floor plating in front of the APC first." + to_chat(user, "You must remove the floor plating in front of the APC first.") + return - user << "You begin to cut the cables..." + to_chat(user, "You begin to cut the cables...") + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50, target = src)) if(terminal && opened && has_electronics!=2) @@ -542,23 +574,28 @@ s.start() return new /obj/item/stack/cable_coil(loc,10) - user << "You cut the cables and dismantle the power terminal." + to_chat(user, "You cut the cables and dismantle the power terminal.") + qdel(terminal) // qdel else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack)) - user << "You trying to insert the power control board into the frame..." + to_chat(user, "You trying 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==0) has_electronics = 1 - user << "You place the power control board inside the frame." + to_chat(user, "You place the power control board inside the frame.") + qdel(W) // qdel else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack)) - user << "You cannot put the board inside, the frame is damaged." + to_chat(user, "You cannot put the board inside, the frame is damaged.") + return else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal) var/obj/item/weapon/weldingtool/WT = W if (WT.get_fuel() < 3) - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return user.visible_message("[user.name] welds [src].", \ "You start welding the APC frame...", \ @@ -591,9 +628,11 @@ update_icon() else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack)) if (has_electronics) - user << "You cannot repair this APC until you remove the electronics still inside." + to_chat(user, "You cannot repair this APC until you remove the electronics still inside.") + return - user << "You begin to replace the damaged APC frame..." + to_chat(user, "You begin to replace the damaged APC frame...") + if(do_after(user, 50, target = src)) user.visible_message(\ "[user.name] has replaced the damaged APC frame with new one.",\ @@ -633,16 +672,20 @@ /obj/machinery/power/apc/emag_act(user as mob) if (!(emagged || malfhack)) // trying to unlock with an emag card if(opened) - user << "You must close the cover to swipe an ID card." + to_chat(user, "You must close the cover to swipe an ID card.") + else if(wiresexposed) - user << "You must close the panel first" + to_chat(user, "You must close the panel first") + else if(stat & (BROKEN|MAINT)) - user << "Nothing happens." + to_chat(user, "Nothing happens.") + else flick("apc-spark", src) emagged = 1 locked = 0 - user << "You emag the APC interface." + to_chat(user, "You emag the APC interface.") + update_icon() // attack with hand - remove cell (if cover open) or interact with the APC @@ -660,7 +703,8 @@ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() - H << "The APC power currents surge erratically, damaging your chassis!" + to_chat(H, "The APC power currents surge erratically, damaging your chassis!") + H.adjustFireLoss(10,0) else if(src.cell && src.cell.charge > 0) if(H.nutrition < 450) @@ -671,16 +715,19 @@ H.nutrition += src.cell.charge/10 src.cell.charge = 0 - user << "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use." + to_chat(user, "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use.") + if(src.cell.charge < 0) src.cell.charge = 0 if(H.nutrition > 500) H.nutrition = 500 src.charging = 1 else - user << "You are already fully charged." + to_chat(user, "You are already fully charged.") + else - user << "There is no charge to draw from that APC." + to_chat(user, "There is no charge to draw from that APC.") + return if(usr == user && opened && (!issilicon(user))) @@ -694,7 +741,8 @@ src.cell = null user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.") - //user << "You remove the power cell." +// to_chat(user, "You remove the power cell.") + charging = 0 src.update_icon() return @@ -834,13 +882,15 @@ area.power_environ = (environ > 1) // if (area.name == "AI Chamber") // spawn(10) -// world << " [area.name] [area.power_equip]" +// to_chat(world, " [area.name] [area.power_equip]") + else area.power_light = 0 area.power_equip = 0 area.power_environ = 0 // if (area.name == "AI Chamber") -// world << "[area.power_equip]" +// to_chat(world, "[area.power_equip]") + area.power_change() /obj/machinery/power/apc/proc/isWireCut(var/wireIndex) @@ -864,7 +914,8 @@ ) \ ) if(!loud) - user << "\The [src] has AI control disabled!" + to_chat(user, "\The [src] has AI control disabled!") + user << browse(null, "window=apc") user.unset_machine() return 0 @@ -876,10 +927,12 @@ if (istype(H)) if(H.getBrainLoss() >= 60) for(var/mob/M in viewers(src, null)) - M << "[H] stares cluelessly at [src] and drools." + to_chat(M, "[H] stares cluelessly at [src] and drools.") + return 0 else if(prob(H.getBrainLoss())) - user << "You momentarily forget how to use [src]." + to_chat(user, "You momentarily forget how to use [src].") + return 0 return 1 @@ -970,9 +1023,11 @@ var/mob/living/silicon/ai/malfai = usr if(get_malf_status(malfai)==1) if (malfai.malfhacking) - malfai << "You are already hacking an APC." + to_chat(malfai, "You are already hacking an APC.") + return 0 - malfai << "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process." + to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.") + malfai.malfhack = src malfai.malfhacking = 1 sleep(600) @@ -988,7 +1043,8 @@ src.malfai = usr:parent else src.malfai = usr - malfai << "Hack complete. The APC is now under your exclusive control." + to_chat(malfai, "Hack complete. The APC is now under your exclusive control.") + update_icon() else if (href_list["occupyapc"]) @@ -1002,7 +1058,8 @@ else if (href_list["toggleaccess"]) if(istype(usr, /mob/living/silicon)) if(emagged || aidisabled || (stat & (BROKEN|MAINT))) - usr << "The APC does not respond to the command." + to_chat(usr, "The APC does not respond to the command.") + else locked = !locked update_icon() @@ -1024,10 +1081,12 @@ if(!istype(malf)) return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC - malf << "You must evacuate your current apc first." + to_chat(malf, "You must evacuate your current apc first.") + return if(!malf.can_shunt) - malf << "You cannot shunt." + to_chat(malf, "You cannot shunt.") + return if(!(src.z in config.station_levels)) return @@ -1067,7 +1126,8 @@ point.the_disk = A //The pinpointer tracks the AI back into its core. else - src.occupier << "Primary core damaged, unable to return core processes." + to_chat(src.occupier, "Primary core damaged, unable to return core processes.") + if(forced) src.occupier.loc = src.loc src.occupier.death() @@ -1082,7 +1142,8 @@ if(prob(3)) src.locked = 1 if (src.cell.charge > 0) -// world << "blew APC in [src.loc.loc]" +// to_chat(world, "blew APC in [src.loc.loc]") + src.cell.charge = 0 cell.corrupt() src.malfhack = 1 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index da2e75bd488..7597b31a57e 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -120,11 +120,13 @@ By design, d1 is the smallest direction and d2 is the highest if(istype(W, /obj/item/weapon/wirecutters)) ///// Z-Level Stuff /* if(src.d1 == 12 || src.d2 == 12) - user << "You must cut this cable from above." + to_chat(user, "You must cut this cable from above.") + return */ ///// Z-Level Stuff /* if(breaker_box) - user << "\red This cable is connected to nearby breaker box. Use breaker box to interact with it." + to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.") + return */ if (shock(user, 50)) @@ -157,17 +159,20 @@ 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) - user << "Not enough cable" + to_chat(user, "Not enough cable") + return coil.cable_join(src, user) else if(istype(W, /obj/item/device/multitool)) if(powernet && (powernet.avail > 0)) // is it powered? - user << "[powernet.avail]W in power network." + to_chat(user, "[powernet.avail]W in power network.") + else - user << "The cable is not powered." + to_chat(user, "The cable is not powered.") + shock(user, 5, 0.2) @@ -514,10 +519,12 @@ obj/structure/cable/proc/cableColor(var/colorC) S.heal_damage(0,15,0,1) user.visible_message("\The [user] repairs some burn damage on \the [M]'s [S.name] with \the [src].") else if(S.open != 2) - user << "The damage is far too severe to patch over externally." + to_chat(user, "The damage is far too severe to patch over externally.") + return 1 else if(S.open != 2) - user << "Nothing to fix!" + to_chat(user, "Nothing to fix!") + else return ..() @@ -546,11 +553,14 @@ obj/structure/cable/proc/cableColor(var/colorC) return if(get_amount() == 1) - user << "A short piece of power cable." + to_chat(user, "A short piece of power cable.") + else if(get_amount() == 2) - user << "A piece of power cable." + to_chat(user, "A piece of power cable.") + else - user << "A coil of power cable. There are [get_amount()] lengths of cable in the coil." + to_chat(user, "A coil of power cable. There are [get_amount()] lengths of cable in the coil.") + /obj/item/stack/cable_coil/verb/make_restraint() @@ -561,14 +571,17 @@ obj/structure/cable/proc/cableColor(var/colorC) if(ishuman(M) && !M.restrained() && !M.stat && !M.paralysis && ! M.stunned) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) - usr << "You need at least 15 lengths to make restraints!" + to_chat(usr, "You need at least 15 lengths to make restraints!") + return var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc) B.color = color - usr << "You wind some cable together to make some restraints." + to_chat(usr, "You wind some cable together to make some restraints.") + src.use(15) else - usr << "You cannot do that." + to_chat(usr, "You cannot do that.") + ..() // Items usable on a cable coil : @@ -579,24 +592,28 @@ obj/structure/cable/proc/cableColor(var/colorC) if( istype(W, /obj/item/weapon/wirecutters) && src.amount > 1) src.amount-- new/obj/item/stack/cable_coil(user.loc, 1,color) - user << "You cut a piece off the cable coil." + to_chat(user, "You cut a piece off the cable coil.") + src.update_icon() return else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(C.amount >= MAXCOIL) - user << "The coil is too long, you cannot add any more cable to it." + to_chat(user, "The coil is too long, you cannot add any more cable to it.") + return if( (C.amount + src.amount <= MAXCOIL) ) - user << "You join the cable coils together." + to_chat(user, "You join the cable coils together.") + C.give(src.amount) // give it cable src.use(src.amount) // make sure this one cleans up right return else var/amt = MAXCOIL - C.amount - user << "You transfer [amt] length\s of cable from one coil to the other." + to_chat(user, "You transfer [amt] length\s of cable from one coil to the other.") + C.give(amt) src.use(amt) return @@ -646,15 +663,18 @@ obj/structure/cable/proc/cableColor(var/colorC) return if(!T.can_have_cabling()) - user << "You can only lay cables on catwalks and plating!" + to_chat(user, "You can only lay cables on catwalks and plating!") + return if(get_amount() < 1) // Out of cable - user << "There is no cable left!" + to_chat(user, "There is no cable left!") + return if(get_dist(T,user) > 1) // Too far - user << "You can't lay cable at a place that far away!" + to_chat(user, "You can't lay cable at a place that far away!") + return else @@ -667,7 +687,8 @@ obj/structure/cable/proc/cableColor(var/colorC) for(var/obj/structure/cable/LC in T) if(LC.d2 == dirn && LC.d1 == 0) - user << "There's already a cable at that position!" + to_chat(user, "There's already a cable at that position!") + return var/obj/structure/cable/C = get_new_cable(T) @@ -709,7 +730,8 @@ obj/structure/cable/proc/cableColor(var/colorC) return if(get_dist(C, user) > 1) // make sure it's close enough - user << "You can't lay cable at a place that far away." + to_chat(user, "You can't lay cable at a place that far away.") + return @@ -722,7 +744,8 @@ obj/structure/cable/proc/cableColor(var/colorC) // one end of the clicked cable is pointing towards us if(C.d1 == dirn || C.d2 == dirn) if(U.intact) // can't place a cable if the floor is complete - user << "You can't lay cable there unless the floor tiles are removed." + to_chat(user, "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 @@ -732,7 +755,8 @@ obj/structure/cable/proc/cableColor(var/colorC) 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) - user << "There's already a cable at that position." + to_chat(user, "There's already a cable at that position.") + return var/obj/structure/cable/NC = new(U) @@ -778,7 +802,8 @@ obj/structure/cable/proc/cableColor(var/colorC) if(LC == C) // skip the cable we're interacting with continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction - user << "There's already a cable at that position." + to_chat(user, "There's already a cable at that position.") + return diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index 5d21df1cc02..5f99ee3b59f 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -16,10 +16,12 @@ return if(istype(W, /obj/item/weapon/wirecutters)) - usr << "\blue These cables are too tough to be cut with those [W.name]." + to_chat(usr, "\blue These cables are too tough to be cut with those [W.name].") + return else if(istype(W, /obj/item/stack/cable_coil)) - usr << "\blue You will need heavier cables to connect to these." + to_chat(usr, "\blue You will need heavier cables to connect to these.") + return else ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 1fd649ba19d..6a480a89d06 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -58,11 +58,14 @@ /obj/item/weapon/stock_parts/cell/examine(mob/user) if(..(user, 1)) if(maxcharge <= 2500) - user << "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%." + to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.") + else - user << "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%." + to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.") + if(crit_fail) - user << "\red This power cell seems to be faulty." + to_chat(user, "\red This power cell seems to be faulty.") + /obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob) src.add_fingerprint(user) @@ -73,7 +76,8 @@ if(istype(W, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = W - user << "You inject the solution into the power cell." + to_chat(user, "You inject the solution into the power cell.") + if(S.reagents.has_reagent("plasma", 5)) diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index c11292d4fd7..a3e7c0d75c8 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -121,7 +121,8 @@ /obj/machinery/power/generator/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/wrench)) anchored = !anchored - user << "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor." + to_chat(user, "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.") + use_power = anchored reconnect() else diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index 00ab21b64df..52a66625d30 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -72,7 +72,8 @@ hot_air.temperature = hot_air.temperature - energy_transfer/hot_air_heat_capacity cold_air.temperature = cold_air.temperature + heat/cold_air_heat_capacity - //world << "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]" +// to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]") + input1.parent.update = 1 input2.parent.update = 1 diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 863bdc19b32..76b19dda201 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -182,14 +182,16 @@ var/const/GRAV_NEEDS_WRENCH = 3 switch(broken_state) if(GRAV_NEEDS_SCREWDRIVER) if(istype(I, /obj/item/weapon/screwdriver)) - user << "You secure the screws of the framework." + to_chat(user, "You secure the screws of the framework.") + playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) broken_state++ if(GRAV_NEEDS_WELDING) if(istype(I, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = I if(WT.remove_fuel(1, user)) - user << "You mend the damaged framework." + to_chat(user, "You mend the damaged framework.") + playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) broken_state++ if(GRAV_NEEDS_PLASTEEL) @@ -197,14 +199,17 @@ var/const/GRAV_NEEDS_WRENCH = 3 var/obj/item/stack/sheet/plasteel/PS = I if(PS.amount >= 10) PS.use(10) - user << "You add the plating to the framework." + to_chat(user, "You add the plating to the framework.") + playsound(src.loc, 'sound/machines/click.ogg', 75, 1) broken_state++ else - user << "You need 10 sheets of plasteel." + to_chat(user, "You need 10 sheets of plasteel.") + if(GRAV_NEEDS_WRENCH) if(istype(I, /obj/item/weapon/wrench)) - user << "You secure the plating to the framework." + to_chat(user, "You secure the plating to the framework.") + playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) set_fix() else diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index f7ca916dfff..ade62f2144e 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -30,18 +30,22 @@ if(..(user, 2)) switch(src.stage) if(1) - usr << "It's an empty frame." + to_chat(usr, "It's an empty frame.") + if(2) - usr << "It's wired." + to_chat(usr, "It's wired.") + if(3) - usr << "The casing is closed." + to_chat(usr, "The casing is closed.") + /obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/wrench)) if (src.stage == 1) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) - usr << "You begin deconstructing [src]." + to_chat(usr, "You begin deconstructing [src].") + if (!do_after(usr, 30, target = src)) return new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded ) @@ -50,11 +54,13 @@ playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) qdel(src) if (src.stage == 2) - usr << "You have to remove the wires first." + to_chat(usr, "You have to remove the wires first.") + return if (src.stage == 3) - usr << "You have to unscrew the case first." + to_chat(usr, "You have to unscrew the case first.") + return if(istype(W, /obj/item/weapon/wirecutters)) @@ -269,13 +275,17 @@ if(..(user, 1)) switch(status) if(LIGHT_OK) - user << "[desc] It is turned [on? "on" : "off"]." + to_chat(user, "[desc] It is turned [on? "on" : "off"].") + if(LIGHT_EMPTY) - user << "[desc] The [fitting] has been removed." + to_chat(user, "[desc] The [fitting] has been removed.") + if(LIGHT_BURNED) - user << "[desc] The [fitting] is burnt out." + to_chat(user, "[desc] The [fitting] is burnt out.") + if(LIGHT_BROKEN) - user << "[desc] The [fitting] has been smashed." + to_chat(user, "[desc] The [fitting] has been smashed.") + @@ -294,14 +304,16 @@ // attempt to insert light if(istype(W, /obj/item/weapon/light)) if(status != LIGHT_EMPTY) - user << "There is a [fitting] already inserted." + to_chat(user, "There is a [fitting] already inserted.") + return else src.add_fingerprint(user) var/obj/item/weapon/light/L = W if(istype(L, light_type)) status = L.status - user << "You insert the [L.name]." + to_chat(user, "You insert the [L.name].") + switchcount = L.switchcount rigged = L.rigged brightness_range = L.brightness_range @@ -320,7 +332,8 @@ explode() else - user << "This type of light requires a [fitting]." + to_chat(user, "This type of light requires a [fitting].") + return // attempt to break the light @@ -331,7 +344,8 @@ user.do_attack_animation(src) if(prob(1+W.force * 5)) - user << "You hit the light, and it smashes!" + to_chat(user, "You hit the light, and it smashes!") + for(var/mob/M in viewers(src)) if(M == user) continue @@ -369,7 +383,8 @@ qdel(src) return - user << "You stick \the [W] into the light socket!" + to_chat(user, "You stick \the [W] into the light socket!") + if(has_power() && (W.flags & CONDUCT)) var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) @@ -407,7 +422,8 @@ // Aliens smash the bulb but do not get electrocuted./N /obj/machinery/light/attack_alien(mob/living/carbon/alien/humanoid/user)//So larva don't go breaking light bulbs. if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) - user << "\green That object is useless to you." + to_chat(user, "\green That object is useless to you.") + return else if (status == LIGHT_OK||status == LIGHT_BURNED) user.do_attack_animation(src) @@ -418,7 +434,8 @@ /obj/machinery/light/attack_animal(mob/living/simple_animal/M) if(M.melee_damage_upper == 0) return if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) - M << "\red That object is useless to you." + to_chat(M, "\red That object is useless to you.") + return else if (status == LIGHT_OK||status == LIGHT_BURNED) M.do_attack_animation(src) @@ -433,7 +450,8 @@ add_fingerprint(user) if(status == LIGHT_EMPTY) - user << "There is no [fitting] in this light." + to_chat(user, "There is no [fitting] in this light.") + return // make it burn hands if not wearing fire-insulated gloves @@ -451,11 +469,14 @@ prot = 1 if(prot > 0 || (RESIST_HEAT in user.mutations)) - user << "You remove the light [fitting]" + to_chat(user, "You remove the light [fitting]") + else if(TK in user.mutations) - user << "You telekinetically remove the light [fitting]." + to_chat(user, "You telekinetically remove the light [fitting].") + else - user << "You try to remove the light [fitting], but you burn your hand on it!" + to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!") + var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") if(affecting.take_damage( 0, 5 )) // 5 burn damage @@ -463,7 +484,8 @@ H.updatehealth() return // if burned, don't remove the light else - user << "You remove the light [fitting]." + to_chat(user, "You remove the light [fitting].") + // create a light tube/bulb item and put it in the user's hand @@ -490,10 +512,12 @@ /obj/machinery/light/attack_tk(mob/user) if(status == LIGHT_EMPTY) - user << "There is no [fitting] in this light." + to_chat(user, "There is no [fitting] in this light.") + return - user << "You telekinetically remove the light [fitting]." + to_chat(user, "You telekinetically remove the light [fitting].") + // create a light tube/bulb item and put it in the user's hand var/obj/item/weapon/light/L = new light_type() L.status = status @@ -671,7 +695,8 @@ if(istype(I, /obj/item/weapon/reagent_containers/syringe)) var/obj/item/weapon/reagent_containers/syringe/S = I - user << "You inject the solution into the [src]." + to_chat(user, "You inject the solution into the [src].") + if(S.reagents.has_reagent("plasma", 5)) diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 7feba62c14b..062978045ec 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -51,9 +51,11 @@ if(!..(user,1 )) return if(active) - usr << "The generator is on." + to_chat(usr, "The generator is on.") + else - usr << "The generator is off." + to_chat(usr, "The generator is off.") + /obj/machinery/power/port_gen/emp_act(severity) var/duration = 6000 //ten minutes @@ -151,10 +153,16 @@ /obj/machinery/power/port_gen/pacman/examine(mob/user) ..(user) - user << "\The [src] appears to be producing [power_gen*power_output] W." - user << "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper." - if(IsBroken()) user << "\The [src] seems to have broken down." - if(overheating) user << "\The [src] is overheating!" + to_chat(user, "\The [src] appears to be producing [power_gen*power_output] W.") + + to_chat(user, "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper.") + + if(IsBroken()) + to_chat(user, "\The [src] seems to have broken down.") + + if(overheating) + to_chat(user, "\The [src] is overheating!") + /obj/machinery/power/port_gen/pacman/HasFuel() var/needed_sheets = power_output / time_per_sheet @@ -269,9 +277,11 @@ var/obj/item/stack/addstack = O var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) - user << "The [src.name] is full!" + to_chat(user, "The [src.name] is full!") + return - user << "You add [amount] sheet\s to the [src.name]." + to_chat(user, "You add [amount] sheet\s to the [src.name].") + sheets += amount addstack.use(amount) nanomanager.update_uis(src) @@ -281,10 +291,12 @@ if(!anchored) connect_to_network() - user << "You secure the generator to the floor." + to_chat(user, "You secure the generator to the floor.") + else disconnect_from_network() - user << "You unsecure the generator from the floor." + to_chat(user, "You unsecure the generator from the floor.") + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored @@ -293,9 +305,11 @@ panel_open = !panel_open playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(panel_open) - user << "You open the access panel." + to_chat(user, "You open the access panel.") + else - user << "You close the access panel." + to_chat(user, "You close the access panel.") + else if(istype(O, /obj/item/weapon/storage/part_replacer) && panel_open) exchange_parts(user, O) return diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 3e94274cf2f..72c9f0e4eb5 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -44,23 +44,27 @@ var/global/list/rad_collectors = list() investigate_log("turned [active?"on":"off"] by [user.key]. [P?"Fuel: [round(P.air_contents.toxins/0.29)]%":"It is empty"].","singulo") return else - user << "\red The controls are locked!" + to_chat(user, "\red The controls are locked!") + return ..() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/multitool)) - user << "The [W.name] detects that [last_power]W were recently produced." + to_chat(user, "The [W.name] detects that [last_power]W were recently produced.") + return 1 else if(istype(W, /obj/item/device/analyzer) && P) atmosanalyzer_scan(P.air_contents, user) else if(istype(W, /obj/item/weapon/tank/plasma)) if(!src.anchored) - user << "\red The [src] needs to be secured to the floor first." + to_chat(user, "\red The [src] needs to be secured to the floor first.") + return 1 if(src.P) - user << "\red There's already a plasma tank loaded." + to_chat(user, "\red There's already a plasma tank loaded.") + return 1 user.drop_item() src.P = W @@ -72,7 +76,8 @@ var/global/list/rad_collectors = list() return 1 else if(istype(W, /obj/item/weapon/wrench)) if(P) - user << "\blue Remove the plasma tank first." + to_chat(user, "\blue Remove the plasma tank first.") + return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) src.anchored = !src.anchored @@ -87,12 +92,15 @@ var/global/list/rad_collectors = list() if (src.allowed(user)) if(active) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") + else src.locked = 0 //just in case it somehow gets locked - user << "\red The controls can only be locked when the [src] is active" + to_chat(user, "\red The controls can only be locked when the [src] is active") + else - user << "\red Access denied!" + to_chat(user, "\red Access denied!") + return 1 else ..() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index f181fab77af..e69bd179ed9 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -65,7 +65,8 @@ set src in oview(1) if (src.anchored || usr:stat) - usr << "It is fastened to the floor!" + to_chat(usr, "It is fastened to the floor!") + return 0 src.dir = turn(src.dir, 90) return 1 @@ -127,18 +128,21 @@ src.add_fingerprint(user) if(state == 2) if(!powernet) - user << "The emitter isn't connected to a wire." + to_chat(user, "The emitter isn't connected to a wire.") + return 1 if(!src.locked) if(src.active==1) src.active = 0 - user << "You turn off the [src]." + to_chat(user, "You turn off the [src].") + message_admins("Emitter turned off by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1) log_game("Emitter turned off by [key_name(user)] in [x], [y], [z]") investigate_log("turned off by [key_name(usr)]","singulo") else src.active = 1 - user << "You turn on the [src]." + to_chat(user, "You turn on the [src].") + src.shot_number = 0 src.fire_delay = maximum_fire_delay message_admins("Emitter turned on by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1) @@ -146,9 +150,11 @@ investigate_log("turned on by [key_name(usr)]","singulo") update_icon() else - user << "\red The controls are locked!" + to_chat(user, "\red The controls are locked!") + else - user << "\red The [src] needs to be firmly secured to the floor first." + to_chat(user, "\red The [src] needs to be firmly secured to the floor first.") + return 1 @@ -223,7 +229,8 @@ if(istype(W, /obj/item/weapon/wrench)) if(active) - user << "Turn off the [src] first." + to_chat(user, "Turn off the [src] first.") + return switch(state) if(0) @@ -241,17 +248,20 @@ "You hear a ratchet") src.anchored = 0 if(2) - user << "\red The [src.name] needs to be unwelded from the floor." + to_chat(user, "\red The [src.name] needs to be unwelded from the floor.") + return if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(active) - user << "Turn off the [src] first." + to_chat(user, "Turn off the [src] first.") + return switch(state) if(0) - user << "\red The [src.name] needs to be wrenched to the floor." + to_chat(user, "\red The [src.name] needs to be wrenched to the floor.") + if(1) if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -261,10 +271,12 @@ if (do_after(user,20, target = src)) if(!src || !WT.isOn()) return state = 2 - user << "You weld the [src] to the floor." + to_chat(user, "You weld the [src] to the floor.") + connect_to_network() else - user << "\red You need more welding fuel to complete this task." + to_chat(user, "\red You need more welding fuel to complete this task.") + if(2) if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -274,25 +286,31 @@ if (do_after(user,20, target = src)) if(!src || !WT.isOn()) return state = 1 - user << "You cut the [src] free from the floor." + to_chat(user, "You cut the [src] free from the floor.") + disconnect_from_network() else - user << "\red You need more welding fuel to complete this task." + to_chat(user, "\red You need more welding fuel to complete this task.") + return if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(emagged) - user << "\red The lock seems to be broken" + to_chat(user, "\red The lock seems to be broken") + return if(src.allowed(user)) if(active) src.locked = !src.locked - user << "The controls are now [src.locked ? "locked." : "unlocked."]" + to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") + else src.locked = 0 //just in case it somehow gets locked - user << "\red The controls can only be locked when the [src] is online" + to_chat(user, "\red The controls can only be locked when the [src] is online") + else - user << "\red Access denied." + to_chat(user, "\red Access denied.") + return if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W)) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index cabe2b7a9b6..320f2d8dc6c 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -79,7 +79,8 @@ field_generator power level display if(state == 2) if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(src.active >= 1) - user << "You are unable to turn off the [src.name] once it is online!" + to_chat(user, "You are unable to turn off the [src.name] once it is online!") + return 1 else user.visible_message("[user.name] turns on the [src.name].", \ @@ -90,13 +91,15 @@ field_generator power level display src.add_fingerprint(user) else - user << "The [src] needs to be firmly secured to the floor first!" + to_chat(user, "The [src] needs to be firmly secured to the floor first!") + return /obj/machinery/field/generator/attackby(obj/item/W, mob/user, params) if(active) - user << "The [src] needs to be off!" + to_chat(user, "The [src] needs to be off!") + return else if(istype(W, /obj/item/weapon/wrench)) switch(state) @@ -116,13 +119,15 @@ field_generator power level display "You hear ratchet.") src.anchored = 0 if(2) - user << "The [src.name] needs to be unwelded from the floor!" + to_chat(user, "The [src.name] needs to be unwelded from the floor!") + return else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W switch(state) if(0) - user << "The [src.name] needs to be wrenched to the floor!" + to_chat(user, "The [src.name] needs to be wrenched to the floor!") + return if(1) if (WT.remove_fuel(0,user)) @@ -133,7 +138,8 @@ field_generator power level display if (do_after(user,20, target = src)) if(!src || !WT.isOn()) return state = 2 - user << "You weld the field generator to the floor." + to_chat(user, "You weld the field generator to the floor.") + else return if(2) @@ -145,7 +151,8 @@ field_generator power level display if (do_after(user,20, target = src)) if(!src || !WT.isOn()) return state = 1 - user << "You cut \the [src] free from the floor." + to_chat(user, "You cut \the [src] free from the floor.") + else return else diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 355b8ec6e74..48c980f39fe 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -24,8 +24,10 @@ /obj/singularity/narsie/large/New() ..() - world << "NAR-SIE HAS RISEN" - world << pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')) + to_chat(world, "NAR-SIE HAS RISEN") + + to_chat(world, pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg'))) + var/area/A = get_area(src) if(A) @@ -38,7 +40,8 @@ /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob) if(!(src in view())) - user << "Your soul is too far away." + to_chat(user, "Your soul is too far away.") + return makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1) new /obj/effect/effect/sleep_smoke(user.loc) @@ -76,7 +79,8 @@ for(var/mob/living/carbon/M in oviewers(8, src)) if(M.stat == CONSCIOUS) if(!iscultist(M)) - M << "You feel your sanity crumble away in an instant as you gaze upon [src.name]..." + to_chat(M, "You feel your sanity crumble away in an instant as you gaze upon [src.name]...") + M.apply_effect(3, STUN) @@ -123,12 +127,15 @@ /obj/singularity/narsie/proc/acquire(var/mob/food) - target << "NAR-SIE HAS LOST INTEREST IN YOU" + to_chat(target, "NAR-SIE HAS LOST INTEREST IN YOU") + target = food if(ishuman(target)) - target << "NAR-SIE HUNGERS FOR YOUR SOUL" + to_chat(target, "NAR-SIE HUNGERS FOR YOUR SOUL") + else - target << "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL" + to_chat(target, "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL") + //Wizard narsie /obj/singularity/narsie/wizard diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index eb5fe86b5ed..3f9b639dc46 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -96,7 +96,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor!" + to_chat(usr, "It is fastened to the floor!") + return 0 src.dir = turn(src.dir, 270) return 1 @@ -109,7 +110,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor!" + to_chat(usr, "It is fastened to the floor!") + return 0 src.dir = turn(src.dir, 90) return 1 @@ -235,7 +237,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin "You add some wires.") temp_state++ else - user << "You need one length of cable to wire the [src.name]!" + to_chat(user, "You need one length of cable to wire the [src.name]!") + return if(2) if(iswirecutter(O))//TODO:Shock user if its on? @@ -289,7 +292,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor!" + to_chat(usr, "It is fastened to the floor!") + return 0 src.dir = turn(src.dir, 270) return 1 @@ -302,7 +306,8 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin if(usr.stat || !usr.canmove || usr.restrained()) return if (src.anchored) - usr << "It is fastened to the floor!" + to_chat(usr, "It is fastened to the floor!") + return 0 src.dir = turn(src.dir, 90) return 1 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 6723bc156c0..a5e7d111c69 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -86,7 +86,8 @@ return 1 if(!interface_control) - usr << "ERROR: Request timed out. Check wire contacts." + to_chat(usr, "ERROR: Request timed out. Check wire contacts.") + return if( href_list["close"] ) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index ba8e5d34dea..df8cceb0fdf 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -390,7 +390,8 @@ if(istype(H.glasses, /obj/item/clothing/glasses/meson)) var/obj/item/clothing/glasses/meson/MS = H.glasses if(MS.vision_flags == SEE_TURFS) - H << "You look directly into the [src.name], good thing you had your protective eyewear on!" + to_chat(H, "You look directly into the [src.name], good thing you had your protective eyewear on!") + return M.apply_effect(3, STUN) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 33a5c69fdc8..3d998c45545 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -130,10 +130,12 @@ if(term && term.dir == turn(dir, 180)) terminal = term terminal.master = src - user << "Terminal found." + to_chat(user, "Terminal found.") + break if(!terminal) - user << "No power source found." + to_chat(user, "No power source found.") + return stat &= ~BROKEN update_icon() @@ -150,21 +152,25 @@ return if(terminal) //is there already a terminal ? - user << "This SMES already has a power terminal!" + to_chat(user, "This SMES already has a power terminal!") + return if(!panel_open) //is the panel open ? - user << "You must open the maintenance panel first!" + to_chat(user, "You must open the maintenance panel first!") + return var/turf/T = get_turf(user) if (T.intact) //is the floor plating removed ? - user << "You must first remove the floor plating!" + to_chat(user, "You must first remove the floor plating!") + return var/obj/item/stack/cable_coil/C = I if(C.amount < 10) - user << "You need more wires." + to_chat(user, "You need more wires.") + return //build the terminal and link it to the network @@ -176,10 +182,12 @@ if(istype(I, /obj/item/weapon/wirecutters) && terminal && panel_open) var/turf/T = get_turf(terminal) if (T.intact) //is the floor plating removed ? - user << "You must first expose the power terminal!" + to_chat(user, "You must first expose the power terminal!") + return - user << "You begin to dismantle the power terminal..." + to_chat(user, "You begin to dismantle the power terminal...") + playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50, target = src)) @@ -302,7 +310,8 @@ //Will return 1 on failure /obj/machinery/power/smes/proc/make_terminal(const/mob/user) if (user.loc == loc) - user << "You must not be on the same tile as the [src]." + to_chat(user, "You must not be on the same tile as the [src].") + return 1 //Direction the terminal will face to @@ -314,13 +323,16 @@ tempDir = WEST var/turf/tempLoc = get_step(src, reverse_direction(tempDir)) if (istype(tempLoc, /turf/space)) - user << "You can't build a terminal on space." + to_chat(user, "You can't build a terminal on space.") + return 1 else if (istype(tempLoc)) if(tempLoc.intact) - user << "You must remove the floor plating first." + to_chat(user, "You must remove the floor plating first.") + return 1 - user << "You start adding cable to the [src]." + to_chat(user, "You start adding cable to the [src].") + if(do_after(user, 50, target = src)) var/turf/T = get_turf(user) var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 3f714c911c2..d998d93556b 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -247,7 +247,8 @@ else new /obj/machinery/power/solar(get_turf(src), src) else - user << "You need two sheets of glass to put them into a solar panel." + to_chat(user, "You need two sheets of glass to put them into a solar panel.") + return return 1 @@ -418,7 +419,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 20, target = src)) if (src.stat & BROKEN) - user << "The broken glass falls out." + to_chat(user, "The broken glass falls out.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) @@ -430,7 +432,8 @@ A.anchored = 1 qdel(src) else - user << "You disconnect the monitor." + to_chat(user, "You disconnect the monitor.") + var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm index e55a065c462..10adc4c9814 100644 --- a/code/modules/power/supermatter/sm_shard.dm +++ b/code/modules/power/supermatter/sm_shard.dm @@ -44,7 +44,8 @@ /obj/item/weapon/shard/supermatter/Crossed(AM as mob|obj) if(ismob(AM)) var/mob/M = AM - M << "\red You step on \the [src]!" + to_chat(M, "\red You step on \the [src]!") + playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -66,7 +67,8 @@ /obj/item/weapon/shard/supermatter/attack_hand(var/mob/user) if(!istype(user,/mob/living/carbon/human/nucleation)) - user << pick( "\red You think twice before touching that without protection.", + to_chat(user, pick( "\red You think twice before touching that without protection.",) + "\red You don't want to touch that without some protection.", "\red You probably should get something else to pick that up.", "\red You aren't sure that's a good idea.", diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 6f04bf82a1a..fa663b37ca6 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -224,8 +224,11 @@ message_admins("Singularity has consumed a supermatter shard and can now become stage six.") visible_message("[src] is consumed by the singularity!") for(var/mob/M in mob_list) - M << 'sound/effects/supermatter.ogg' //everyone goan know bout this - M << "A horrible screeching fills your ears, and a wave of dread washes over you..." + to_chat(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...") + qdel(src) return(gain) diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm index 0f36d7274bf..07a6ddf558e 100644 --- a/code/modules/power/switch.dm +++ b/code/modules/power/switch.dm @@ -24,18 +24,22 @@ /obj/structure/powerswitch/examine(mob/user) ..(user) if(on) - user << "The switch is in the on position" + to_chat(user, "The switch is in the on position") + else - user << "The switch is in the off position" + to_chat(user, "The switch is in the off position") + /obj/structure/powerswitch/attack_ai(mob/user) - user << "\red You're an AI. This is a manual switch. It's not going to work." + to_chat(user, "\red You're an AI. This is a manual switch. It's not going to work.") + return /obj/structure/powerswitch/attack_hand(mob/user) if(busy) - user << "\red This switch is already being toggled." + to_chat(user, "\red This switch is already being toggled.") + return ..() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 0776918c5b4..305e2c0fc9a 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -56,7 +56,8 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, /obj/singularity/energy_ball/examine(mob/user) ..() if(orbiting_balls.len) - user << "The amount of orbiting mini-balls is [orbiting_balls.len]." + to_chat(user, "The amount of orbiting mini-balls is [orbiting_balls.len].") + /obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 84437c672c3..88c7aae1995 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -168,7 +168,8 @@ /obj/machinery/treadmill_monitor/examine(mob/user) ..() - user << "The display reads:
[line1]
[line2]
" + to_chat(user, "The display reads:
[line1]
[line2]
") + /obj/machinery/treadmill_monitor/update_icon() overlays.Cut() diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 4c7b51e5ac0..0ab93b6d825 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -120,10 +120,12 @@ inturf = get_step(src, dir) locate_machinery() if(turbine) - user << "Turbine connected." + to_chat(user, "Turbine connected.") + stat &= ~BROKEN else - user << "Turbine not connected." + to_chat(user, "Turbine not connected.") + stat |= BROKEN return @@ -279,10 +281,12 @@ outturf = get_step(src, dir) locate_machinery() if(compressor) - user << "Compressor connected." + to_chat(user, "Compressor connected.") + stat &= ~BROKEN else - user << "Compressor not connected." + to_chat(user, "Compressor not connected.") + stat |= BROKEN return diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index d0c5440dc95..24c0fa2bbda 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -153,23 +153,30 @@ var/endInput = input(usr,"End turf of Map (X;Y;Z)", "Map Gen Settings", "[world.maxx];[world.maxy];[mob ? mob.z : 1]") as text //maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe if(!startInput || !endInput) - src << "Missing Input" + to_chat(src, "Missing Input") + return var/list/startCoords = splittext(startInput, ";") var/list/endCoords = splittext(endInput, ";") if(!startCoords || !endCoords) - src << "Invalid Coords" - src << "Start Input: [startInput]" - src << "End Input: [endInput]" + to_chat(src, "Invalid Coords") + + to_chat(src, "Start Input: [startInput]") + + to_chat(src, "End Input: [endInput]") + return var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3])) var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3])) if(!Start || !End) - src << "Invalid Turfs" - src << "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]" - src << "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]" + to_chat(src, "Invalid Turfs") + + to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]") + + to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]") + return var/list/clusters = list("None"=CLUSTER_CHECK_NONE,"All"=CLUSTER_CHECK_ALL,"Sames"=CLUSTER_CHECK_SAMES,"Differents"=CLUSTER_CHECK_DIFFERENTS, \ @@ -182,7 +189,8 @@ var/theCluster = 0 if(moduleClusters != "None") if(!clusters[moduleClusters]) - src << "Invalid Cluster Flags" + to_chat(src, "Invalid Cluster Flags") + return theCluster = clusters[moduleClusters] else @@ -193,9 +201,13 @@ M.clusterCheckFlags = theCluster - src << "Defining Region" + to_chat(src, "Defining Region") + N.defineRegion(Start, End) - src << "Region Defined" - src << "Generating Region" + to_chat(src, "Region Defined") + + to_chat(src, "Generating Region") + N.generate() - src << "Generated Region" + to_chat(src, "Generated Region") + diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 57ed66625ec..2bb8334967d 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -38,18 +38,21 @@ var/tmp_label = "" var/label_text = sanitize(input(user, "Inscribe some text into \the [initial(BB.name)]","Inscription",tmp_label)) if(length(label_text) > 20) - user << "\red The inscription can be at most 20 characters long." + to_chat(user, "\red The inscription can be at most 20 characters long.") else if(label_text == "") - user << "\blue You scratch the inscription off of [initial(BB)]." + to_chat(user, "\blue You scratch the inscription off of [initial(BB)].") BB.name = initial(BB.name) else - user << "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)]." + to_chat(user, "\blue You inscribe \"[label_text]\" into \the [initial(BB.name)].") BB.name = "[initial(BB.name)] \"[label_text]\"" else - user << "\blue You can only inscribe a metal bullet." //because inscribing beanbags is silly + to_chat(user, "\blue You can only inscribe a metal bullet.")//because inscribing beanbags is silly + + else - user << "\blue There is no bullet in the casing to inscribe anything into." + to_chat(user, "\blue There is no bullet in the casing to inscribe anything into.") + /obj/item/ammo_casing/proc/newshot() //For energy weapons, shotgun shells and wands (!). if (!BB) @@ -121,7 +124,8 @@ num_loaded++ if(num_loaded) if(!silent) - user << "You load [num_loaded] shell\s into \the [src]!" + to_chat(user, "You load [num_loaded] shell\s into \the [src]!") + A.update_icon() update_icon() @@ -129,7 +133,8 @@ var/obj/item/ammo_casing/A = get_round() if(A) user.put_in_hands(A) - user << "You remove a round from \the [src]!" + to_chat(user, "You remove a round from \the [src]!") + update_icon() /obj/item/ammo_box/update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 452a6dc026f..bd288a8e405 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -68,7 +68,8 @@ proc/shoot_with_empty_chamber(mob/living/user as mob|obj) - user << "*click*" + to_chat(user, "*click*") + playsound(user, 'sound/weapons/emptyclick.ogg', 40, 1) return @@ -98,30 +99,36 @@ if(istype(user, /mob/living)) var/mob/living/M = user if ((CLUMSY in M.mutations) && prob(50)) - M << "[src] blows up in your face." + to_chat(M, "[src] blows up in your face.") + M.take_organ_damage(0,20) M.drop_item() qdel(src) return if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona)) - user << "You don't have the dexterity to do this!" + to_chat(user, "You don't have the dexterity to do this!") + return if(istype(user, /mob/living)) var/mob/living/M = user if (HULK in M.mutations) - M << "Your meaty finger is much too large for the trigger guard!" + to_chat(M, "Your meaty finger is much too large for the trigger guard!") + return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.get_species() == "Golem") - user << "Your metal fingers don't fit in the trigger guard!" + to_chat(user, "Your metal fingers don't fit in the trigger guard!") + return if(H.get_species() == "Shadowling") - user << "The muzzle flash would cause damage to your form!" + to_chat(user, "The muzzle flash would cause damage to your form!") + return if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry - user << "Use of ranged weaponry would bring dishonor to the clan." + to_chat(user, "Use of ranged weaponry would bring dishonor to the clan.") + return add_fingerprint(user) @@ -131,7 +138,8 @@ if (!ready_to_fire()) if (world.time % 3) //to prevent spam - user << "[src] is not ready to fire again!" + to_chat(user, "[src] is not ready to fire again!") + return if(heavy_weapon) @@ -299,7 +307,8 @@ user.apply_damage(in_chamber.damage*2.5, in_chamber.damage_type, "head", used_weapon = "Point blank shot in the mouth with \a [in_chamber]", sharp=1) user.death() else - user << "Ow..." + to_chat(user, "Ow...") + user.apply_effect(110,STAMINA,0) del(in_chamber) mouthshoot = 0 @@ -329,10 +338,12 @@ if(can_flashlight) if(!F) if(user.l_hand != src && user.r_hand != src) - user << "You'll need [src] in your hands to do that." + to_chat(user, "You'll need [src] in your hands to do that.") + return user.drop_item() - user << "You click [S] into place on [src]." + to_chat(user, "You click [S] into place on [src].") + if(S.on) set_light(0) F = S @@ -343,10 +354,12 @@ if(istype(A, /obj/item/weapon/screwdriver)) if(F) if(user.l_hand != src && user.r_hand != src) - user << "You'll need [src] in your hands to do that." + to_chat(user, "You'll need [src] in your hands to do that.") + return for(var/obj/item/device/flashlight/seclite/S in src) - user << "You unscrew the seclite from [src]." + to_chat(user, "You unscrew the seclite from [src].") + F = null S.loc = get_turf(user) update_gunlight(user) @@ -366,9 +379,11 @@ var/mob/living/carbon/human/user = usr if(!isturf(user.loc)) - user << "You cannot turn the light on while in this [user.loc]." + to_chat(user, "You cannot turn the light on while in this [user.loc].") + F.on = !F.on - user << "You toggle the gunlight [F.on ? "on":"off"]." + to_chat(user, "You toggle the gunlight [F.on ? "on":"off"].") + playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_gunlight(user) diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index ea4c15a0596..07ea0669a2b 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -33,7 +33,8 @@ /obj/item/weapon/gun/launcher/spikethrower/examine(mob/user) ..(user) - user << "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining." + to_chat(user, "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining.") + /obj/item/weapon/gun/launcher/spikethrower/update_icon() icon_state = "spikethrower[spikes]" @@ -45,7 +46,8 @@ if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis") - user << "\red \The [src] does not respond to you!" + to_chat(user, "\red \The [src] does not respond to you!") + return 0 return 1 @@ -89,7 +91,8 @@ if(H.species.name == "Vox Armalis") ..() return - user << "\red \The [src] is far too large for you to pick up." + to_chat(user, "\red \The [src] is far too large for you to pick up.") + return /obj/item/weapon/gun/energy/noisecannon/process_chambered() //Does not have ammo. diff --git a/code/modules/projectiles/guns/energy/advtaser.dm b/code/modules/projectiles/guns/energy/advtaser.dm index f617db1122b..fdeba3bd119 100644 --- a/code/modules/projectiles/guns/energy/advtaser.dm +++ b/code/modules/projectiles/guns/energy/advtaser.dm @@ -21,7 +21,8 @@ mode = 1 charge_cost = 500 fire_sound = 'sound/weapons/taser2.ogg' - user << "\red [src.name] is now set to Disable." + to_chat(user, "\red [src.name] is now set to Disable.") + projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "advtaserdisable" fire_delay = 0 @@ -29,7 +30,8 @@ mode = 0 charge_cost = 2000 fire_sound = 'sound/weapons/Taser.ogg' - user << "\red [src.name] is now set to stun." + to_chat(user, "\red [src.name] is now set to stun.") + projectile_type = "/obj/item/projectile/energy/electrode" modifystate = "advtaserstun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/blueshield.dm b/code/modules/projectiles/guns/energy/blueshield.dm index 1ba9e26eba1..d136a75e834 100644 --- a/code/modules/projectiles/guns/energy/blueshield.dm +++ b/code/modules/projectiles/guns/energy/blueshield.dm @@ -21,7 +21,8 @@ projectile_type = "/obj/item/projectile/beam" modifystate = "bsgun_kill" - user << "You adjust [src.name] to the kill setting." + to_chat(user, "You adjust [src.name] to the kill setting.") + else fire_mode = 0 @@ -32,6 +33,7 @@ fire_sound = 'sound/weapons/gunshot.ogg' modifystate = "bsgun_stun" - user << "You adjust [src.name] to the stun setting." + to_chat(user, "You adjust [src.name] to the stun setting.") + update_icon() \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/hos.dm b/code/modules/projectiles/guns/energy/hos.dm index c48a7ee3398..14f9c82e4f8 100644 --- a/code/modules/projectiles/guns/energy/hos.dm +++ b/code/modules/projectiles/guns/energy/hos.dm @@ -18,7 +18,8 @@ mode = 0 charge_cost = 1000 fire_sound = 'sound/weapons/Laser.ogg' - user << "\red [src.name] is now set to kill." + to_chat(user, "\red [src.name] is now set to kill.") + projectile_type = "/obj/item/projectile/beam" modifystate = "hoslaserkill" fire_delay = 0 @@ -26,7 +27,8 @@ mode = 1 charge_cost = 500 fire_sound = 'sound/weapons/taser2.ogg' - user << "\red [src.name] is now set to disable." + to_chat(user, "\red [src.name] is now set to disable.") + projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "hoslaserdisable" fire_delay = 0 @@ -34,7 +36,8 @@ mode = 2 charge_cost = 2000 fire_sound = 'sound/weapons/taser.ogg' - user << "\red [src.name] is now set to stun." + to_chat(user, "\red [src.name] is now set to stun.") + projectile_type = "/obj/item/projectile/energy/electrode" modifystate = "hoslaserstun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 2c0eb581bde..c1243cf0911 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -125,7 +125,8 @@ obj/item/weapon/gun/energy/laser/retro if(ishuman(M)) if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag)) return 1 - M << "\red You need to be wearing your laser tag vest!" + to_chat(M, "\red You need to be wearing your laser tag vest!") + return 0 /obj/item/weapon/gun/energy/laser/redtag @@ -143,5 +144,6 @@ obj/item/weapon/gun/energy/laser/retro if(ishuman(M)) if(istype(M.wear_suit, /obj/item/clothing/suit/redtag)) return 1 - M << "\red You need to be wearing your laser tag vest!" + to_chat(M, "\red You need to be wearing your laser tag vest!") + return 0 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index edfcd01d211..1b9b955721d 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -19,14 +19,16 @@ mode = 1 charge_cost = 1000 fire_sound = 'sound/weapons/Laser.ogg' - user << "\red [src.name] is now set to kill." + to_chat(user, "\red [src.name] is now set to kill.") + projectile_type = "/obj/item/projectile/beam" modifystate = "energykill" if(1) mode = 0 charge_cost = 500 fire_sound = 'sound/weapons/Taser2.ogg' - user << "\red [src.name] is now set to disable." + to_chat(user, "\red [src.name] is now set to disable.") + projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "energystun" update_icon() @@ -96,16 +98,20 @@ if (prob(src.reliability)) for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (src in M.contents) - M << "\red Your gun feels pleasantly warm for a moment." + to_chat(M, "\red Your gun feels pleasantly warm for a moment.") + else - M << "\red You feel a warm sensation." + to_chat(M, "\red You feel a warm sensation.") + M.apply_effect(rand(3,120), IRRADIATE) lightfail = 1 else for (var/mob/living/M in range(rand(1,4),src)) //Big failure, TIME FOR RADIATION BITCHES if (src in M.contents) - M << "\red Your gun's reactor overloads!" - M << "\red You feel a wave of heat wash over you." + to_chat(M, "\red Your gun's reactor overloads!") + + to_chat(M, "\red You feel a wave of heat wash over you.") + M.apply_effect(300, IRRADIATE) crit_fail = 1 //break the gun so it stops recharging processing_objects.Remove(src) @@ -173,7 +179,8 @@ mode = 1 charge_cost = 500 fire_sound = 'sound/weapons/Laser.ogg' - user << "\red [src.name] is now set to kill." + to_chat(user, "\red [src.name] is now set to kill.") + projectile_type = /obj/item/projectile/beam modifystate = "energykill" fire_delay = 0 @@ -181,7 +188,8 @@ mode = 0 charge_cost = 1000 fire_sound = 'sound/weapons/Taser.ogg' - user << "\red [src.name] is now set to stun." + to_chat(user, "\red [src.name] is now set to stun.") + projectile_type = /obj/item/projectile/energy/electrode modifystate = "energystun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index ffb075c8c34..88d14a67e36 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -21,19 +21,22 @@ mode = 0 charge_cost = 50 fire_sound = 'sound/weapons/Taser.ogg' - user << "\red [src.name] is now set to stun." + to_chat(user, "\red [src.name] is now set to stun.") + projectile_type = "/obj/item/projectile/energy/electrode" if(0) mode = 1 charge_cost = 100 fire_sound = 'sound/weapons/Laser.ogg' - user << "\red [src.name] is now set to kill." + to_chat(user, "\red [src.name] is now set to kill.") + projectile_type = "/obj/item/projectile/beam" if(1) mode = 2 charge_cost = 200 fire_sound = 'sound/weapons/pulse.ogg' - user << "\red [src.name] is now set to DESTROY." + to_chat(user, "\red [src.name] is now set to DESTROY.") + projectile_type = "/obj/item/projectile/beam/pulse" return @@ -58,7 +61,8 @@ cell_type = "/obj/item/weapon/stock_parts/cell/infinite" attack_self(mob/living/user as mob) - user << "\red [src.name] has three settings, and they are all DESTROY." + to_chat(user, "\red [src.name] has three settings, and they are all DESTROY.") + /obj/item/weapon/gun/energy/pulse_rifle/carbine name = "pulse carbine" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c5002a03acf..2a157bf667c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -50,13 +50,15 @@ if(0) mode = 1 charge_cost = 1000 - user << "\red The [src.name] is now set to increase yield." + to_chat(user, "\red The [src.name] is now set to increase yield.") + projectile_type = "/obj/item/projectile/energy/florayield" modifystate = "florayield" if(1) mode = 0 charge_cost = 1000 - user << "\red The [src.name] is now set to induce mutations." + to_chat(user, "\red The [src.name] is now set to induce mutations.") + projectile_type = "/obj/item/projectile/energy/floramut" modifystate = "floramut" update_icon() @@ -117,11 +119,13 @@ obj/item/weapon/gun/energy/staff/focus attack_self(mob/living/user as mob) if(projectile_type == "/obj/item/projectile/forcebolt") charge_cost = 200 - user << "\red The [src.name] will now strike a small area." + to_chat(user, "\red The [src.name] will now strike a small area.") + projectile_type = "/obj/item/projectile/forcebolt/strong" else charge_cost = 100 - user << "\red The [src.name] will now strike only a single person." + to_chat(user, "\red The [src.name] will now strike only a single person.") + projectile_type = "/obj/item/projectile/forcebolt" */ @@ -174,10 +178,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. set name = "Use Sniper Scope" set popup_menu = 0 if(usr.stat || !(istype(usr,/mob/living/carbon/human))) - usr << "You are unable to focus down the scope of the rifle." + to_chat(usr, "You are unable to focus down the scope of the rifle.") + return if(!zoom && usr.get_active_hand() != src) - usr << "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better" + to_chat(usr, "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better") + return if(usr.client.view == world.view) @@ -191,7 +197,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!usr.hud_used.hud_shown) usr.button_pressed_F12(1) zoom = 0 - usr << "Zoom mode [zoom?"en":"dis"]abled." + to_chat(usr, "Zoom mode [zoom?"en":"dis"]abled.") + /obj/item/weapon/gun/energy/kinetic_accelerator @@ -241,7 +248,8 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(!silenced) playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) else if(user) - usr << "You silently charge [src]." + to_chat(usr, "You silently charge [src].") + recently_fired = 0 update_icon() @@ -292,18 +300,21 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. /obj/item/weapon/gun/energy/plasmacutter/examine(mob/user) ..(user) if(power_supply) - user <<"[src] is [round(power_supply.percent())]% charged." + to_chat(user, "[src] is [round(power_supply.percent())]% charged.") + /obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user) if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/S = A S.use(1) power_supply.give(10000) - user << "You insert [A] in [src], recharging it." + to_chat(user, "You insert [A] in [src], recharging it.") + else if(istype(A, /obj/item/weapon/ore/plasma)) qdel(A) power_supply.give(5000) - user << "You insert [A] in [src], recharging it." + to_chat(user, "You insert [A] in [src], recharging it.") + else ..() @@ -376,12 +387,14 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. switch(mode) if(0) mode = 1 - user << "[name] is now set to orange." + to_chat(user, "[name] is now set to orange.") + projectile_type = "/obj/item/projectile/beam/wormhole/orange" modifystate = "wormhole_projector_orange" if(1) mode = 0 - user << "[name] is now set to blue." + to_chat(user, "[name] is now set to blue.") + projectile_type = "/obj/item/projectile/beam/wormhole" modifystate = "wormhole_projector" update_icon() diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 8d33a9e2508..88f92bad688 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -42,7 +42,8 @@ /obj/item/weapon/gun/energy/temperature/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W, /obj/item/weapon/card/emag) && !emagged) emagged = 1 - user << "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!" + to_chat(user, "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!") + desc = "A gun that changes the body temperature of its targets. Its temperature cap has been hacked." /obj/item/weapon/gun/energy/temperature/Topic(href, href_list) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 57c3ca2628c..c4e382ffbdc 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -33,7 +33,8 @@ if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - user << "You know better than to violate the security of The Den, best wait until you leave to use [src]." + to_chat(user, "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 @@ -62,5 +63,6 @@ return /obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) - user << "The [name] whizzles quietly." + to_chat(user, "The [name] whizzles quietly.") + return \ No newline at end of file diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index eb4bf5c37d1..bd922c6a9cf 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -27,13 +27,15 @@ /obj/item/weapon/gun/magic/wand/examine(mob/user) ..(user) - user << "Has [charges] charge\s remaining." + to_chat(user, "Has [charges] charge\s remaining.") + /obj/item/weapon/gun/magic/wand/attack_self(mob/living/user as mob) if(charges) zap_self(user) else - user << "The [name] whizzles quietly." + to_chat(user, "The [name] whizzles quietly.") + ..() /obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob) @@ -43,7 +45,8 @@ /obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob) if(!charges && !drained) - user << "The [name] whizzles quietly." + to_chat(user, "The [name] whizzles quietly.") + icon_state = "[icon_state]-drained" drained = 1 return @@ -51,7 +54,8 @@ if(no_den_usage) var/area/A = get_area(user) if(istype(A, /area/wizard_station)) - user << "You know better than to violate the security of The Den, best wait until you leave to use [src]." + to_chat(user, "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 @@ -73,7 +77,8 @@ if(alert(user, "You really want to zap yourself with the wand of death?",, "Yes", "No") == "Yes" && charges && user.get_active_hand() == src && isliving(user)) var/message ="You irradiate yourself with pure energy! " message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?") - user << message + to_chat(user, message) + user.adjustOxyLoss(500) charges-- ..() @@ -95,7 +100,8 @@ user.radiation = 0 user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss()) user.reagents.clear_reagents() - user << "You feel great!" + to_chat(user, "You feel great!") + charges-- ..() diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index f7b61436dfe..a01cf749057 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -66,22 +66,26 @@ user.remove_from_mob(AM) magazine = AM magazine.loc = src - user << "You load a new magazine into \the [src]." + to_chat(user, "You load a new magazine into \the [src].") + chamber_round() A.update_icon() update_icon() return 1 else if (magazine) - user << "There's already a magazine in \the [src]." + to_chat(user, "There's already a magazine in \the [src].") + if(istype(A, /obj/item/weapon/suppressor)) var/obj/item/weapon/suppressor/S = A if(can_suppress) if(!silenced) if(user.l_hand != src && user.r_hand != src) - user << "You'll need [src] in your hands to do that." + to_chat(user, "You'll need [src] in your hands to do that.") + return user.drop_item() - user << "You screw [S] onto [src]." + to_chat(user, "You screw [S] onto [src].") + silenced = A S.oldsound = fire_sound S.initial_w_class = w_class @@ -91,10 +95,12 @@ update_icon() return else - user << "[src] already has a suppressor." + to_chat(user, "[src] already has a suppressor.") + return else - user << "You can't seem to figure out how to fit [S] on [src]." + to_chat(user, "You can't seem to figure out how to fit [S] on [src].") + return return 0 @@ -105,7 +111,8 @@ if(user.l_hand != src && user.r_hand != src) ..() return - user << "You unscrew [silenced] from [src]." + to_chat(user, "You unscrew [silenced] from [src].") + user.put_in_hands(silenced) fire_sound = S.oldsound w_class = S.initial_w_class @@ -120,15 +127,18 @@ user.put_in_hands(magazine) magazine.update_icon() magazine = null - user << "You pull the magazine out of \the [src]!" + to_chat(user, "You pull the magazine out of \the [src]!") + else - user << "There's no magazine in \the [src]." + to_chat(user, "There's no magazine in \the [src].") + update_icon() return /obj/item/weapon/gun/projectile/examine(mob/user) ..(user) - user << "Has [get_ammo()] round\s remaining." + to_chat(user, "Has [get_ammo()] round\s remaining.") + /obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1) var/boolets = 0 //mature var names for mature people diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index ee8d7be812f..148cac3cd6d 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -36,12 +36,14 @@ var/obj/item/ammo_box/magazine/AM = A if(istype(AM, text2path(mag_type))) if(magazine) - user << "You perform a tactical reload on \the [src], replacing the magazine." + to_chat(user, "You perform a tactical reload on \the [src], replacing the magazine.") + magazine.forceMove(get_turf(src.loc)) magazine.update_icon() magazine = null else - user << "You insert the magazine into \the [src]." + to_chat(user, "You insert the magazine into \the [src].") + user.remove_from_mob(AM) magazine = AM magazine.forceMove(src) @@ -59,11 +61,13 @@ if(!select) burst_size = 1 fire_delay = 0 - user << "You switch to semi-automatic." + to_chat(user, "You switch to semi-automatic.") + else burst_size = initial(burst_size) fire_delay = initial(fire_delay) - user << "You switch to [burst_size] round burst." + to_chat(user, "You switch to [burst_size] round burst.") + playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() @@ -144,7 +148,8 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) cover_open = !cover_open - user << "You [cover_open ? "open" : "close"] [src]'s cover." + to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") + update_icon() /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon() @@ -154,7 +159,8 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays if(cover_open) - user << "[src]'s cover is open! Close it before firing!" + to_chat(user, "[src]'s cover is open! Close it before firing!") + else ..() update_icon() @@ -172,12 +178,14 @@ user.put_in_hands(magazine) magazine = null update_icon() - user << "You remove the magazine from [src]." + to_chat(user, "You remove the magazine from [src].") + /obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params) if(!cover_open && istype(A, mag_type)) - user << "[src]'s cover is closed! You can't insert a new mag!" + to_chat(user, "[src]'s cover is closed! You can't insert a new mag!") + return ..() @@ -246,15 +254,18 @@ select = 1 burst_size = initial(burst_size) fire_delay = initial(fire_delay) - user << "You switch to [burst_size] round burst." + to_chat(user, "You switch to [burst_size] round burst.") + if(1) select = 2 - user << "You switch to grenades." + to_chat(user, "You switch to grenades.") + if(2) select = 0 burst_size = 1 fire_delay = 0 - user << "You switch to semi-auto." + to_chat(user, "You switch to semi-auto.") + playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() return diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm index bc87fcb999a..f4c5ec993f7 100644 --- a/code/modules/projectiles/guns/projectile/crossbow.dm +++ b/code/modules/projectiles/guns/projectile/crossbow.dm @@ -42,7 +42,8 @@ /obj/item/weapon/arrow/rod/removed(mob/user) if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow. - user << "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow." + to_chat(user, "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.") + var/obj/item/weapon/shard/shrapnel/S = new() S.loc = get_turf(src) qdel(src) @@ -80,7 +81,8 @@ /obj/item/weapon/gun/launcher/crossbow/special_check(user) if(tension <= 0) - user << "\red \The [src] is not drawn back!" + to_chat(user, "\red \The [src] is not drawn back!") + return 0 return 1 @@ -111,7 +113,8 @@ /obj/item/weapon/gun/launcher/crossbow/proc/draw(var/mob/user as mob) if(!in_chamber) - user << "You don't have anything nocked to [src]." + to_chat(user, "You don't have anything nocked to [src].") + return if(user.restrained()) @@ -132,7 +135,8 @@ if(tension>=max_tension) tension = max_tension - usr << "[src] clunks as you draw the string to its maximum tension!" + to_chat(usr, "[src] clunks as you draw the string to its maximum tension!") + else user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") spawn(25) increase_tension(user) @@ -162,19 +166,23 @@ user.drop_item() W.loc = src cell = W - user << "You jam [cell] into [src] and wire it to the firing coil." + to_chat(user, "You jam [cell] into [src] and wire it to the firing coil.") + superheat_rod(user) else - user << "[src] already has a cell installed." + to_chat(user, "[src] already has a cell installed.") + else if(istype(W, /obj/item/weapon/screwdriver)) if(cell) var/obj/item/C = cell C.loc = get_turf(user) - user << "You jimmy [cell] out of [src] with [W]." + to_chat(user, "You jimmy [cell] out of [src] with [W].") + cell = null else - user << "[src] doesn't have a cell installed." + to_chat(user, "[src] doesn't have a cell installed.") + else ..() @@ -186,7 +194,8 @@ if(in_chamber.throwforce >= 15) return if(!istype(in_chamber,/obj/item/weapon/arrow/rod)) return - user << "[in_chamber] plinks and crackles as it begins to glow red-hot." + to_chat(user, "[in_chamber] plinks and crackles as it begins to glow red-hot.") + in_chamber.throwforce = 15 in_chamber.icon_state = "metal-rod-superheated" cell.use(500) @@ -229,7 +238,8 @@ if(tension>=max_tension) tension = max_tension - usr << "[src] clunks as you draw the string to its maximum tension!" + to_chat(usr, "[src] clunks as you draw the string to its maximum tension!") + else user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") spawn(25) increase_tension(user) @@ -249,11 +259,21 @@ /obj/item/weapon/crossbowframe/examine(mob/user) ..(user) switch(buildstate) - if(1) user << "It has a loose rod frame in place." - if(2) user << "It has a steel backbone welded in place." - if(3) user << "It has a steel backbone and a cell mount installed." - if(4) user << "It has a steel backbone, plastic lath and a cell mount installed." - if(5) user << "It has a steel cable loosely strung across the lath." + if(1) + to_chat(user, "It has a loose rod frame in place.") + + if(2) + to_chat(user, "It has a steel backbone welded in place.") + + if(3) + to_chat(user, "It has a steel backbone and a cell mount installed.") + + if(4) + to_chat(user, "It has a steel backbone, plastic lath and a cell mount installed.") + + if(5) + to_chat(user, "It has a steel cable loosely strung across the lath.") + /obj/item/weapon/crossbowframe/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/stack/rods)) @@ -261,11 +281,13 @@ var/obj/item/stack/rods/R = W if(R.amount >= 3) R.use(3) - user << "\blue You assemble a backbone of rods around the wooden stock." + to_chat(user, "\blue You assemble a backbone of rods around the wooden stock.") + buildstate++ update_icon() else - user << "\blue You need at least three rods to complete this task." + to_chat(user, "\blue You need at least three rods to complete this task.") + return else if(istype(W,/obj/item/weapon/weldingtool)) if(buildstate == 1) @@ -273,7 +295,8 @@ if(T.remove_fuel(0,user)) if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) - user << "\blue You weld the rods into place." + to_chat(user, "\blue You weld the rods into place.") + buildstate++ update_icon() return @@ -282,35 +305,42 @@ if(buildstate == 2) if(C.amount >= 5) C.use(5) - user << "\blue You wire a crude cell mount into the top of the crossbow." + to_chat(user, "\blue You wire a crude cell mount into the top of the crossbow.") + buildstate++ update_icon() else - user << "\blue You need at least five segments of cable coil to complete this task." + to_chat(user, "\blue You need at least five segments of cable coil to complete this task.") + return else if(buildstate == 4) if(C.amount >= 5) C.use(5) - user << "\blue You string a steel cable across the crossbow's lath." + to_chat(user, "\blue You string a steel cable across the crossbow's lath.") + buildstate++ update_icon() else - user << "\blue You need at least five segments of cable coil to complete this task." + to_chat(user, "\blue You need at least five segments of cable coil to complete this task.") + return else if(istype(W,/obj/item/stack/sheet/mineral/plastic)) if(buildstate == 3) var/obj/item/stack/sheet/mineral/plastic/P = W if(P.amount >= 3) P.use(3) - user << "\blue You assemble and install a heavy plastic lath onto the crossbow." + to_chat(user, "\blue You assemble and install a heavy plastic lath onto the crossbow.") + buildstate++ update_icon() else - user << "\blue You need at least three plastic sheets to complete this task." + to_chat(user, "\blue You need at least three plastic sheets to complete this task.") + return else if(istype(W,/obj/item/weapon/screwdriver)) if(buildstate == 5) - user << "\blue You secure the crossbow's various parts." + to_chat(user, "\blue You secure the crossbow's various parts.") + new /obj/item/weapon/gun/launcher/crossbow(get_turf(src)) qdel(src) return diff --git a/code/modules/projectiles/guns/projectile/grenade launcher.dm b/code/modules/projectiles/guns/projectile/grenade launcher.dm index d4b2c6fc167..f8d4f5161a3 100644 --- a/code/modules/projectiles/guns/projectile/grenade launcher.dm +++ b/code/modules/projectiles/guns/projectile/grenade launcher.dm @@ -29,7 +29,8 @@ //Override this to avoid a runtime with suicide handling. /obj/item/weapon/gun/launcher/attack(mob/living/M as mob, mob/living/user as mob, def_zone) if (M == user && user.zone_sel.selecting == "mouth") - user << "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it." + to_chat(user, "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.") + return ..() @@ -39,7 +40,8 @@ /obj/item/weapon/gun/launcher/Fire(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, params, reflex = 0) if (!user.IsAdvancedToolUser()) - user << "\red You don't have the dexterity to do this!" + to_chat(user, "\red You don't have the dexterity to do this!") + return 0 add_fingerprint(user) @@ -55,7 +57,8 @@ if (!ready_to_fire()) if (world.time % 3) //to prevent spam - user << "[src] is not ready to fire again!" + to_chat(user, "[src] is not ready to fire again!") + return 0 if(!chamber_round()) //CHECK diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 5803a4fa2be..8b3d522592c 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -32,7 +32,8 @@ AC.loc = src num_loaded++ if(num_loaded) - user << "You load [num_loaded] shell\s into \the [src]!" + to_chat(user, "You load [num_loaded] shell\s into \the [src]!") + A.update_icon() update_icon() chamber_round() @@ -48,9 +49,11 @@ CB.update_icon() num_unloaded++ if (num_unloaded) - user << "You unload [num_unloaded] shell\s from [src]!" + to_chat(user, "You unload [num_unloaded] shell\s from [src]!") + else - user << "[src] is empty." + to_chat(user, "[src] is empty.") + /obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) var/boolets = 0 //mature var names for mature people @@ -62,7 +65,8 @@ /obj/item/weapon/gun/projectile/revolver/examine(mob/user) ..(user) - user << "[get_ammo(0,0)] of those are live rounds." + to_chat(user, "[get_ammo(0,0)] of those are live rounds.") + /obj/item/weapon/gun/projectile/revolver/verb/spin_revolver() set name = "Spin cylinder" @@ -98,7 +102,8 @@ if(!ghettomodded) return 1 if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 - M << "[src] blows up in your face!" + to_chat(M, "[src] blows up in your face!") + M.take_organ_damage(0,20) M.drop_item() qdel(src) @@ -115,7 +120,8 @@ if(src && input && !M.stat && in_range(M,src)) name = input - M << "You name the gun [input]. Say hello to your new friend." + to_chat(M, "You name the gun [input]. Say hello to your new friend.") + return 1 /obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun() @@ -134,21 +140,24 @@ if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] - M << "Your gun is now skinned as [choice]. Say hello to your new friend." + to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.") + return 1 /obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params) ..() if(istype(A, /obj/item/weapon/screwdriver) || istype(A, /obj/item/weapon/conversion_kit)) if(magazine.caliber == "38") - user << "You begin to reinforce the barrel of [src]." + to_chat(user, "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!") return if(do_after(user, 30, target = src)) if(magazine.ammo_count()) - user << "You can't modify it!" + to_chat(user, "You can't modify it!") + return if (istype(A, /obj/item/weapon/conversion_kit)) ghettomodded = 0 @@ -156,21 +165,25 @@ ghettomodded = 1 magazine.caliber = "357" desc = "[initial(desc)] The barrel and chamber assembly seems to have been modified." - user << "You reinforce the barrel of [src]! Now it will fire .357 rounds." + to_chat(user, "You reinforce the barrel of [src]! Now it will fire .357 rounds.") + else - user << "You begin to revert the modifications to [src]." + to_chat(user, "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!") return if(do_after(user, 30, target = src)) if(magazine.ammo_count()) - user << "You can't modify it!" + to_chat(user, "You can't modify it!") + return ghettomodded = 0 magazine.caliber = "38" desc = initial(desc) - user << "You remove the modifications on [src]! Now it will fire .38 rounds." + to_chat(user, "You remove the modifications on [src]! Now it will fire .38 rounds.") + diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index ecb1c5a03cd..f791a1da1c7 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -18,7 +18,8 @@ /obj/item/weapon/gun/rocketlauncher/examine(mob/user) if(..(user, 2)) - user << "\blue [rockets.len] / [max_rockets] rockets." + to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.") + /obj/item/weapon/gun/rocketlauncher/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/ammo_casing/rocket)) @@ -26,10 +27,13 @@ user.drop_item() I.loc = src rockets += I - user << "\blue You put the rocket in [src]." - user << "\blue [rockets.len] / [max_rockets] rockets." + to_chat(user, "\blue You put the rocket in [src].") + + to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.") + else - usr << "\red [src] cannot hold more rockets." + to_chat(usr, "\red [src] cannot hold more rockets.") + /obj/item/weapon/gun/rocketlauncher/can_fire() return rockets.len @@ -47,4 +51,5 @@ qdel(I) return else - usr << "\red [src] is empty." \ No newline at end of file + to_chat(usr, "\red [src] is empty.") + diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index 8e057695b3a..c300748a98d 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -29,7 +29,8 @@ AC.loc = src num_loaded++ if(num_loaded) - user << "You load [num_loaded] shell\s into \the [src]!" + to_chat(user, "You load [num_loaded] shell\s into \the [src]!") + A.update_icon() update_icon() @@ -72,7 +73,8 @@ /obj/item/weapon/gun/projectile/shotgun/examine(mob/user) ..(user) if (chambered) - user << "A [chambered.BB ? "live" : "spent"] one is in the chamber." + to_chat(user, "A [chambered.BB ? "live" : "spent"] one is in the chamber.") + /obj/item/weapon/gun/projectile/shotgun/isHandgun() //You cannot, in fact, holster a shotgun. return 0 @@ -117,13 +119,15 @@ /obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob) if(!bolt_open) - user << "The bolt is closed!" + to_chat(user, "The bolt is closed!") + return . = ..() /obj/item/weapon/gun/projectile/shotgun/boltaction/examine(mob/user) ..(user) - user << "The bolt is [bolt_open ? "open" : "closed"]." + to_chat(user, "The bolt is [bolt_open ? "open" : "closed"].") + /obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted name = "enchanted bolt action rifle" @@ -191,9 +195,11 @@ CB.update_icon() num_unloaded++ if (num_unloaded) - user << "You break open \the [src] and unload [num_unloaded] shell\s." + to_chat(user, "You break open \the [src] and unload [num_unloaded] shell\s.") + else - user << "[src] is empty." + to_chat(user, "[src] is empty.") + /obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns return 0 @@ -219,10 +225,12 @@ if(C.use(10)) slot_flags = SLOT_BACK icon_state = "ishotgunsling" - user << "You tie the lengths of cable to the shotgun, making a sling." + to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") + update_icon() else - user << "You need at least ten lengths of cable if you want to make a sling." + to_chat(user, "You need at least ten lengths of cable if you want to make a sling.") + return // Sawing guns related procs // @@ -236,7 +244,8 @@ /obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) if(sawn_state == SAWN_OFF) - user << "\The [src] is already shortened." + to_chat(user, "\The [src] is already shortened.") + return if(sawn_state == SAWN_SAWING) diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 672f683e3b2..01b41bb0c13 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -30,11 +30,13 @@ /obj/item/weapon/gun/syringe/examine(mob/user) ..(user) - user << "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining." + to_chat(user, "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining.") + /obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob) if(!syringes.len) - user << "[src] is empty." + to_chat(user, "[src] is empty.") + return 0 var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len] @@ -43,7 +45,8 @@ S.forceMove(user.loc) syringes.Remove(S) - user << "You unload [S] from \the [src]!" + to_chat(user, "You unload [S] from \the [src]!") + return 1 @@ -51,12 +54,14 @@ if(istype(A, /obj/item/weapon/reagent_containers/syringe)) if(syringes.len < max_syringes) user.drop_item() - user << "You load [A] into \the [src]!" + to_chat(user, "You load [A] into \the [src]!") + syringes.Add(A) A.forceMove(src) return 1 else - usr << "[src] cannot hold more syringes." + to_chat(usr, "[src] cannot hold more syringes.") + return 0 /obj/item/weapon/gun/syringe/rapidsyringe diff --git a/code/modules/projectiles/medbeam.dm b/code/modules/projectiles/medbeam.dm index ba93e9703ba..ca210f345b0 100644 --- a/code/modules/projectiles/medbeam.dm +++ b/code/modules/projectiles/medbeam.dm @@ -67,7 +67,8 @@ if(get_dist(H,current_target)>max_range || !los_check(H,current_target)) LoseTarget() - H << "You lose control of the beam!" + to_chat(H, "You lose control of the beam!") + return if(current_target) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 0ce3b3c63ba..d329a5f7a96 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -140,7 +140,8 @@ return if(silenced) playsound(loc, hitsound, 5, 1, -1) - M << "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!" + to_chat(M, "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!") + else playsound(loc, hitsound, 20, 1, -1) visible_message("\red [A.name] is hit by the [src.name] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter @@ -209,7 +210,8 @@ if(!Angle) Angle=round(Get_Angle(src,current)) - //world << "[Angle] angle" +// to_chat(world, "[Angle] angle") + //overlays.Cut() //var/icon/I=new(initial(icon),icon_state) //using initial(icon) makes sure that the angle for that is reset as well //I.Turn(Angle) @@ -229,23 +231,27 @@ var/new_y = y //Not sure if using whiles for this is good while(pixel_x_offset > 16) - //world << "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]" +// to_chat(world, "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]") + pixel_x_offset -= 32 pixel_x -= 32 new_x++// x++ while(pixel_x_offset < -16) - //world << "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]" +// to_chat(world, "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]") + pixel_x_offset += 32 pixel_x += 32 new_x-- while(pixel_y_offset > 16) - //world << "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]" +// to_chat(world, "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]") + pixel_y_offset -= 32 pixel_y -= 32 new_y++ while(pixel_y_offset < -16) - //world << "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]" +// to_chat(world, "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]") + pixel_y_offset += 32 pixel_y += 32 new_y-- diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 319633e6277..29b1295691f 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -239,16 +239,19 @@ f.break_tile() f.hotspot_expose(1000,CELL_VOLUME) if((x == 1 || x == world.maxx || y == 1 || y == world.maxy)) - //world << "deleting" +// to_chat(world, "deleting") + //qdel(src) //Delete if it passes the world edge broken = 1 return if(kill_count < 1) - //world << "deleting" +// to_chat(world, "deleting") + //qdel(src) broken = 1 kill_count-- - //world << "[x] [y]" +// to_chat(world, "[x] [y]") + if(!bumped && !isturf(original)) if(loc == get_turf(original)) if(!(original in permutated)) @@ -263,7 +266,8 @@ Bump(original) first = 0 if(broken) - //world << "breaking" +// to_chat(world, "breaking") + break else last = get_turf(src.loc) @@ -274,7 +278,8 @@ qdel(src) return /*cleanup(reference) //Waits .3 seconds then removes the overlay. - //world << "setting invisibility" +// to_chat(world, "setting invisibility") + sleep(50) src.invisibility = 101 return*/ diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 5b740a0699b..7a4c6f937f7 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -67,9 +67,11 @@ ghost.reenter_corpse() break if(old_stat != DEAD) - target << "You feel great!" + to_chat(target, "You feel great!") + else - target << "You rise with a start, you're alive!!!" + to_chat(target, "You rise with a start, you're alive!!!") + /obj/item/projectile/magic/teleport name = "bolt of teleportation" @@ -238,7 +240,8 @@ proc/wabbajack(mob/living/M) else new_mob.key = M.key - new_mob << "Your form morphs into that of a [randomize]." + to_chat(new_mob, "Your form morphs into that of a [randomize].") + qdel(M) return new_mob @@ -262,8 +265,10 @@ proc/wabbajack(mob/living/M) S.icon = change.icon if(H.mind) H.mind.transfer_to(S) - S << "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!" - S << "Do not harm [firer.name], your creator." + to_chat(S, "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!") + + to_chat(S, "Do not harm [firer.name], your creator.") + H = change H.loc = S qdel(src) diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index 3ef440f6f2e..be32a5a58af 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -3,9 +3,11 @@ set category = "Object" firerate = !firerate if (firerate == 0) - loc << "You will now continue firing when your target moves." + to_chat(loc, "You will now continue firing when your target moves.") + else - loc << "You will now only fire once, then lower your aim, when your target moves." + to_chat(loc, "You will now only fire once, then lower your aim, when your target moves.") + /obj/item/weapon/gun/verb/lower_aim() set name = "Lower Aim" @@ -84,7 +86,8 @@ if(firing_check == 1) Fire(T,usr, reflex = 1) else if(!told_cant_shoot) - M << "\red They can't be hit from here!" + to_chat(M, "\red They can't be hit from here!") + told_cant_shoot = 1 spawn(30) told_cant_shoot = 0 @@ -101,7 +104,8 @@ #define SIGN(X) ((X<0)?-1:1) proc/GunTrace(X1,Y1,X2,Y2,Z=1,exc_obj,PX1=16,PY1=16,PX2=16,PY2=16) - //bluh << "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z]." +// to_chat(bluh, "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z].") + var/turf/T var/mob/living/M if(X1==X2) @@ -152,20 +156,22 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. I.target += src else if(I.target.len >= 5) if(ismob(I.loc)) - I.loc << "You can only target 5 people at once!" + to_chat(I.loc, "You can only target 5 people at once!") + return else return for(var/mob/living/K in viewers(usr)) - K << 'sound/weapons/TargetOn.ogg' + to_chat(K, 'sound/weapons/TargetOn.ogg') + if(!targeted_by) targeted_by = list() targeted_by += I I.lock_time = world.time + 20 //Target has 2 second to realize they're targeted and stop (or target the opponent). - src << "((\red Your character is being targeted. They have 2 seconds to stop any click or move actions. \black While targeted, they may \ - drag and drop items in or into the map, speak, and click on interface buttons. Clicking on the map objects (floors and walls are fine), their items \ - (other than a weapon to de-target), or moving will result in being fired upon. \red The aggressor may also fire manually, \ - so try not to get on their bad side.\black ))" + to_chat(src, "((Your character is being targeted. They have 2 seconds to stop any click or move actions. \ + While targeted, they may drag and drop items in or into the map, speak, and click on interface buttons. \ + Clicking on the map objects (floors and walls are fine), their items (other than a weapon to de-target), or moving will result in being fired upon. \ + The aggressor may also fire manually, so try not to get on their bad side.))") if(targeted_by.len == 1) spawn(0) @@ -186,7 +192,9 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. I.lower_aim() return /*if(m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0 && (ishuman(T))) - src << "\red Your move intent is now set to walk, as your targeter permits it." //Self explanitory. + to_chat(src, "\red Your move intent is now set to walk, as your targeter permits it.")//Self explanitory. + + set_m_intent("walk")*/ //Processing the aiming. Should be probably in separate object with process() but lasy. @@ -214,7 +222,8 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) - M << 'sound/weapons/TargetOff.ogg' + to_chat(M, 'sound/weapons/TargetOff.ogg') + targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) @@ -266,9 +275,11 @@ client/verb/ToggleGunMode() set hidden = 1 gun_mode = !gun_mode if(gun_mode) - usr << "You will now take people captive." + to_chat(usr, "You will now take people captive.") + else - usr << "You will now shoot where you target." + to_chat(usr, "You will now shoot where you target.") + for(var/obj/item/weapon/gun/G in usr) G.stop_aim() remove_gun_icons() @@ -282,11 +293,13 @@ client/verb/ToggleGunMode() //Changing client's permissions target_can_move = !target_can_move if(target_can_move) - usr << "Target may now walk." + to_chat(usr, "Target may now walk.") + //usr.gun_run_icon = new /obj/screen/gun/run(null) //adding icon for running permission screen += usr.gun_run_icon else - usr << "Target may no longer move." + to_chat(usr, "Target may no longer move.") + target_can_run = 0 qdel(usr.gun_run_icon) //no need for icon for running permission @@ -301,12 +314,15 @@ client/verb/ToggleGunMode() if(G.target) for(var/mob/living/M in G.target) if(target_can_move) - M << "Your character may now walk at the discretion of their targeter." + to_chat(M, "Your character may now walk at the discretion of their targeter.") + if(!target_can_run && (ishuman(M))) - M << "\red Your move intent is now set to walk, as your targeter permits it." + to_chat(M, "\red Your move intent is now set to walk, as your targeter permits it.") + M.set_m_intent("walk") else - M << "\red Your character will now be shot if they move." + to_chat(M, "\red Your character will now be shot if they move.") + mob/living/proc/set_m_intent(var/intent) if (intent != "walk" && intent != "run") @@ -322,9 +338,11 @@ client/verb/AllowTargetRun() //Changing client's permissions target_can_run = !target_can_run if(target_can_run) - usr << "Target may now run." + to_chat(usr, "Target may now run.") + else - usr << "Target may no longer run." + to_chat(usr, "Target may no longer run.") + //Updating running permission button if(usr.gun_run_icon) @@ -337,9 +355,11 @@ client/verb/AllowTargetRun() if(G.target) for(var/mob/living/M in G.target) if(target_can_run) - M << "Your character may now run at the discretion of their targeter." + to_chat(M, "Your character may now run at the discretion of their targeter.") + else - M << "\red Your character will now be shot if they run."*/ + to_chat(M, "\red Your character will now be shot if they run.")*/ + client/verb/AllowTargetClick() set hidden=1 @@ -347,9 +367,11 @@ client/verb/AllowTargetClick() //Changing client's permissions target_can_click = !target_can_click if(target_can_click) - usr << "Target may now use items." + to_chat(usr, "Target may now use items.") + else - usr << "Target may no longer use items." + to_chat(usr, "Target may no longer use items.") + if(usr.item_use_icon) usr.item_use_icon.icon_state = "no_item[target_can_click]" @@ -361,6 +383,8 @@ client/verb/AllowTargetClick() if(G.target) for(var/mob/living/M in G.target) if(target_can_click) - M << "Your character may now use items at the discretion of their targeter." + to_chat(M, "Your character may now use items at the discretion of their targeter.") + else - M << "\red Your character will now be shot if they use items." + to_chat(M, "\red Your character will now be shot if they use items.") + diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index b1fb226a209..809201da056 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -302,14 +302,16 @@ var/const/INGEST = 2 var/list/seen = viewers(4, get_turf(my_atom)) for(var/mob/M in seen) if(!C.no_message) - M << "\blue \icon[my_atom] [C.mix_message]" + to_chat(M, "\blue \icon[my_atom] [C.mix_message]") + if(istype(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) - M << "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction." + to_chat(M, "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction.") + ME2.name = "used slime extract" ME2.desc = "This extract has been used up." @@ -552,13 +554,15 @@ var/const/INGEST = 2 /datum/reagents/proc/get_data(var/reagent_id) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) - //world << "proffering a data-carrying reagent ([reagent_id])" +// to_chat(world, "proffering a data-carrying reagent ([reagent_id])") + return D.data /datum/reagents/proc/set_data(var/reagent_id, var/new_data) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) - //world << "reagent data set ([reagent_id])" +// to_chat(world, "reagent data set ([reagent_id])") + D.data = new_data /datum/reagents/proc/copy_data(var/datum/reagent/current_reagent) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 94491e74e64..d70399f8d86 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -110,7 +110,8 @@ /obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1) if(broken_requirements.len) - user << "[src] is broken. [broken_requirements[broken_requirements[1]]]" + to_chat(user, "[src] is broken. [broken_requirements[broken_requirements[1]]]") + return @@ -207,24 +208,29 @@ S.use(1) else if(!user.drop_item()) - user << "\The [B] is stuck to you!" + to_chat(user, "\The [B] is stuck to you!") + return qdel(B) broken_requirements -= broken_requirements[1] - user << "You fix [src]." + to_chat(user, "You fix [src].") + return if(src.beaker) - user << "Something is already loaded into the machine." + to_chat(user, "Something is already loaded into the machine.") + return if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks)) src.beaker = B if(!user.drop_item()) - user << "\The [B] is stuck to you!" + to_chat(user, "\The [B] is stuck to you!") + return B.forceMove(src) - user << "You set [B] on the machine." + to_chat(user, "You set [B] on the machine.") + nanomanager.update_uis(src) // update all UIs attached to src if(!icon_beaker) icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position. @@ -236,13 +242,15 @@ ..() if(istype(B, /obj/item/device/multitool)) if(hackedcheck == 0) - user << hack_message + to_chat(user, hack_message) + dispensable_reagents += hacked_reagents hackedcheck = 1 return else - user << unhack_message + to_chat(user, unhack_message) + dispensable_reagents -= hacked_reagents hackedcheck = 0 return @@ -344,7 +352,8 @@ /obj/machinery/chem_dispenser/constructable/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(panel_open) - user << "Close the maintenance panel first." + to_chat(user, "Close the maintenance panel first.") + return ..() else @@ -360,10 +369,12 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << "\The [src] can now be moved." + to_chat(user, "\The [src] can now be moved.") + else if(!anchored) anchored = 1 - user << "\The [src] is now secured." + to_chat(user, "\The [src] is now secured.") + if(panel_open) if(istype(I, /obj/item/weapon/crowbar)) @@ -429,29 +440,35 @@ if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) if(src.beaker) - user << "A beaker is already loaded into the machine." + to_chat(user, "A beaker is already loaded into the machine.") + return if(!user.drop_item()) - user << "\The [B] is stuck to you!" + to_chat(user, "\The [B] is stuck to you!") + return src.beaker = B B.forceMove(src) - user << "You add the beaker to the machine!" + to_chat(user, "You add the beaker to the machine!") + src.updateUsrDialog() icon_state = "mixer1" else if(istype(B, /obj/item/weapon/storage/pill_bottle)) if(src.loaded_pill_bottle) - user << "A pill bottle is already loaded into the machine." + to_chat(user, "A pill bottle is already loaded into the machine.") + return if(!user.drop_item()) - user << "\The [B] is stuck to you!" + to_chat(user, "\The [B] is stuck to you!") + return src.loaded_pill_bottle = B B.forceMove(src) - user << "You add the pill bottle into the dispenser slot!" + to_chat(user, "You add the pill bottle into the dispenser slot!") + src.updateUsrDialog() return @@ -793,7 +810,8 @@ default_deconstruction_crowbar(B) return 1 else - user << "You can't use the [src.name] while it's panel is opened!" + to_chat(user, "You can't use the [src.name] while it's panel is opened!") + return 1 else ..() @@ -883,7 +901,8 @@ return 1 else if(!user.drop_item()) - user << "\The [O] is stuck to you!" + to_chat(user, "\The [O] is stuck to you!") + return src.beaker = O O.forceMove(src) @@ -892,7 +911,8 @@ return 0 if(holdingitems && holdingitems.len >= limit) - usr << "The machine cannot hold anymore items." + to_chat(usr, "The machine cannot hold anymore items.") + return 1 //Fill machine with the plantbag! @@ -903,18 +923,21 @@ G.forceMove(src) holdingitems += G if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill - user << "You fill the All-In-One grinder to the brim.") + break if(!O.contents.len) - user << "You empty the plant bag into the All-In-One grinder." + to_chat(user, "You empty the plant bag into the All-In-One grinder.") + src.updateUsrDialog() return 0 if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items)) - user << "Cannot refine into a reagent." + to_chat(user, "Cannot refine into a reagent.") + return 1 user.unEquip(O) diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm index 61e2a0c82a0..c4aed49df82 100644 --- a/code/modules/reagents/Chemistry-Readme.dm +++ b/code/modules/reagents/Chemistry-Readme.dm @@ -227,9 +227,12 @@ About the Tools: By default, all atom have a reagents var - but its empty. if you want to use an object for the chem. system you'll need to add something like this in its new proc: - var/datum/reagents/R = new/datum/reagents(100) <<<<< create a new datum , 100 is the maximum_volume of the new holder datum. - reagents = R <<<<< assign the new datum to the objects reagents var - R.my_atom = src <<<<< set the holders my_atom to src so that we know where we are. + to_chat(var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum , 100 is the maximum_volume of the new holder datum.) + + to_chat(reagents = R, <<< assign the new datum to the objects reagents var) + + to_chat(R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.) + This can also be done by calling a convenience proc: atom/proc/create_reagents(var/max_volume) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index 52b297d88eb..e8b9104a163 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -60,11 +60,13 @@ /obj/item/weapon/gun/dartgun/examine(mob/user) if(..(user, 2)) if(beakers.len) - user << "[src] contains:") + for(var/obj/item/weapon/reagent_containers/glass/beaker/B in beakers) if(B.reagents && B.reagents.reagent_list.len) for(var/datum/reagent/R in B.reagents.reagent_list) - user << "[R.volume] units of [R.name]") + /obj/item/weapon/gun/dartgun/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/weapon/dart_cartridge)) @@ -72,36 +74,43 @@ var/obj/item/weapon/dart_cartridge/D = I if(!D.darts) - user << "[D] is empty." + to_chat(user, "[D] is empty.") + return 0 if(cartridge) if(cartridge.darts <= 0) src.remove_cartridge() else - user << "There's already a cartridge in [src]." + to_chat(user, "There's already a cartridge in [src].") + return 0 user.drop_item() cartridge = D D.forceMove(src) - user << "You slot [D] into [src]." + to_chat(user, "You slot [D] into [src].") + update_icon() return if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(!istype(I, container_type)) - user << "[I] doesn't seem to fit into [src]." + to_chat(user, "[I] doesn't seem to fit into [src].") + return if(beakers.len >= max_beakers) - user << "[src] already has [max_beakers] beakers in it - another one isn't going to fit!" + to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") + return var/obj/item/weapon/reagent_containers/glass/beaker/B = I if(!user.drop_item()) - user << "\The [B] is stuck to you!" + to_chat(user, "\The [B] is stuck to you!") + return B.forceMove(src) beakers += B - user << "You slot [B] into [src].") + src.updateUsrDialog() /obj/item/weapon/gun/dartgun/can_fire() @@ -115,7 +124,8 @@ /obj/item/weapon/gun/dartgun/proc/remove_cartridge() if(cartridge) - usr << "You pop the cartridge out of [src]." + to_chat(usr, "You pop the cartridge out of [src].") + var/obj/item/weapon/dart_cartridge/C = cartridge C.forceMove(get_turf(src)) C.update_icon() @@ -145,10 +155,12 @@ var/obj/effect/syringe_gun_dummy/D = new/obj/effect/syringe_gun_dummy(get_turf(src)) var/obj/item/weapon/reagent_containers/syringe/S = get_mixed_syringe() if(!S) - user << "There are no darts in [src]!" + to_chat(user, "There are no darts in [src]!") + return if(!S.reagents) - user << "There are no reagents available!" + to_chat(user, "There are no reagents available!") + return cartridge.darts-- src.update_icon() @@ -190,7 +202,8 @@ if(D.reagents) D.reagents.trans_to(M, 15) - M << "You feel a slight prick." + to_chat(M, "You feel a slight prick.") + qdel(D) break @@ -271,7 +284,8 @@ if(index <= beakers.len) if(beakers[index]) var/obj/item/weapon/reagent_containers/glass/beaker/B = beakers[index] - usr << "You remove [B] from [src]." + to_chat(usr, "You remove [B] from [src].") + mixing -= B beakers -= B B.forceMove(get_turf(src)) @@ -284,7 +298,8 @@ if(cartridge) spawn(0) fire_dart(target,user) else - usr << "[src] is empty." + to_chat(usr, "[src] is empty.") + /obj/item/weapon/gun/dartgun/vox diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index 16c41141815..a2a74dc9635 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -19,7 +19,8 @@ /obj/item/weapon/gun/grenadelauncher/examine(mob/user) if(..(user, 2)) - user << "\blue [grenades.len] / [max_grenades] [ammo_name]s." + to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") + /obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params) @@ -28,10 +29,13 @@ user.drop_item() I.loc = src grenades += I - user << "\blue You put the [ammo_name] in the [name]." - user << "\blue [grenades.len] / [max_grenades] [ammo_name]s." + to_chat(user, "\blue You put the [ammo_name] in the [name].") + + to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") + else - usr << "\red The grenade launcher cannot hold more [ammo_name]s." + to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.") + /obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag) @@ -47,12 +51,14 @@ if(grenades.len) spawn(0) fire_grenade(target,user) else - usr << "\red The [name] is empty." + to_chat(usr, "\red The [name] is empty.") + /obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user) for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] fired a [ammo_name]!", user), 1) - user << "\red You fire the [name]!" + to_chat(user, "\red You fire the [name]!") + var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta! grenades -= F F.loc = user.loc @@ -93,16 +99,20 @@ user.drop_item() I.loc = src grenades += I - user << "\blue You put the [ammo_name] in the [name]." - user << "\blue [grenades.len] / [max_grenades] [ammo_name]s." + to_chat(user, "\blue You put the [ammo_name] in the [name].") + + to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") + icon_state = "piecannon1" else - usr << "\red The grenade launcher cannot hold more [ammo_name]s." + to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.") + /obj/item/weapon/gun/grenadelauncher/piecannon/fire_grenade(atom/target, mob/user) for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] fired a [ammo_name]!", user), 1) - user << "\red You fire the [name]!" + to_chat(user, "\red You fire the [name]!") + var/obj/item/weapon/reagent_containers/food/snacks/pie/P = grenades[1] //Now with less copypasta! grenades -= P P.loc = user.loc diff --git a/code/modules/reagents/newchem/Blob-Reagents.dm b/code/modules/reagents/newchem/Blob-Reagents.dm index 80c36713bbe..58b5b392609 100644 --- a/code/modules/reagents/newchem/Blob-Reagents.dm +++ b/code/modules/reagents/newchem/Blob-Reagents.dm @@ -150,4 +150,5 @@ if(message_living && !issilicon(M)) totalmessage += message_living totalmessage += "!" - M << "[totalmessage]" \ No newline at end of file + to_chat(M, "[totalmessage]") + diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm index e6e4ca61958..52f2fdffd0f 100644 --- a/code/modules/reagents/newchem/chem_heater.dm +++ b/code/modules/reagents/newchem/chem_heater.dm @@ -74,13 +74,15 @@ if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(beaker) - user << "A beaker is already loaded into the machine." + to_chat(user, "A beaker is already loaded into the machine.") + return if(user.drop_item()) beaker = I I.forceMove(src) - user << "You add the beaker to the machine!" + to_chat(user, "You add the beaker to the machine!") + icon_state = "mixer1b" nanomanager.update_uis(src) diff --git a/code/modules/reagents/newchem/disease.dm b/code/modules/reagents/newchem/disease.dm index 132859d530a..07f60778364 100644 --- a/code/modules/reagents/newchem/disease.dm +++ b/code/modules/reagents/newchem/disease.dm @@ -64,7 +64,8 @@ if(holder.has_reagent("atrazine",45)) holder.del_reagent("spore") //apparently this never metabolizes and stays in forever unless you have 45 units of atrazine in you or some stupid thing like that. if(prob(1)) - M << "Your mouth tastes funny." + to_chat(M, "Your mouth tastes funny.") + if(prob(1) && prob(25)) if(iscarbon(M)) var/mob/living/carbon/C = M diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm index 5574643de89..136ae63936e 100644 --- a/code/modules/reagents/newchem/drinks.dm +++ b/code/modules/reagents/newchem/drinks.dm @@ -27,7 +27,8 @@ if(prob(50)) M.say("[sonic_message]") else - M << "[sonic_message ]" + to_chat(M, "[sonic_message ]") + ..() return @@ -130,7 +131,8 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo if(M.isSynthetic()) return if(method == INGEST) - M << pick("That was awful!", "Yuck!") + to_chat(M, pick("That was awful!", "Yuck!")) + /datum/reagent/ethanol/synthanol/robottears name = "Robot Tears" diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm index 6ac4984bb9a..0d06bbd0e34 100644 --- a/code/modules/reagents/newchem/drugs.dm +++ b/code/modules/reagents/newchem/drugs.dm @@ -17,7 +17,8 @@ if(!M) M = holder.my_atom var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel less stressed.", "You feel more placid.", "You feel more undivided.") if(prob(5)) - M << "[smoke_message]" + to_chat(M, "[smoke_message]") + if(prob(50)) M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -49,14 +50,17 @@ if(prob(15)) M.emote(pick("twitch", "twitch_s", "grumble", "laugh")) if(prob(8)) - M << "You feel great!" + to_chat(M, "You feel great!") + M.reagents.add_reagent("methamphetamine", rand(1,2)) M.emote(pick("laugh", "giggle")) if(prob(6)) - M << "You feel warm." + to_chat(M, "You feel warm.") + M.bodytemperature += rand(1,10) if(prob(4)) - M << "You feel kinda awful!" + to_chat(M, "You feel kinda awful!") + M.adjustToxLoss(1) M.jitteriness += 30 M.emote(pick("groan", "moan")) @@ -104,18 +108,21 @@ if(prob(15)) M.emote(pick("smile", "grin", "yawn", "laugh", "drool")) if(prob(10)) - M << "You feel pretty chill." + to_chat(M, "You feel pretty chill.") + M.bodytemperature-- M.emote("smile") if(prob(5)) - M << "You feel too chill!" + to_chat(M, "You feel too chill!") + M.emote(pick("yawn", "drool")) M.Stun(1) M.adjustToxLoss(1) M.adjustBrainLoss(1) M.bodytemperature -= 20 if(prob(2)) - M << "Your skin feels all rough and dry." + to_chat(M, "Your skin feels all rough and dry.") + M.adjustBruteLoss(2) ..() return @@ -231,7 +238,8 @@ if(!M) M = holder.my_atom var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.") if(prob(5)) - M << "[high_message]" + to_chat(M, "[high_message]") + M.AdjustParalysis(-5) M.AdjustStunned(-5) M.AdjustWeakened(-5) @@ -292,9 +300,11 @@ M.emote(pick("twitch", "shake", "tremble","quiver", "twitch_s")) var/high_message = pick("really buff", "on top of the world","like you're made of steel", "energized", "invigorated", "full of energy") if(prob(8)) - M << "[high_message]!" + to_chat(M, "[high_message]!") + if(prob(5)) - M << "You cannot breathe!" + to_chat(M, "You cannot breathe!") + M.adjustOxyLoss(15) M.Stun(1) M.losebreath++ @@ -315,7 +325,8 @@ if(prob(5)) M.emote(pick("laugh","giggle","smile")) if(prob(5)) - M << "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]" + to_chat(M, "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]") + if(prob(4)) M.confused = max(M.confused, 10) if(volume >= 50 && prob(25)) @@ -389,11 +400,13 @@ M.emote("laugh") M.adjustToxLoss(1) if(2) - M << "[M] can't seem to control their legs!" + to_chat(M, "[M] can't seem to control their legs!") + M.Weaken(8) M.adjustToxLoss(1) if(3) - M << "[M]'s hands flip out and flail everywhere!" + to_chat(M, "[M]'s hands flip out and flail everywhere!") + M.drop_l_hand() M.drop_r_hand() M.adjustToxLoss(1) @@ -432,7 +445,8 @@ if(prob(1)) high_message = "0100011101001111010101000101010001000001010001110100111101000110010000010101001101010100!" if(prob(5)) - M << "[high_message]" + to_chat(M, "[high_message]") + M.AdjustParalysis(-2) M.AdjustStunned(-2) M.AdjustWeakened(-2) @@ -480,7 +494,8 @@ if(prob(1)) high_message = "01010100010100100100000101001110010100110100001101000101010011100100010001000101010011100100001101000101." if(prob(5)) - M << "[high_message]" + to_chat(M, "[high_message]") + ..() return @@ -491,7 +506,8 @@ M.Jitter(20) M.apply_effect(STUTTER, 5) if(prob(10)) - M << "You experience a violent electrical discharge!" + to_chat(M, "You experience a violent electrical discharge!") + playsound(get_turf(M), 'sound/effects/eleczap.ogg', 75, 1) //Lightning effect for electrical discharge visualization var/icon/I=new('icons/obj/zap.dmi',"lightningend") diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm index 7799659eb97..c87d6c209ee 100644 --- a/code/modules/reagents/newchem/food.dm +++ b/code/modules/reagents/newchem/food.dm @@ -11,7 +11,8 @@ datum/reagent/questionmark/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) return if(method == INGEST) M.Weaken(2) - M << "Ugh! Eating that was a terrible idea!" + to_chat(M, "Ugh! Eating that was a terrible idea!") + datum/reagent/egg name = "Egg" @@ -201,11 +202,15 @@ datum/reagent/fungus/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) if(method == INGEST) var/ranchance = rand(1,10) if(ranchance == 1) - M << "You feel very sick." + to_chat(M, "You feel very sick.") + M.reagents.add_reagent("toxin", rand(1,5)) else if(ranchance <= 5) - M << "That tasted absolutely FOUL." - else M << "Yuck!" + to_chat(M, "That tasted absolutely FOUL.") + + else + to_chat(M, "Yuck!") + /datum/reagent/chicken_soup name = "Chicken soup" @@ -232,7 +237,8 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) if(!istype(M, /mob/living)) return if(method == INGEST) - M << "That tasted amazing!" + to_chat(M, "That tasted amazing!") + /datum/reagent/msg/on_mob_life(var/mob/living/M as mob) @@ -240,7 +246,8 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) if(prob(10)) M.adjustToxLoss(rand(2.4)) if(prob(7)) - M << "A horrible migraine overpowers you." + to_chat(M, "A horrible migraine overpowers you.") + M.Stun(rand(2,5)) ..() return @@ -287,7 +294,8 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume) /datum/reagent/fake_cheese/overdose_process(var/mob/living/M as mob) if(prob(8)) - M << "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat." + to_chat(M, "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat.") + M.adjustToxLoss(rand(1,2)) ..() @@ -393,12 +401,14 @@ datum/reagent/ectoplasm/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) return if(method == INGEST) var/spooky_eat = pick("Ugh, why did you eat that? Your mouth feels haunted. Haunted with bad flavors.", "Ugh, why did you eat that? It has the texture of ham aspic. From the 1950s. Left out in the sun.", "Ugh, why did you eat that? It tastes like a ghost fart.", "Ugh, why did you eat that? It tastes like flavor died.") - M << "[spooky_eat]" + to_chat(M, "[spooky_eat]") + /datum/reagent/ectoplasm/on_mob_life(var/mob/living/M as mob) var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...") if(prob(8)) - M << "[spooky_message]" + to_chat(M, "[spooky_message]") + ..() return @@ -446,12 +456,15 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume) /datum/reagent/hydrogenated_soybeanoil/overdose_process(var/mob/living/M as mob) if(prob(33)) - M << "You feel horribly weak." + to_chat(M, "You feel horribly weak.") + if(prob(10)) - M << "You cannot breathe!" + to_chat(M, "You cannot breathe!") + M.adjustOxyLoss(5) if(prob(5)) - M << "You feel a sharp pain in your chest!" + to_chat(M, "You feel a sharp pain in your chest!") + M.adjustOxyLoss(25) M.Stun(5) M.Paralyse(10) @@ -529,7 +542,8 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume) if(prob(8)) M.reagents.add_reagent(pick("blood", "corn_syrup", "synthflesh", "hydrogenated_soybeanoil", "porktonium", "toxic_slurry"), 0.8) else if(prob(6)) - M << "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]" + to_chat(M, "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]") + M.emote(pick("groan","moan")) ..() return @@ -556,20 +570,24 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol var/mob/living/carbon/human/H = M if(H.wear_mask) - H << "The pepperoni bounces off your mask!" + to_chat(H, "The pepperoni bounces off your mask!") + return if(H.head) - H << "Your mask protects you from the errant pepperoni!" + to_chat(H, "Your mask protects you from the errant pepperoni!") + return if(prob(50)) M.adjustBruteLoss(1) playsound(M, 'sound/effects/woodhit.ogg', 50, 1) - M << "A slice of pepperoni slaps you!" + to_chat(M, "A slice of pepperoni slaps you!") + else M.emote("burp") - M << "My goodness, that was tasty!" + to_chat(M, "My goodness, that was tasty!") + /datum/chemical_reaction/pepperoni @@ -590,14 +608,17 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol /datum/reagent/cholesterol/on_mob_life(var/mob/living/M as mob) if(volume >= 25 && prob(volume*0.15)) - M << "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!" + to_chat(M, "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!") + M.adjustToxLoss(rand(1,2)) else if(volume >= 45 && prob(volume*0.08)) - M << "Your chest [pick("hurts","stings","aches","burns")]!" + to_chat(M, "Your chest [pick("hurts","stings","aches","burns")]!") + M.adjustToxLoss(rand(2,4)) M.Stun(1) else if(volume >= 150 && prob(volume*0.01)) - M << "Your chest is burning with pain!" + to_chat(M, "Your chest is burning with pain!") + M.Stun(1) M.Weaken(1) if(ishuman(M)) diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index f742424970d..f61f5e850b7 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -17,11 +17,13 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth if(method == TOUCH) M.adjustFireLoss(-volume) if(show_message) - M << "The silver sulfadiazine soothes your burns." + to_chat(M, "The silver sulfadiazine soothes your burns.") + if(method == INGEST) M.adjustToxLoss(0.5*volume) if(show_message) - M << "You feel sick..." + to_chat(M, "You feel sick...") + ..() return @@ -44,12 +46,14 @@ datum/reagent/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TO if(method == TOUCH) M.adjustBruteLoss(-volume) if(show_message) - M << "The styptic powder stings like hell as it closes some of your wounds!" + to_chat(M, "The styptic powder stings like hell as it closes some of your wounds!") + M.emote("scream") if(method == INGEST) M.adjustToxLoss(0.5*volume) if(show_message) - M << "You feel gross!" + to_chat(M, "You feel gross!") + ..() return @@ -89,7 +93,8 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo M.adjustBruteLoss(-1.5*volume) M.adjustFireLoss(-1.5*volume) if(show_message) - M << "The synthetic flesh integrates itself into your wounds, healing you." + to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.") + ..() return @@ -631,8 +636,10 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T return var/mob/dead/observer/ghost = M.get_ghost() if(ghost) - ghost << "Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)" - ghost << sound('sound/effects/genetics.ogg') + to_chat(ghost, "Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") + + to_chat(ghost, sound('sound/effects/genetics.ogg')) + M.visible_message("[M] doesn't appear to respond, perhaps try again later?") if(!M.suiciding && !ghost && !(NOCLONE in M.mutations)) M.visible_message("[M] seems to rise from the dead!") diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm index 4a6ec32366e..83aca86397d 100644 --- a/code/modules/reagents/newchem/newchem_procs.dm +++ b/code/modules/reagents/newchem/newchem_procs.dm @@ -77,7 +77,8 @@ if(5) R.addiction_act_stage5(M) if(prob(20) && (world.timeofday > (R.last_addiction_dose + ADDICTION_TIME))) //Each addiction lasts 8 minutes before it can end - M << "You no longer feel reliant on [R.name]!" + to_chat(M, "You no longer feel reliant on [R.name]!") + addiction_list.Remove(R) update_total() @@ -132,7 +133,8 @@ if(prob(8)) M.emote("sneeze") if(prob(4)) - M << "You feel a dull headache." + to_chat(M, "You feel a dull headache.") + /datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) if(prob(8)) @@ -140,28 +142,34 @@ if(prob(8)) M.emote("shiver") if(prob(4)) - M << "You begin craving [name]!" + to_chat(M, "You begin craving [name]!") + /datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) if(prob(8)) M.emote("twitch") if(prob(4)) - M << "You have the strong urge for some [name]!" + to_chat(M, "You have the strong urge for some [name]!") + if(prob(4)) - M << "You REALLY crave some [name]!" + to_chat(M, "You REALLY crave some [name]!") + /datum/reagent/proc/addiction_act_stage5(var/mob/living/M as mob) if(prob(8)) M.emote("twitch") if(prob(6)) - M << "Your stomach lurches painfully!" + to_chat(M, "Your stomach lurches painfully!") + M.visible_message("[M] gags and retches!") M.Stun(rand(2,4)) M.Weaken(rand(2,4)) if(prob(5)) - M << "You feel like you can't live without [name]!" + to_chat(M, "You feel like you can't live without [name]!") + if(prob(5)) - M << "You would DIE for some [name] right now!" + to_chat(M, "You would DIE for some [name] right now!") + /datum/reagent/proc/reagent_deleted() return diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index 9d138407d96..63c45c77776 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -265,7 +265,8 @@ datum/reagent/super_hairgrownium/on_mob_life(var/mob/living/M as mob) H.unEquip(H.wear_mask) var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache H.equip_to_slot(fakemoustache, slot_wear_mask) - H << "Hair bursts forth from your every follicle!" + to_chat(H, "Hair bursts forth from your every follicle!") + ..() return @@ -292,7 +293,8 @@ datum/reagent/fartonium/on_mob_life(var/mob/living/M as mob) if(holder.has_reagent("simethicone")) if(prob(25)) - M << "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]" + to_chat(M, "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]") + M.adjustBruteLoss(1) if(prob(10)) M.custom_emote(1,"strains, but nothing happens.") diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index db1f01da847..2b8c8e388a0 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -362,20 +362,24 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit var/mob/living/carbon/human/H = C if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT))) ear_safety++ - M << "BANG" + to_chat(M, "BANG") + if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) M.ear_damage += rand(0, 5) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) - M << "Your ears start to ring badly!" + to_chat(M, "Your ears start to ring badly!") + if(prob(M.ear_damage - 10 + 5)) - M << "You can't hear anything!" + to_chat(M, "You can't hear anything!") + M.disabilities |= DEAF else if (M.ear_damage >= 5) - M << "Your ears start to ring!" + to_chat(M, "Your ears start to ring!") + /datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume) if(holder.has_reagent("stabilizing_agent")) @@ -391,20 +395,24 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit var/mob/living/carbon/human/H = C if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT))) ear_safety++ - C << "BANG" + to_chat(C, "BANG") + if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) M.ear_damage += rand(0, 5) M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) - M << "Your ears start to ring badly!" + to_chat(M, "Your ears start to ring badly!") + if(prob(M.ear_damage - 10 + 5)) - M << "You can't hear anything!" + to_chat(M, "You can't hear anything!") + M.disabilities |= DEAF else if (M.ear_damage >= 5) - M << "Your ears start to ring!" + to_chat(M, "Your ears start to ring!") + holder.remove_reagent("sonic_powder", created_volume) /datum/reagent/phlogiston diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index c69baf5b76b..b82e4c266ab 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -34,7 +34,8 @@ if(method == TOUCH) M.reagents.add_reagent("histamine",10) else - M << "You feel a burning sensation in your throat..." + to_chat(M, "You feel a burning sensation in your throat...") + M.emote("drool") /datum/reagent/histamine/on_mob_life(var/mob/living/M as mob) @@ -42,7 +43,8 @@ if(prob(20)) M.emote(pick("twitch", "grumble", "sneeze", "cough")) if(prob(10)) - M << "Your eyes itch." + to_chat(M, "Your eyes itch.") + M.emote(pick("blink", "sneeze")) M.eye_blurry += 3 if(prob(10)) @@ -50,14 +52,16 @@ M.adjustBruteLoss(1) M.emote("grumble") if(prob(5)) - M << "You're getting a rash!" + to_chat(M, "You're getting a rash!") + M.adjustBruteLoss(2) ..() return /datum/reagent/histamine/overdose_process(var/mob/living/M as mob) if(prob(2)) - M << "You feel mucus running down the back of your throat." + to_chat(M, "You feel mucus running down the back of your throat.") + M.adjustToxLoss(1) M.jitteriness += 4 M.emote("sneeze", "cough") @@ -67,7 +71,8 @@ M.emote(pick("choke","gasp")) M.adjustOxyLoss(5) else if(prob(7)) - M << "Your chest hurts!" + to_chat(M, "Your chest hurts!") + M.emote(pick("cough","gasp")) M.adjustOxyLoss(3) ..() @@ -196,11 +201,13 @@ if(prob(5)) M.emote("drool") if(prob(10)) - M << "You cannot breathe!" + to_chat(M, "You cannot breathe!") + M.losebreath += 1 M.emote("gasp") if(prob(8)) - M << "You feel horrendously weak!" + to_chat(M, "You feel horrendously weak!") + M.Stun(2) M.adjustToxLoss(2) ..() @@ -237,7 +244,8 @@ if(prob(25)) M.emote(pick("twitch", "laugh", "sneeze", "cry")) if(prob(20)) - M << "Something tickles!" + to_chat(M, "Something tickles!") + M.emote(pick("laugh", "giggle")) if(prob(15)) M.visible_message("[M] scratches at an itch.") @@ -245,12 +253,14 @@ M.Stun(rand(0,1)) M.emote("grumble") if(prob(10)) - M << "So itchy!" + to_chat(M, "So itchy!") + M.adjustBruteLoss(2) if(prob(6)) M.reagents.add_reagent("histamine", rand(1,3)) if(prob(2)) - M << "AHHHHHH!" + to_chat(M, "AHHHHHH!") + M.adjustBruteLoss(5) M.Weaken(5) M.jitteriness += 6 @@ -291,7 +301,8 @@ var/mob/living/carbon/human/H = M if(volume < 5) - M << "The blueish acidic substance stings you, but isn't concentrated enough to harm you!" + to_chat(M, "The blueish acidic substance stings you, but isn't concentrated enough to harm you!") + if(volume >=5 && volume <=10) if(!H.unacidable) @@ -306,18 +317,22 @@ if(!H.wear_mask.unacidable) qdel(H.wear_mask) H.update_inv_wear_mask() - H << "\red Your mask melts away but protects you from the acid!" + to_chat(H, "\red Your mask melts away but protects you from the acid!") + else - H << "\red Your mask protects you from the acid!" + to_chat(H, "\red Your mask protects you from the acid!") + return if(H.head) if(!H.head.unacidable) qdel(H.head) H.update_inv_head() - H << "\red Your helmet melts away but protects you from the acid" + to_chat(H, "\red Your helmet melts away but protects you from the acid") + else - H << "\red Your helmet protects you from the acid!" + to_chat(H, "\red Your helmet protects you from the acid!") + return if(!H.unacidable) @@ -333,7 +348,8 @@ var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc) I.desc = "Looks like this was \an [O] some time ago." for(var/mob/M in viewers(5, O)) - M << "\red \the [O] melts." + to_chat(M, "\red \the [O] melts.") + qdel(O) /datum/chemical_reaction/facid @@ -358,14 +374,17 @@ if(prob(33)) M.adjustToxLoss(rand(5,25)) if(prob(33)) - M << "You feel horribly weak." + to_chat(M, "You feel horribly weak.") + M.Stun(2) if(prob(10)) - M << "You cannot breathe!" + to_chat(M, "You cannot breathe!") + M.adjustOxyLoss(10) M.losebreath++ if(prob(10)) - M << "Your chest is burning with pain!" + to_chat(M, "Your chest is burning with pain!") + M.adjustOxyLoss(10) M.losebreath++ M.Stun(3) @@ -409,7 +428,8 @@ M.emote(pick("drool", "tremble")) if(6 to 10) if(prob(8)) - M << "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")]." + to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].") + M.Stun(1) else if(prob(8)) M.emote(pick("drool", "tremble")) @@ -420,9 +440,11 @@ M.emote(pick("drool", "tremble", "gasp")) M.losebreath++ if(prob(9)) - M << "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!" + to_chat(M, "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!") + if(prob(7)) - M << "You can't breathe!" + to_chat(M, "You can't breathe!") + M.losebreath += 3 ..() return @@ -557,10 +579,12 @@ if(!M.nutrition) switch(rand(1,3)) if(1) - M << "You feel hungry..." + to_chat(M, "You feel hungry...") + if(2) M.adjustToxLoss(1) - M << "Your stomach grumbles painfully!" + to_chat(M, "Your stomach grumbles painfully!") + else if(prob(60)) var/fat_to_burn = max(round(M.nutrition/100,1), 5) @@ -604,7 +628,8 @@ if(6 to 10) M.eye_blurry += 5 if(prob(8)) - M << "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")]." + to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].") + M.Stun(1) else if(prob(8)) M.emote(pick("drool","pale", "gasp")) @@ -614,7 +639,8 @@ if(prob(20)) M.emote(pick("drool", "faint", "pale", "gasp", "collapse")) else if(prob(8)) - M << "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!" + to_chat(M, "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!") + M.losebreath++ ..() return @@ -675,7 +701,8 @@ M.visible_message("[M] has a seizure!") M.jitteriness = 1000 if(prob(5)) - M << "You can't breathe!" + to_chat(M, "You can't breathe!") + M.emote(pick("gasp", "choke", "cough")) M.losebreath++ if(61 to INFINITY) @@ -822,7 +849,8 @@ if(prob(10)) M.adjustToxLoss(rand(2.4)) if(prob(7)) - M << "A horrible migraine overpowers you." + to_chat(M, "A horrible migraine overpowers you.") + M.Stun(rand(2,5)) if(prob(7)) M.fakevomit(1) @@ -869,7 +897,8 @@ /datum/reagent/ants/reaction_mob(var/mob/living/M as mob, var/method=TOUCH, var/volume) //NOT THE ANTS if(iscarbon(M)) if(method == TOUCH || method==INGEST) - M << "OH SHIT ANTS!!!!" + to_chat(M, "OH SHIT ANTS!!!!") + M.emote("scream") M.adjustBruteLoss(4) diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm index 649a32ae373..0a36f59d428 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm @@ -218,7 +218,8 @@ playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/M in range (get_turf(holder.my_atom), 7)) M.bodytemperature -= 140 - M << "\blue You feel a chill!" + to_chat(M, "\blue You feel a chill!") + slimefireproof diff --git a/code/modules/reagents/oldchem/reagents/_reagent_base.dm b/code/modules/reagents/oldchem/reagents/_reagent_base.dm index b134f974547..11dc147ace6 100644 --- a/code/modules/reagents/oldchem/reagents/_reagent_base.dm +++ b/code/modules/reagents/oldchem/reagents/_reagent_base.dm @@ -39,12 +39,14 @@ if(can_become_addicted) if(prob(self.addiction_chance) && !is_type_in_list(self, M.reagents.addiction_list)) - M << "You suddenly feel invigorated and guilty..." + to_chat(M, "You suddenly feel invigorated and guilty...") + var/datum/reagent/new_reagent = new self.type() new_reagent.last_addiction_dose = world.timeofday M.reagents.addiction_list.Add(new_reagent) else if(is_type_in_list(self, M.reagents.addiction_list)) - M << "You feel slightly better, but for how long?" + to_chat(M, "You feel slightly better, but for how long?") + for(var/A in M.reagents.addiction_list) var/datum/reagent/AD = A if(AD && istype(AD, self)) diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm index 65a28452d58..1a24670b2a7 100644 --- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm +++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm @@ -74,14 +74,17 @@ if(istype(O,/obj/item/weapon/paper)) var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() - usr << "The solution melts away the ink on the paper." + to_chat(usr, "The solution melts away the ink on the paper.") + if(istype(O,/obj/item/weapon/book)) if(volume >= 5) var/obj/item/weapon/book/affectedbook = O affectedbook.dat = null - usr << "The solution melts away the ink on the book." + to_chat(usr, "The solution melts away the ink on the book.") + else - usr << "It wasn't enough..." + to_chat(usr, "It wasn't enough...") + return /datum/reagent/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm index 008f9964793..b15bb4ab26d 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_food.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm @@ -450,7 +450,8 @@ return /datum/reagent/sugar/overdose_start(var/mob/living/M as mob) - M << "You pass out from hyperglycemic shock!" + to_chat(M, "You pass out from hyperglycemic shock!") + M.emote("collapse") ..() diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm index 852fb861bb8..1a1b1e6ea76 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm @@ -64,7 +64,8 @@ /datum/reagent/slimejelly/on_mob_life(var/mob/living/M as mob) if(prob(10)) - M << "\red Your insides are burning!" + to_chat(M, "\red Your insides are burning!") + M.adjustToxLoss(rand(20,60)*REM) else if(prob(40)) M.adjustBruteLoss(-5*REM) @@ -83,10 +84,14 @@ if(ishuman(M)) var/mob/living/carbon/human/human = M if(human.species.name != "Shadow") - M << "\red Your flesh rapidly mutates!" - M << "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids." - M << "\red Your body reacts violently to light. \green However, it naturally heals in darkness." - M << "Aside from your new traits, you are mentally unchanged and retain your prior obligations." + to_chat(M, "\red Your flesh rapidly mutates!") + + to_chat(M, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") + + to_chat(M, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") + + to_chat(M, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") + human.set_species("Shadow") ..() return @@ -264,11 +269,13 @@ if(volume > 25) if(H.wear_mask) - H << "\red Your mask protects you from the acid!" + to_chat(H, "\red Your mask protects you from the acid!") + return if(H.head) - H << "\red Your helmet protects you from the acid!" + to_chat(H, "\red Your helmet protects you from the acid!") + return if(!M.unacidable) @@ -288,7 +295,8 @@ var/mob/living/carbon/human/H = M if(volume < 10) - M << "The greenish acidic substance stings you, but isn't concentrated enough to harm you!" + to_chat(M, "The greenish acidic substance stings you, but isn't concentrated enough to harm you!") + if(volume >=10 && volume <=25) if(!H.unacidable) @@ -313,7 +321,8 @@ var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc) I.desc = "Looks like this was \an [O] some time ago." for(var/mob/M in viewers(5, O)) - M << "\red \the [O] melts." + to_chat(M, "\red \the [O] melts.") + qdel(O) @@ -431,10 +440,12 @@ if ( !safe_thing ) safe_thing = victim.glasses if ( eyes_covered && mouth_covered ) - victim << "\red Your [safe_thing] protects you from the pepperspray!" + to_chat(victim, "\red Your [safe_thing] protects you from the pepperspray!") + return else if ( mouth_covered ) // Reduced effects if partially protected - victim << "\red Your [safe_thing] protect you from most of the pepperspray!" + to_chat(victim, "\red Your [safe_thing] protect you from most of the pepperspray!") + if(prob(5)) victim.emote("scream") victim.eye_blurry = max(M.eye_blurry, 3) @@ -445,14 +456,16 @@ victim.drop_item() return else if ( eyes_covered ) // Eye cover is better than mouth cover - victim << "\red Your [safe_thing] protects your eyes from the pepperspray!" + to_chat(victim, "\red Your [safe_thing] protects your eyes from the pepperspray!") + victim.eye_blurry = max(M.eye_blurry, 3) victim.damageoverlaytemp = 30 return else // Oh dear :D if(prob(5)) victim.emote("scream") - victim << "\red You're sprayed directly in the eyes with pepperspray!" + to_chat(victim, "\red You're sprayed directly in the eyes with pepperspray!") + victim.eye_blurry = max(M.eye_blurry, 5) victim.eye_blind = max(M.eye_blind, 2) victim.confused = max(M.confused, 6) diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm index df9cdd6ade6..99c4b2f6499 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_water.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm @@ -254,7 +254,8 @@ if(!istype(M, /mob/living)) return if(method == INGEST) - M << "Oh god, why did you drink that?" + to_chat(M, "Oh god, why did you drink that?") + /datum/reagent/fishwater/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -307,14 +308,17 @@ if(ishuman(M) && M.mind && M.mind.vampire && !M.mind.vampire.get_ability(/datum/vampire_passive/full) && prob(80)) switch(data) if(1 to 4) - M << "Something sizzles in your veins!" + to_chat(M, "Something sizzles in your veins!") + M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) if(5 to 12) - M << "You feel an intense burning inside of you!" + to_chat(M, "You feel an intense burning inside of you!") + M.adjustFireLoss(1) M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) if(13 to INFINITY) - M << "You suddenly ignite in a holy fire!" + to_chat(M, "You suddenly ignite in a holy fire!") + for(var/mob/O in viewers(M, null)) O.show_message(text("[] suddenly bursts into flames!", M), 1) M.fire_stacks = min(5,M.fire_stacks + 3) @@ -330,13 +334,16 @@ var/mob/living/carbon/human/H=M if(method == TOUCH) if(H.wear_mask) - H << "\red Your mask protects you from the holy water!" + to_chat(H, "\red Your mask protects you from the holy water!") + return else if(H.head) - H << "\red Your helmet protects you from the holy water!" + to_chat(H, "\red Your helmet protects you from the holy water!") + return else - M << "Something holy interferes with your powers!" + to_chat(M, "Something holy interferes with your powers!") + M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) diff --git a/code/modules/reagents/pandemic.dm b/code/modules/reagents/pandemic.dm index 4ae8809b8f5..d532216c8db 100644 --- a/code/modules/reagents/pandemic.dm +++ b/code/modules/reagents/pandemic.dm @@ -274,14 +274,16 @@ if(istype(I, /obj/item/weapon/reagent_containers) && (I.flags & OPENCONTAINER)) if(stat & (NOPOWER|BROKEN)) return if(beaker) - user << "A beaker is already loaded into the machine!" + to_chat(user, "A beaker is already loaded into the machine!") + return if(!user.drop_item()) return beaker = I beaker.loc = src - user << "You add the beaker to the machine." + to_chat(user, "You add the beaker to the machine.") + src.updateUsrDialog() icon_state = "mixer1" diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index b78c54bb4ef..3f86de28f0d 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -80,10 +80,12 @@ /obj/item/weapon/reagent_containers/wash(mob/user, atom/source) if(is_open_container()) if(reagents.total_volume >= volume) - user << "span class='warning'>\The [src] is full." + to_chat(user, "span class='warning'>\The [src] is full.") + return else reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this)) - user << "You fill [src] from [source]." + to_chat(user, "You fill [src] from [source].") + return ..() \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index e723005e60e..fa7915ed167 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -72,13 +72,16 @@ /obj/item/weapon/reagent_containers/borghypo/attack(mob/living/M as mob, mob/user as mob) var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) - user << "The injector is empty." + to_chat(user, "The injector is empty.") + return if (!istype(M)) return if (R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection)) - user << "You inject [M] with the injector." - M << "You feel a tiny prick!" + to_chat(user, "You inject [M] with the injector.") + + to_chat(M, "You feel a tiny prick!") + R.add_reagent(M) if(M.reagents) @@ -91,7 +94,8 @@ M.LAssailant = user var/trans = R.trans_to(M, amount_per_transfer_from_this) - user << "[trans] units injected. [R.total_volume] units remaining." + to_chat(user, "[trans] units injected. [R.total_volume] units remaining.") + return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) @@ -102,7 +106,8 @@ charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes. var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]] - user << "Synthesizer is now producing '[R.name]'." + to_chat(user, "Synthesizer is now producing '[R.name]'.") + return /obj/item/weapon/reagent_containers/borghypo/examine(mob/user) @@ -114,8 +119,10 @@ for(var/datum/reagents/RS in reagent_list) var/datum/reagent/R = locate() in RS.reagent_list if(R) - user << "It currently has [R.volume] units of [R.name] stored." + to_chat(user, "It currently has [R.volume] units of [R.name] stored.") + empty = 0 if(empty) - user << "It is currently empty. Allow some time for the internal syntheszier to produce more." + to_chat(user, "It is currently empty. Allow some time for the internal syntheszier to produce more.") + diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 1526ebcb695..f91d6cfe619 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -17,11 +17,13 @@ if(filled) if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + to_chat(user, "\red [target] is full.") + return if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit. - user << "\red You cannot directly fill this object." + to_chat(user, "\red You cannot directly fill this object.") + return var/trans = 0 @@ -53,7 +55,8 @@ - user << "\blue You transfer [trans] units of the solution." + to_chat(user, "\blue You transfer [trans] units of the solution.") + if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -92,7 +95,8 @@ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].") trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the solution." + to_chat(user, "\blue You transfer [trans] units of the solution.") + if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -100,16 +104,19 @@ else if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) - user << "\red You cannot directly remove reagents from [target]." + to_chat(user, "\red You cannot directly remove reagents from [target].") + return if(!target.reagents.total_volume) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) - user << "\blue You fill the [src] with [trans] units of the solution." + to_chat(user, "\blue You fill the [src] with [trans] units of the solution.") + filled = 1 icon_state = "[initial(icon_state)][filled]" diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm index 53d9310f6cc..c7afd1b5f90 100644 --- a/code/modules/reagents/reagent_containers/drugs.dm +++ b/code/modules/reagents/reagent_containers/drugs.dm @@ -24,28 +24,34 @@ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume && target.reagents) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << "\red [src] is full." + to_chat(user, "\red [src] is full.") + return for(var/datum/reagent/A in target.reagents.reagent_list) if(A.reagent_state != 1) - user << "\red You can only put powders in [src]." + to_chat(user, "\red You can only put powders in [src].") + return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - user << "\blue You fill [src] with [trans] units of the contents of [target]." + to_chat(user, "\blue You fill [src] with [trans] units of the contents of [target].") + else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - user << "\red [src] is empty." + to_chat(user, "\red [src] is empty.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + to_chat(user, "\red [target] is full.") + return // /vg/: Logging transfers of bad things @@ -60,7 +66,8 @@ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].") var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the solution to [target]." + to_chat(user, "\blue You transfer [trans] units of the solution to [target].") + //Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary. @@ -75,9 +82,11 @@ if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen)) var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text)) if(length(tmp_label) > 10) - user << "\red The label can be at most 10 characters long." + to_chat(user, "\red The label can be at most 10 characters long.") + else - user << "\blue You set the label to \"[tmp_label]\"." + to_chat(user, "\blue You set the label to \"[tmp_label]\".") + src.label_text = tmp_label src.update_name_label() diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 4a4479c8b1e..b0544abd4a0 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -8,7 +8,8 @@ attack_self(mob/user as mob) if (canopened == 0) playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1) - user << "You open the drink with an audible pop!" + to_chat(user, "You open the drink with an audible pop!") + canopened = 1 flags |= OPENCONTAINER else @@ -16,7 +17,8 @@ attack(mob/M as mob, mob/user as mob, def_zone) if (canopened == 0) - user << "You need to open the drink!" + to_chat(user, "You need to open the drink!") + return return ..(M, user, def_zone) @@ -24,10 +26,12 @@ afterattack(obj/target, mob/user, proximity) if(!proximity) return if(istype(target, /obj/structure/reagent_dispensers) && (canopened == 0)) - user << "You need to open the drink!" + to_chat(user, "You need to open the drink!") + return else if(target.is_open_container() && (canopened == 0)) - user << "You need to open the drink!" + to_chat(user, "You need to open the drink!") + return else return ..(target, user, proximity) @@ -36,15 +40,20 @@ if(!..(user, 1)) return if(!reagents || reagents.total_volume==0) - user << "\blue \The [src] is empty!" + to_chat(user, "\blue \The [src] is empty!") + else if (reagents.total_volume<=src.volume/4) - user << "\blue \The [src] is almost empty!" + to_chat(user, "\blue \The [src] is almost empty!") + else if (reagents.total_volume<=src.volume*0.66) - user << "\blue \The [src] is half full!" + to_chat(user, "\blue \The [src] is half full!") + else if (reagents.total_volume<=src.volume*0.90) - user << "\blue \The [src] is almost full!" + to_chat(user, "\blue \The [src] is almost full!") + else - user << "\blue \The [src] is full!"*/ + to_chat(user, "\blue \The [src] is full!")*/ + //DRINKS diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 5cb063ee86f..5dee4c1c9d2 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -39,11 +39,13 @@ var/datum/reagents/R = src.reagents if(!R || !R.total_volume) - user << "\red None of [src] left, oh no!" + to_chat(user, "\red None of [src] left, oh no!") + return 0 if(M == user) - M << "\blue You swallow some of contents of the [src]." + to_chat(M, "\blue You swallow some of contents of the [src].") + if(reagents.total_volume) reagents.reaction(M, INGEST) spawn(0) @@ -85,26 +87,32 @@ if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << "\red [src] is full." + to_chat(user, "\red [src] is full.") + return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - user << "\blue You fill [src] with [trans] units of the contents of [target]." + to_chat(user, "\blue 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_open_container() || istype(target, /obj/item/weapon/reagent_containers/food/snacks)) if(!reagents.total_volume) - user << "\red [src] is empty." + to_chat(user, "\red [src] is empty.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red you can't add anymore to [target]." + to_chat(user, "\red you can't add anymore to [target].") + return var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the condiment to [target]." + to_chat(user, "\blue You transfer [trans] units of the condiment to [target].") + /obj/item/weapon/reagent_containers/food/condiment/on_reagent_change() if(!possible_states.len) @@ -230,15 +238,19 @@ //You can tear the bag open above food to put the condiments on it, obviously. if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) if(!reagents.total_volume) - user << "You tear open [src], but there's nothing in it." + to_chat(user, "You tear open [src], but there's nothing in it.") + qdel(src) return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "You tear open [src], but [target] is stacked so high that it just drips off!" //Not sure if food can ever be full, but better safe than sorry. + to_chat(user, "You tear open [src], but [target] is stacked so high that it just drips off!")//Not sure if food can ever be full, but better safe than sorry. + + qdel(src) return else - user << "You tear open [src] above [target] and the condiments drip onto it." + to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.") + src.reagents.trans_to(target, amount_per_transfer_from_this) qdel(src) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index e4860b880d0..492ddd60223 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -22,7 +22,8 @@ /obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) if(!reagents || !reagents.total_volume) - user << " None of [src] left, oh no!" + to_chat(user, " None of [src] left, oh no!") + return 0 if(istype(M, /mob/living/carbon)) @@ -45,29 +46,35 @@ if (istype(target, /obj/item/weapon/reagent_containers/food/drinks/cans)) var/obj/item/weapon/reagent_containers/food/drinks/cans/cantarget = target if(cantarget.canopened == 0) - user << "You need to open the drink you want to pour into!" + to_chat(user, "You need to open the drink you want to pour into!") + return if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume) - user << " [target] is empty." + to_chat(user, " [target] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << " [src] is full." + to_chat(user, " [src] is full.") + return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - user << " You fill [src] with [trans] units of the contents of [target]." + to_chat(user, " You fill [src] with [trans] units of the contents of [target].") + else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - user << " [src] is empty." + to_chat(user, " [src] is empty.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << " [target] is full." + to_chat(user, " [target] is full.") + return @@ -79,19 +86,22 @@ refillName = reagents.get_master_reagent_name() var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << " You transfer [trans] units of the solution to [target]." + to_chat(user, " You transfer [trans] units of the solution to [target].") + if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell if(refill in drinks) // Only synthesize drinks var/mob/living/silicon/robot/bro = user var/chargeAmount = max(30,4*trans) bro.cell.use(chargeAmount) - user << "Now synthesizing [trans] units of [refillName]..." + to_chat(user, "Now synthesizing [trans] units of [refillName]...") + spawn(300) reagents.add_reagent(refill, trans) - user << "Cyborg [src] refilled." + to_chat(user, "Cyborg [src] refilled.") + return @@ -101,22 +111,29 @@ if(is_hot(I)) if(src.reagents) src.reagents.chem_temp += 15 - user << "You heat [src] with [I]." + to_chat(user, "You heat [src] with [I].") + src.reagents.handle_reactions() /obj/item/weapon/reagent_containers/food/drinks/examine(mob/user) if(!..(user, 1)) return if(!reagents || reagents.total_volume==0) - user << " \The [src] is empty!" + to_chat(user, " \The [src] is empty!") + else if (reagents.total_volume<=src.volume/4) - user << " \The [src] is almost empty!" + to_chat(user, " \The [src] is almost empty!") + else if (reagents.total_volume<=src.volume*0.66) - user << " \The [src] is half full!" // We're all optimistic, right?! + to_chat(user, " \The [src] is half full!")// We're all optimistic, right?! + + else if (reagents.total_volume<=src.volume*0.90) - user << " \The [src] is almost full!" + to_chat(user, " \The [src] is almost full!") + else - user << " \The [src] is full!" + to_chat(user, " \The [src] is full!") + //////////////////////////////////////////////////////////////////////////////// /// Drinks. END diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 943c5022dc4..07bc96abbf1 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -25,16 +25,19 @@ sandwich_limit += 4 if(src.contents.len > sandwich_limit) - user << "\red If you put anything else on \the [src] it's going to collapse." + to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.") + return else if(istype(W,/obj/item/weapon/shard)) - user << "\blue You hide [W] in \the [src]." + to_chat(user, "\blue You hide [W] in \the [src].") + user.drop_item() W.loc = src update() return else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) - user << "\blue You layer [W] over \the [src]." + to_chat(user, "\blue You layer [W] over \the [src].") + var/obj/item/weapon/reagent_containers/F = W F.reagents.trans_to(src, F.reagents.total_volume) user.drop_item() @@ -83,7 +86,8 @@ /obj/item/weapon/reagent_containers/food/snacks/csandwich/examine(mob/user) ..(user) var/obj/item/O = pick(contents) - user << "\blue You think you can see [O.name] in there." + to_chat(user, "\blue You think you can see [O.name] in there.") + /obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone) @@ -98,7 +102,8 @@ H = M if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable. - H << "\red You lacerate your mouth on a [shard.name] in the sandwich!" + to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!") + H.adjustBruteLoss(5) //TODO: Target head if human. ..() */ \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 5e7d80a75e2..705e3ab625d 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -21,7 +21,8 @@ spawn(0) if(!reagents.total_volume) if(M == usr) - usr << "You finish eating \the [src]." + to_chat(usr, "You finish eating \the [src].") + usr.visible_message("[usr] finishes eating \the [src].") usr.unEquip(src) //so icons update :[ @@ -39,7 +40,8 @@ /obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone) if(reagents && !reagents.total_volume) //Shouldn't be needed but it checks to see if it has anything left in it. - user << "None of [src] left, oh no!" + to_chat(user, "None of [src] left, oh no!") + M.unEquip(src) //so icons update :[ qdel(src) return 0 @@ -60,11 +62,14 @@ if (bitecount==0) return else if (bitecount==1) - user << "\blue \The [src] was bitten by someone!" + to_chat(user, "\blue \The [src] was bitten by someone!") + else if (bitecount<=3) - user << "\blue \The [src] was bitten [bitecount] times!" + to_chat(user, "\blue \The [src] was bitten [bitecount] times!") + else - user << "\blue \The [src] was bitten multiple times!" + to_chat(user, "\blue \The [src] was bitten multiple times!") + /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W, mob/user, params) @@ -81,7 +86,8 @@ var/obj/item/weapon/kitchen/utensil/U = W if(U.contents.len >= U.max_contents) - user << "You cannot fit anything else on your [U]." + to_chat(user, "You cannot fit anything else on your [U].") + return user.visible_message( \ @@ -132,7 +138,8 @@ else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable)) if(!iscarbon(user)) return 1 - user << "\red You slip [W] inside [src]." + to_chat(user, "\red You slip [W] inside [src].") + user.unEquip(W) if ((user.client && user.s_active != src)) user.client.screen -= W @@ -148,7 +155,8 @@ !(locate(/obj/machinery/optable) in src.loc) && \ !(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \ ) - user << "\red You cannot slice [src] here! You need a table or at least a tray to do it." + to_chat(user, "\red You cannot slice [src] here! You need a table or at least a tray to do it.") + return 1 var/slices_lost = 0 if (!inaccurate) @@ -193,7 +201,8 @@ bitecount++ else if(ismouse(M)) var/mob/living/simple_animal/mouse/N = M - N << text("\blue You nibble away at [src].") + to_chat(N, text("\blue You nibble away at [src].")) + if(prob(50)) N.visible_message("[N] nibbles away at [src].", "") //N.emote("nibbles away at the [src]") @@ -509,10 +518,12 @@ var/clr = C.colourName if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) - usr << "\blue The egg refuses to take on this color!" + to_chat(usr, "\blue The egg refuses to take on this color!") + return - usr << "\blue You color \the [src] [clr]" + to_chat(usr, "\blue You color \the [src] [clr]") + icon_state = "egg-[clr]" item_color = clr else @@ -1141,7 +1152,8 @@ bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 On_Consume() if(prob(unpopped)) //lol ...what's the point? - usr << "\red You bite down on an un-popped kernel!" + to_chat(usr, "\red You bite down on an un-popped kernel!") + unpopped = max(0, unpopped-1) ..() @@ -1602,14 +1614,16 @@ /obj/item/weapon/reagent_containers/food/snacks/monkeycube/afterattack(obj/O, mob/user, proximity) if(!proximity) return if(istype(O,/obj/structure/sink) && !wrapped) - user << "You place [src] under a stream of water..." + to_chat(user, "You place [src] under a stream of water...") + user.drop_item() forceMove(get_turf(O)) return Expand() if(istype(O, /obj/machinery/computer/camera_advanced/xenobio)) var/obj/machinery/computer/camera_advanced/xenobio/X = O X.monkeys++ - user << "You feed [src] to the [X]. It now has [X.monkeys] monkey cubes stored." + to_chat(user, "You feed [src] to the [X]. It now has [X.monkeys] monkey cubes stored.") + qdel(src) return ..() @@ -1638,7 +1652,8 @@ /obj/item/weapon/reagent_containers/food/snacks/monkeycube/proc/Unwrap(mob/user) icon_state = "monkeycube" desc = "Just add water!" - user << "You unwrap the cube." + to_chat(user, "You unwrap the cube.") + wrapped = 0 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped @@ -2827,7 +2842,8 @@ if( open && pizza ) user.put_in_hands( pizza ) - user << "\red You take the [src.pizza] out of the [src]." + to_chat(user, "\red You take the [src.pizza] out of the [src].") + src.pizza = null update_icon() return @@ -2841,7 +2857,8 @@ boxes -= box user.put_in_hands( box ) - user << "\red You remove the topmost [src] from your hand." + to_chat(user, "\red You remove the topmost [src] from your hand.") + box.update_icon() update_icon() return @@ -2880,11 +2897,14 @@ box.update_icon() update_icon() - user << "\red You put the [box] ontop of the [src]!" + to_chat(user, "\red You put the [box] ontop of the [src]!") + else - user << "\red The stack is too high!" + to_chat(user, "\red The stack is too high!") + else - user << "\red Close the [box] first!" + to_chat(user, "\red Close the [box] first!") + return @@ -2897,9 +2917,11 @@ update_icon() - user << "\red You put the [I] in the [src]!" + to_chat(user, "\red You put the [I] in the [src]!") + else - user << "\red You try to push the [I] through the lid but it doesn't work!" + to_chat(user, "\red You try to push the [I] through the lid but it doesn't work!") + return if( istype(I, /obj/item/weapon/pen/) ) @@ -3202,10 +3224,12 @@ if(istype(I, /obj/item/weapon/kitchen/rollingpin)) if(isturf(loc)) new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(loc) - user << "You flatten [src]." + to_chat(user, "You flatten [src].") + qdel(src) else - user << "You need to put [src] on a surface to roll it out!" + to_chat(user, "You need to put [src] on a surface to roll it out!") + else ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 12fb6f6db69..1b65d110cb3 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -17,7 +17,8 @@ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) - user << "You cut the meat in thin strips." + to_chat(user, "You cut the meat in thin strips.") + qdel(src) else ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index dca1b419103..aa291bee0d0 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -50,15 +50,18 @@ if(!..(user, 2)) return if (!is_open_container()) - user << "Airtight lid seals it completely." + to_chat(user, "Airtight lid seals it completely.") + /obj/item/weapon/reagent_containers/glass/attack_self() ..() if (is_open_container()) - usr << "You put the lid on \the [src]." + to_chat(usr, "You put the lid on \the [src].") + flags ^= OPENCONTAINER else - usr << "You take the lid off \the [src]." + to_chat(usr, "You take the lid off \the [src].") + flags |= OPENCONTAINER update_icon() @@ -72,7 +75,8 @@ return if(ismob(target) && target.reagents && reagents.total_volume) - user << "You splash the solution onto [target]." + to_chat(user, "You splash the solution onto [target].") + var/mob/living/M = target var/list/injected = list() @@ -96,23 +100,28 @@ else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. if(!target.reagents.total_volume && target.reagents) - user << "[target] is empty." + to_chat(user, "[target] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << "[src] is full." + to_chat(user, "[src] is full.") + return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) - user << "You fill [src] with [trans] units of the contents of [target]." + to_chat(user, "You fill [src] with [trans] units of the contents of [target].") + else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) - user << "[src] is empty." + to_chat(user, "[src] is empty.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "[target] is full." + to_chat(user, "[target] is full.") + return // /vg/: Logging transfers of bad things @@ -127,10 +136,12 @@ log_game("[key_name(user)] added [reagents.get_reagent_ids(1)] to \a [target] with [src].") var/trans = reagents.trans_to(target, amount_per_transfer_from_this) - user << "You transfer [trans] units of the solution to [target]." + to_chat(user, "You transfer [trans] units of the solution to [target].") + else if(istype(target, /obj/item/weapon/reagent_containers/glass) && !target.is_open_container()) - user << "You cannot fill [target] while it is sealed." + to_chat(user, "You cannot fill [target] while it is sealed.") + return /*else if(istype(target, /obj/machinery/bunsen_burner)) @@ -143,7 +154,8 @@ return else if(reagents.total_volume) - user << "You splash the solution onto [target]." + to_chat(user, "You splash the solution onto [target].") + reagents.reaction(target, TOUCH) spawn(5) reagents.clear_reagents() return @@ -155,14 +167,17 @@ if(is_hot(I)) if(reagents) reagents.chem_temp += 15 - user << "You heat [src] with [I]." + to_chat(user, "You heat [src] with [I].") + reagents.handle_reactions() if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text)) if(length(tmp_label) > MAX_NAME_LEN) - user << "The label can be at most [MAX_NAME_LEN] characters long." + to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.") + else - user << "You set the label to \"[tmp_label]\"." + to_chat(user, "You set the label to \"[tmp_label]\".") + label_text = tmp_label update_name_label() if(istype(I,/obj/item/weapon/storage/bag)) @@ -230,12 +245,14 @@ if(usr.stat || !usr.canmove || usr.restrained()) return if (assembly) - usr << "You detach [assembly] from \the [src]" + to_chat(usr, "You detach [assembly] from \the [src]") + usr.put_in_hands(assembly) assembly = null update_icon() else - usr << "There is no assembly to remove." + to_chat(usr, "There is no assembly to remove.") + /obj/item/weapon/reagent_containers/glass/beaker/proc/heat_beaker() if(reagents) @@ -245,7 +262,8 @@ /obj/item/weapon/reagent_containers/glass/beaker/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W,/obj/item/device/assembly_holder)) if (assembly) - usr << "The [src] already has an assembly." + to_chat(usr, "The [src] already has an assembly.") + return ..() assembly = W user.drop_item() @@ -343,7 +361,8 @@ /obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob, params) if(isprox(D)) - user << "You add [D] to [src]." + to_chat(user, "You add [D] to [src].") + qdel(D) user.put_in_hands(new /obj/item/weapon/bucket_sensor) user.unEquip(src) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index eb932e8488f..268004299c0 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -17,13 +17,16 @@ /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user) if(!reagents.total_volume) - user << "\red [src] is empty." + to_chat(user, "\red [src] is empty.") + return if(!istype(M)) return if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) - user << "\blue You inject [M] with [src]." - M << "\red You feel a tiny prick!" + to_chat(user, "\blue You inject [M] with [src].") + + to_chat(M, "\red You feel a tiny prick!") + src.reagents.add_reagent(M) if(M.reagents) @@ -41,7 +44,8 @@ M.LAssailant = user var/trans = reagents.trans_to(M, amount_per_transfer_from_this) - user << "\blue [trans] units injected. [reagents.total_volume] units remaining in [src]." + to_chat(user, "\blue [trans] units injected. [reagents.total_volume] units remaining in [src].") + return @@ -102,9 +106,11 @@ /obj/item/weapon/reagent_containers/hypospray/autoinjector/examine(mob/user) ..(user) if(reagents && reagents.reagent_list.len) - user << "\blue It is currently loaded." + to_chat(user, "\blue It is currently loaded.") + else - user << "\blue It is spent." + to_chat(user, "\blue It is spent.") + /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks name = "teporone autoinjector" diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index 6dac43db7d1..c4920fb395b 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -33,7 +33,8 @@ if(target.is_open_container() != 0 && target.reagents) if(!target.reagents.total_volume) - user << "[target] is empty. Cant dissolve [src]." + to_chat(user, "[target] is empty. Cant dissolve [src].") + return // /vg/: Logging transfers of bad things @@ -47,7 +48,8 @@ message_admins("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].[hl] (JMP)") log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].") - user << "You dissolve [src] in [target]." + to_chat(user, "You dissolve [src] in [target].") + reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) O.show_message("[user] puts something in [target].", 1) diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm index c5da1639304..c039a747255 100644 --- a/code/modules/reagents/reagent_containers/robodropper.dm +++ b/code/modules/reagents/reagent_containers/robodropper.dm @@ -15,11 +15,13 @@ if(filled) if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + to_chat(user, "\red [target] is full.") + return if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food)) //You can inject humans and food but you cant remove the shit. - user << "\red You cannot directly fill this object." + to_chat(user, "\red You cannot directly fill this object.") + return @@ -62,7 +64,8 @@ src.reagents.reaction(safe_thing, TOUCH) - user << "\blue You transfer [trans] units of the solution." + to_chat(user, "\blue You transfer [trans] units of the solution.") + if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -88,7 +91,8 @@ M.LAssailant = user trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You transfer [trans] units of the solution." + to_chat(user, "\blue You transfer [trans] units of the solution.") + if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -96,16 +100,19 @@ else if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) - user << "\red You cannot directly remove reagents from [target]." + to_chat(user, "\red You cannot directly remove reagents from [target].") + return if(!target.reagents.total_volume) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) - user << "\blue You fill the dropper with [trans] units of the solution." + to_chat(user, "\blue You fill the dropper with [trans] units of the solution.") + filled = 1 icon_state = "[initial(icon_state)][filled]" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index 04859c66c32..b1c9f631e26 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -27,19 +27,23 @@ if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution if(!A.reagents.total_volume && A.reagents) - user << "\The [A] is empty." + to_chat(user, "\The [A] is empty.") + return if(reagents.total_volume >= reagents.maximum_volume) - user << "\The [src] is full." + to_chat(user, "\The [src] is full.") + return var/trans = A.reagents.trans_to(src, A:amount_per_transfer_from_this) - user << "You fill \the [src] with [trans] units of the contents of \the [A]." + to_chat(user, "You fill \the [src] with [trans] units of the contents of \the [A].") + return if(reagents.total_volume < amount_per_transfer_from_this) - user << "\The [src] is empty!" + to_chat(user, "\The [src] is empty!") + return spray(A) @@ -79,11 +83,13 @@ amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1) - 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, "You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.") + /obj/item/weapon/reagent_containers/spray/examine(mob/user) if(..(user, 0) && user==src.loc) - user << "[round(src.reagents.total_volume)] units left." + to_chat(user, "[round(src.reagents.total_volume)] units left.") + /obj/item/weapon/reagent_containers/spray/verb/empty() @@ -95,7 +101,8 @@ if (alert(usr, "Are you sure you want to empty that?", "Empty Bottle:", "Yes", "No") != "Yes") return if(isturf(usr.loc) && src.loc == usr) - usr << "You empty \the [src] onto the floor." + to_chat(usr, "You empty \the [src] onto the floor.") + reagents.reaction(usr.loc) src.reagents.clear_reagents() @@ -207,7 +214,8 @@ /obj/item/weapon/reagent_containers/spray/chemsprayer/attack_self(var/mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) - user << "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray." + to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.") + // Plant-B-Gone diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 5978c615942..fffd08b3352 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -62,7 +62,8 @@ return if(mode == SYRINGE_BROKEN) - user << "\red This syringe is broken!" + to_chat(user, "\red This syringe is broken!") + return /* if (user.a_intent == I_HARM && ismob(target)) @@ -76,23 +77,28 @@ if(SYRINGE_DRAW) if(reagents.total_volume >= reagents.maximum_volume) - user << "\red The syringe is full." + to_chat(user, "\red The syringe is full.") + return if(ismob(target))//Blood! if(istype(target, /mob/living/carbon/slime)) - user << "\red You are unable to locate any blood." + to_chat(user, "\red You are unable to locate any blood.") + return if(src.reagents.has_reagent("blood")) - user << "\red There is already a blood sample in this syringe" + to_chat(user, "\red There is already a blood sample in this syringe") + return if(istype(target, /mob/living/carbon))//maybe just add a blood reagent to all mobs. Then you can suck them dry...With hundreds of syringes. Jolly good idea. var/mob/living/carbon/T = target if(!T.dna) - usr << "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)" + to_chat(usr, "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)") + return if(NOCLONE in T.mutations) //target done been et, no more blood in him - user << "\red You are unable to locate any blood." + to_chat(user, "\red You are unable to locate any blood.") + return @@ -100,7 +106,8 @@ if(istype(target,/mob/living/carbon/human)) var/mob/living/carbon/human/H = T if(H.species.flags & NO_BLOOD) - usr << "You are unable to locate any blood." + to_chat(usr, "You are unable to locate any blood.") + return if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) time = 60 @@ -114,7 +121,8 @@ var/amount = src.reagents.maximum_volume - src.reagents.total_volume if(amount == 0) - usr << "The syringe is full!" + to_chat(usr, "The syringe is full!") + return var/datum/reagent/B @@ -133,7 +141,8 @@ src.on_reagent_change() src.reagents.handle_reactions() - user << "\blue You take a blood sample from [target]" + to_chat(user, "\blue You take a blood sample from [target]") + for(var/mob/O in viewers(4, user)) O.show_message("\red [user] takes a blood sample from [target].", 1) else @@ -141,47 +150,56 @@ else //if not mob if(!target.reagents.total_volume) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract)) - user << "\red You cannot directly remove reagents from this object." + to_chat(user, "\red You cannot directly remove reagents from this object.") + return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? - user << "\blue You fill the syringe with [trans] units of the solution." + to_chat(user, "\blue You fill the syringe with [trans] units of the solution.") + if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() if(SYRINGE_INJECT) if(!reagents.total_volume) - user << "\red The Syringe is empty." + to_chat(user, "\red The Syringe is empty.") + return if(istype(target, /obj/item/weapon/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes)) - user << "\red You cannot directly fill this object." + to_chat(user, "\red You cannot directly fill this object.") + return if(istype(target, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/C = target if(istype(C.loc, /obj/item/weapon/storage/fancy/cigarettes)) - user << "\red You cannot inject a cigarette while it's still in the pack." + to_chat(user, "\red You cannot inject a cigarette while it's still in the pack.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + to_chat(user, "\red [target] is full.") + return var/mob/living/carbon/human/H = target if(istype(H)) var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) if(!affected) - user << "\The [H] is missing that limb!" + to_chat(user, "\The [H] is missing that limb!") + return /* else if(affected.status & ORGAN_ROBOT) - user << "You cannot inject a robotic limb." + to_chat(user, "You cannot inject a robotic limb.") + return */ if(ismob(target) && target != user) @@ -256,7 +274,8 @@ C.inject_blood(src,5) else trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units." + to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.") + if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() @@ -307,7 +326,8 @@ var/obj/item/organ/external/affecting = target:get_organ(target_zone) if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump()) - user << "They are missing that limb!" + to_chat(user, "They are missing that limb!") + return var/hit_area = affecting.name @@ -385,40 +405,48 @@ if(SYRINGE_DRAW) if(reagents.total_volume >= reagents.maximum_volume) - user << "\red The syringe is full." + to_chat(user, "\red The syringe is full.") + return if(ismob(target)) if(istype(target, /mob/living/carbon))//I Do not want it to suck 50 units out of people - usr << "This needle isn't designed for drawing blood." + to_chat(usr, "This needle isn't designed for drawing blood.") + return else //if not mob if(!target.reagents.total_volume) - user << "\red [target] is empty." + to_chat(user, "\red [target] is empty.") + return if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) - user << "\red You cannot directly remove reagents from this object." + to_chat(user, "\red You cannot directly remove reagents from this object.") + return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? - user << "\blue You fill the syringe with [trans] units of the solution." + to_chat(user, "\blue You fill the syringe with [trans] units of the solution.") + if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() if(SYRINGE_INJECT) if(!reagents.total_volume) - user << "\red The Syringe is empty." + to_chat(user, "\red The Syringe is empty.") + return if(istype(target, /obj/item/weapon/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food)) - user << "\red You cannot directly fill this object." + to_chat(user, "\red You cannot directly fill this object.") + return if(target.reagents.total_volume >= target.reagents.maximum_volume) - user << "\red [target] is full." + to_chat(user, "\red [target] is full.") + return if(ismob(target) && target != user) @@ -432,7 +460,8 @@ src.reagents.reaction(target, INGEST) spawn(5) var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) - user << "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units." + to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.") + if (reagents.total_volume >= reagents.maximum_volume && 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 ed2809896c7..04857089fb9 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -26,12 +26,15 @@ /obj/structure/reagent_dispensers/examine(mob/user) if(!..(user, 2)) return - user << "\blue It contains:" + to_chat(user, "\blue It contains:") + if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) - user << "\blue [R.volume] units of [R.name]" + to_chat(user, "\blue [R.volume] units of [R.name]") + else - user << "\blue Nothing." + to_chat(user, "\blue Nothing.") + /obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" @@ -115,7 +118,8 @@ if(!..(user, 2)) return if(rig) - usr << "There is some kind of device rigged to the tank." + to_chat(usr, "There is some kind of device rigged to the tank.") + /obj/structure/reagent_dispensers/fueltank/attack_hand() if (rig) @@ -129,7 +133,8 @@ /obj/structure/reagent_dispensers/fueltank/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W,/obj/item/device/assembly_holder) && accepts_rig) if (rig) - user << "\red There is another device in the way." + to_chat(user, "\red There is another device in the way.") + return ..() user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]") if(do_after(user, 20, target = src)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index c4ba69dc71a..59bda4fe8c3 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -222,7 +222,8 @@ // attack with hand, switch position /obj/machinery/conveyor_switch/attack_hand(mob/user) if(!allowed(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 10fb01573d5..5c961aefb89 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -90,7 +90,8 @@ return if(anchored) - usr << "You must unfasten the pipe before rotating it." + to_chat(usr, "You must unfasten the pipe before rotating it.") + return dir = turn(dir, -90) @@ -103,7 +104,8 @@ return if(anchored) - usr << "You must unfasten the pipe before flipping it." + to_chat(usr, "You must unfasten the pipe before flipping it.") + return dir = turn(dir, 180) @@ -164,17 +166,20 @@ var/turf/T = src.loc if(T.intact) - user << "You can only attach the [nicetype] if the floor plating is removed." + to_chat(user, "You can only attach the [nicetype] if the floor plating is removed.") + return var/obj/structure/disposalpipe/CP = locate() in T if(ptype>=6 && ptype <= 8) // Disposal or outlet if(CP) // There's something there if(!istype(CP,/obj/structure/disposalpipe/trunk)) - user << "The [nicetype] requires a trunk underneath it in order to work." + to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.") + return else // Nothing under, fuck. - user << "The [nicetype] requires a trunk underneath it in order to work." + to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.") + return else if(CP) @@ -183,7 +188,8 @@ if(istype(CP, /obj/structure/disposalpipe/broken)) pdir = CP.dir if(pdir & dpdir) - user << "There is already a [nicetype] at that location." + to_chat(user, "There is already a [nicetype] at that location.") + return @@ -195,7 +201,8 @@ density = 0 else density = 1 - user << "You detach the [nicetype] from the underfloor." + to_chat(user, "You detach the [nicetype] from the underfloor.") + else anchored = 1 if(ispipe) @@ -203,7 +210,8 @@ density = 0 else density = 1 // We don't want disposal bins or outlets to go density 0 - user << "You attach the [nicetype] to the underfloor." + to_chat(user, "You attach the [nicetype] to the underfloor.") + playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) update() @@ -212,10 +220,12 @@ var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) - user << "Welding the [nicetype] in place." + to_chat(user, "Welding the [nicetype] in place.") + if(do_after(user, 20, target = src)) if(!src || !W.isOn()) return - user << "The [nicetype] has been welded in place!" + to_chat(user, "The [nicetype] has been welded in place!") + update() // TODO: Make this neat if(ispipe) // Pipe @@ -254,8 +264,10 @@ qdel(src) return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return else - user << "You need to attach it to the plating first!" + to_chat(user, "You need to attach it to the plating first!") + return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index ce5ca78ebe0..0f549f7b39b 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -69,30 +69,36 @@ if(mode<=0) // It's off if(istype(I, /obj/item/weapon/screwdriver)) if(contents.len > 0) - user << "Eject the items first!" + to_chat(user, "Eject the items first!") + return if(mode==0) // It's off but still not unscrewed mode=-1 // Set it to doubleoff l0l playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You remove the screws around the power connection." + to_chat(user, "You remove the screws around the power connection.") + return else if(mode==-1) mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You attach the screws around the power connection." + to_chat(user, "You attach the screws around the power connection.") + return else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1) if(contents.len > 0) - user << "Eject the items first!" + to_chat(user, "Eject the items first!") + return var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) - user << "You start slicing the floorweld off the disposal unit." + to_chat(user, "You start slicing the floorweld off the disposal unit.") + if(do_after(user,20, target = src)) if(!src || !W.isOn()) return - user << "You sliced the floorweld off the disposal unit." + to_chat(user, "You sliced the floorweld off the disposal unit.") + var/obj/structure/disposalconstruct/C = new (src.loc) src.transfer_fingerprints_to(C) C.ptype = 6 // 6 = disposal unit @@ -102,11 +108,13 @@ qdel(src) return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return if(istype(I, /obj/item/weapon/melee/energy/blade)) - user << "You can't place that item inside the disposal unit." + to_chat(user, "You can't place that item inside the disposal unit.") + return if(istype(I, /obj/item/weapon/storage)) @@ -146,7 +154,8 @@ if(I) I.loc = src - user << "You place \the [I] into the [src]." + to_chat(user, "You place \the [I] into the [src].") + for(var/mob/M in viewers(src)) if(M == user) continue @@ -176,10 +185,12 @@ if(target == user && !user.stat && !user.weakened && !user.stunned && !user.paralysis) // if drop self, then climbed in // must be awake, not stunned or whatever msg = "[user.name] climbs into the [src]." - user << "You climb into the [src]." + to_chat(user, "You climb into the [src].") + else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" - user << "You stuff [target.name] into the [src]!" + to_chat(user, "You stuff [target.name] into the [src]!") + user.attack_log += text("\[[time_stamp()]\] Has placed [key_name(target)] in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [key_name(user)]") @@ -239,7 +250,8 @@ return if(user && user.loc == src) - usr << "\red You cannot reach the controls from inside." + to_chat(usr, "\red You cannot reach the controls from inside.") + return // Clumsy folks can only flush it. @@ -279,11 +291,13 @@ /obj/machinery/disposal/Topic(href, href_list) if(usr.loc == src) - usr << "\red You cannot reach the controls from inside." + to_chat(usr, "\red You cannot reach the controls from inside.") + return if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1 - usr << "\red The disposal units power is disabled." + to_chat(usr, "\red The disposal units power is disabled.") + return if(..()) @@ -636,7 +650,8 @@ if (src.loc) for (var/mob/M in hearers(src.loc.loc)) - M << "CLONG, clong!" + to_chat(M, "CLONG, clong!") + playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) @@ -884,15 +899,18 @@ // check if anything changed over 2 seconds var/turf/uloc = user.loc var/atom/wloc = W.loc - user << "Slicing the disposal pipe." + to_chat(user, "Slicing the disposal pipe.") + sleep(30) if(!W.isOn()) return if(user.loc == uloc && wloc == W.loc) welded() else - user << "You must stay still while welding the pipe." + to_chat(user, "You must stay still while welding the pipe.") + else - user << "You need more welding fuel to cut the pipe." + to_chat(user, "You need more welding fuel to cut the pipe.") + return // called when pipe is cut with welder @@ -1032,7 +1050,8 @@ sortType = O.currTag playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << "\blue Changed filter to [tag]" + to_chat(user, "\blue Changed filter to [tag]") + updatedesc() @@ -1200,15 +1219,18 @@ // check if anything changed over 2 seconds var/turf/uloc = user.loc var/atom/wloc = W.loc - user << "Slicing the disposal pipe." + to_chat(user, "Slicing the disposal pipe.") + sleep(30) if(!W.isOn()) return if(user.loc == uloc && wloc == W.loc) welded() else - user << "You must stay still while welding the pipe." + to_chat(user, "You must stay still while welding the pipe.") + else - user << "You need more welding fuel to cut the pipe." + to_chat(user, "You need more welding fuel to cut the pipe.") + return // would transfer to next pipe segment, but we are in a trunk @@ -1315,21 +1337,25 @@ if(mode==0) mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You remove the screws around the power connection." + to_chat(user, "You remove the screws around the power connection.") + return else if(mode==1) mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You attach the screws around the power connection." + to_chat(user, "You attach the screws around the power connection.") + return else if(istype(I,/obj/item/weapon/weldingtool) && mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) - user << "You start slicing the floorweld off the disposal outlet." + to_chat(user, "You start slicing the floorweld off the disposal outlet.") + if(do_after(user,20, target = src)) if(!src || !W.isOn()) return - user << "You sliced the floorweld off the disposal outlet." + to_chat(user, "You sliced the floorweld off the disposal outlet.") + var/obj/structure/disposalconstruct/C = new (src.loc) src.transfer_fingerprints_to(C) C.ptype = 7 // 7 = outlet @@ -1339,7 +1365,8 @@ qdel(src) return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 07c245d889d..b872867ad07 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -31,14 +31,16 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << "*[tag]*" + to_chat(user, "*[tag]*") + sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) else if(istype(W, /obj/item/weapon/pen)) var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) - user << "Invalid text." + to_chat(user, "Invalid text.") + return user.visible_message("[user] labels [src] as [str].") name = "[name] ([str])" @@ -55,7 +57,8 @@ if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube new /obj/item/weapon/c_tube( get_turf(user) ) else - user << "You need more paper." + to_chat(user, "You need more paper.") + /obj/item/smallDelivery @@ -85,14 +88,16 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) - user << "*[tag]*" + to_chat(user, "*[tag]*") + sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) else if(istype(W, /obj/item/weapon/pen)) var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) - user << "Invalid text." + to_chat(user, "Invalid text.") + return user.visible_message("[user] labels [src] as [str].") name = "[name] ([str])" @@ -106,7 +111,8 @@ if(WP.amount <= 0 && !WP.loc) //if we used our last wrapping paper, drop a cardboard tube new /obj/item/weapon/c_tube( get_turf(user) ) else - user << "You need more paper." + to_chat(user, "You need more paper.") + @@ -161,7 +167,8 @@ P.wrapped = O O.loc = P else - user << "You need more paper." + to_chat(user, "You need more paper.") + return else if(istype (target, /obj/structure/closet)) var/obj/structure/closet/O = target @@ -174,10 +181,12 @@ O.welded = 1 O.loc = P else - user << "You need more paper." + to_chat(user, "You need more paper.") + return else - user << "The object you are trying to wrap is unsuitable for the sorting machinery." + to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery.") + return user.visible_message("[user] wraps [target].") @@ -307,21 +316,25 @@ if(c_mode==0) c_mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You remove the screws around the power connection." + to_chat(user, "You remove the screws around the power connection.") + return else if(c_mode==1) c_mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) - user << "You attach the screws around the power connection." + to_chat(user, "You attach the screws around the power connection.") + return else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) - user << "You start slicing the floorweld off the delivery chute." + to_chat(user, "You start slicing the floorweld off the delivery chute.") + if(do_after(user,20, target = src)) if(!src || !W.isOn()) return - user << "You sliced the floorweld off the delivery chute." + to_chat(user, "You sliced the floorweld off the delivery chute.") + var/obj/structure/disposalconstruct/C = new (src.loc) C.ptype = 8 // 8 = Delivery chute C.update() @@ -330,5 +343,6 @@ qdel(src) return else - user << "You need more welding fuel to complete this task." + to_chat(user, "You need more welding fuel to complete this task.") + return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index 249b4956953..f97fcc956a0 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -119,26 +119,31 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). default_deconstruction_crowbar(O) return else - user << "You can't load the [src.name] while it's opened." + to_chat(user, "You can't load the [src.name] while it's opened.") + return if (disabled) return if (!linked_console) - user << "The [name] must be linked to an R&D console first!" + to_chat(user, "The [name] must be linked to an R&D console first!") + return 1 if (O.is_open_container()) return if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond)) - user << "You cannot insert this item into the [name]!" + to_chat(user, "You cannot insert this item into the [name]!") + return if (stat) return if (busy) - user << "The [name] is busy. Please wait for completion of previous operation." + to_chat(user, "The [name] is busy. Please wait for completion of previous operation.") + return var/obj/item/stack/sheet/stack = O if ((TotalMaterials() + stack.perunit) > max_material_amount) - user << "The [name] is full. Please remove glass from the protolathe in order to insert more." + to_chat(user, "The [name] is full. Please remove glass from the protolathe in order to insert more.") + return var/amount = round(input("How many sheets do you want to add?") as num) @@ -149,7 +154,8 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). busy = 1 use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10))) - user << "You add [amount] sheets to the [src.name]." + to_chat(user, "You add [amount] sheets to the [src.name].") + if(istype(stack, /obj/item/stack/sheet/glass)) g_amount += amount * MINERAL_MATERIAL_AMOUNT else if(istype(stack, /obj/item/stack/sheet/mineral/gold)) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 0ffec90b1ec..346b6437347 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -63,26 +63,32 @@ Note: Must be placed within 3 tiles of the R&D Console if (disabled) return if (!linked_console) - user << "The [src.name] must be linked to an R&D console first!" + to_chat(user, "The [src.name] must be linked to an R&D console first!") + return if (busy) - user << "The [src.name] is busy right now." + to_chat(user, "The [src.name] is busy right now.") + return if (istype(O, /obj/item) && !loaded_item) if(!O.origin_tech) - user << "This doesn't seem to have a tech origin!" + to_chat(user, "This doesn't seem to have a tech origin!") + return var/list/temp_tech = ConvertReqString2List(O.origin_tech) if (temp_tech.len == 0) - user << "You cannot deconstruct this item!" + to_chat(user, "You cannot deconstruct this item!") + return if(!user.drop_item()) - user << "\The [O] is stuck to your hand, you cannot put it in the [src.name]!" + to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!") + return busy = 1 loaded_item = O O.loc = src - user << "You add the [O.name] to the [src.name]!" + to_chat(user, "You add the [O.name] to the [src.name]!") + flick("d_analyzer_la", src) spawn(10) icon_state = "d_analyzer_l" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index d7955228168..aef6ced8f01 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -129,33 +129,40 @@ return if(!checkCircumstances(O)) - user << "The [O] is not yet valid for the [src] and must be completed!" + to_chat(user, "The [O] is not yet valid for the [src] and must be completed!") + return if (disabled) return if (!linked_console) - user << "The [src] must be linked to an R&D console first!" + to_chat(user, "The [src] must be linked to an R&D console first!") + return if (loaded_item) - user << "The [src] is already loaded." + to_chat(user, "The [src] is already loaded.") + return if (istype(O, /obj/item)) if(!O.origin_tech) - user << "This doesn't seem to have a tech origin!" + to_chat(user, "This doesn't seem to have a tech origin!") + return var/list/temp_tech = ConvertReqString2List(O.origin_tech) if (temp_tech.len == 0) - user << "You cannot experiment on this item!" + to_chat(user, "You cannot experiment on this item!") + return if(O.reliability < 90 && O.crit_fail == 0) - usr << "Item is neither reliable enough or broken enough to learn from." + to_chat(usr, "Item is neither reliable enough or broken enough to learn from.") + return if(!user.drop_item()) return loaded_item = O O.loc = src - user << "You add the [O.name] to the machine." + to_chat(user, "You add the [O.name] to the machine.") + flick("h_lathe_load", src) return @@ -510,7 +517,8 @@ if(globalMalf > 36 && globalMalf < 50) visible_message("[src] improves [exp_on], drawing the life essence of those nearby!") for(var/mob/living/m in view(4,src)) - m << "You feel your flesh being torn from you, mists of blood drifting to [src]!" + to_chat(m, "You feel your flesh being torn from you, mists of blood drifting to [src]!") + m.take_overall_damage(50) investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor") var/list/reqs = ConvertReqString2List(exp_on.origin_tech) @@ -559,15 +567,18 @@ src.updateUsrDialog() else if(recentlyExperimented) - usr << "[src] has been used too recently!" + to_chat(usr, "[src] has been used too recently!") + return else if(!loaded_item) updateUsrDialog() //Set the interface to unloaded mode - usr << "[src] is not currently loaded!" + to_chat(usr, "[src] is not currently loaded!") + return else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item) updateUsrDialog() //Refresh interface to update interface hrefs - usr << "Interface failure detected in [src]. Please try again." + to_chat(usr, "Interface failure detected in [src]. Please try again.") + return var/dotype if(text2num(scantype) == SCANTYPE_DISCOVER) @@ -639,7 +650,8 @@ /obj/item/weapon/relic/attack_self(mob/user) if(revealed) if(cooldown) - user << "[src] does not react!" + to_chat(user, "[src] does not react!") + return else if(src.loc == user) cooldown = TRUE @@ -647,7 +659,8 @@ spawn(cooldownMax) cooldown = FALSE else - user << "You aren't quite sure what to do with this, yet." + to_chat(user, "You aren't quite sure what to do with this, yet.") + //////////////// RELIC PROCS ///////////////////////////// @@ -678,7 +691,8 @@ /obj/item/weapon/relic/proc/petSpray(mob/user) var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) - user << message + to_chat(user, message) + var/animals = rand(1,25) var/counter var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp) @@ -687,7 +701,8 @@ new mobType(get_turf(src)) warn_admins(user, "Mass Mob Spawn") if(prob(60)) - user << "[src] falls apart!" + to_chat(user, "[src] falls apart!") + qdel(src) /obj/item/weapon/relic/proc/rapidDupe(mob/user) @@ -713,7 +728,8 @@ warn_admins(user, "Rapid duplicator", 0) /obj/item/weapon/relic/proc/explode(mob/user) - user << "[src] begins to heat up!" + to_chat(user, "[src] begins to heat up!") + spawn(rand(35,100)) if(src.loc == user) visible_message("The [src]'s top opens, releasing a powerful blast!") @@ -722,7 +738,8 @@ qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!! /obj/item/weapon/relic/proc/teleport(mob/user) - user << "The [src] begins to vibrate!" + to_chat(user, "The [src] begins to vibrate!") + spawn(rand(10,30)) var/turf/userturf = get_turf(user) if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 9744e726cdc..4e0408b8bbc 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -113,8 +113,10 @@ var/global/list/obj/machinery/message_server/message_servers = list() Console.set_light(2) /obj/machinery/message_server/attack_hand(user as mob) -// user << "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays." - user << "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]" +// to_chat(user, "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.") + + to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]") + active = !active update_icon() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index ae0bfd6ce7d..80153dbd534 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -112,15 +112,18 @@ Note: Must be placed west/left of and R&D console to function. default_deconstruction_crowbar(O) return 1 else - user << "You can't load the [src.name] while it's opened." + to_chat(user, "You can't load the [src.name] while it's opened.") + return 1 if (disabled) return if (!linked_console) - user << " The [src.name] must be linked to an R&D console first!" + to_chat(user, " The [src.name] must be linked to an R&D console first!") + return 1 if (busy) - user << "The [src.name] is busy. Please wait for completion of previous operation." + to_chat(user, "The [src.name] is busy. Please wait for completion of previous operation.") + return 1 if (O.is_open_container()) return @@ -130,7 +133,8 @@ Note: Must be placed west/left of and R&D console to function. return 1 if(!materials.has_space( materials.get_item_material_amount(O) )) - user << "The [src.name]'s material bin is full! Please remove material before adding more." + to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.") + return 1 var/obj/item/stack/sheet/stack = O @@ -143,7 +147,8 @@ Note: Must be placed west/left of and R&D console to function. else busy = 1 use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10))) - user << "You add [amount_inserted] sheets to the [src.name]." + to_chat(user, "You add [amount_inserted] sheets to the [src.name].") + var/stackname = stack.name src.overlays += "protolathe_[stackname]" sleep(10) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index aac1b19960a..469948a5c78 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -159,18 +159,21 @@ proc/CallMaterialName(ID) //Loading a disk into it. if(istype(D, /obj/item/weapon/disk)) if(t_disk || d_disk) - user << "A disk is already loaded into the machine." + to_chat(user, "A disk is already loaded into the machine.") + return if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D else - user << "Machine cannot accept disks in that format." + to_chat(user, "Machine cannot accept disks in that format.") + return if(!user.drop_item()) return D.loc = src - user << "You add the disk to the machine!" + to_chat(user, "You add the disk to the machine!") + else ..() src.updateUsrDialog() @@ -181,7 +184,8 @@ proc/CallMaterialName(ID) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) req_access = list() emagged = 1 - user << "You disable the security protocols" + to_chat(user, "You disable the security protocols") + /obj/machinery/computer/rdconsole/Topic(href, href_list) if(..()) @@ -264,7 +268,8 @@ proc/CallMaterialName(ID) else if(href_list["eject_item"]) //Eject the item inside the destructive analyzer. if(linked_destroy) if(linked_destroy.busy) - usr << " The destructive analyzer is busy at the moment." + to_chat(usr, " The destructive analyzer is busy at the moment.") + else if(linked_destroy.loaded_item) linked_destroy.loaded_item.loc = linked_destroy.loc @@ -289,7 +294,8 @@ proc/CallMaterialName(ID) else if(href_list["deconstruct"]) //Deconstruct the item in the destructive analyzer and update the research holder. if(linked_destroy) if(linked_destroy.busy) - usr << "The destructive analyzer is busy at the moment." + to_chat(usr, "The destructive analyzer is busy at the moment.") + else var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel") if(choice == "Cancel" || !linked_destroy) return @@ -302,7 +308,8 @@ proc/CallMaterialName(ID) linked_destroy.busy = 0 if(!linked_destroy.hacked) if(!linked_destroy.loaded_item) - usr <<"The destructive analyzer appears to be empty." + to_chat(usr, "The destructive analyzer appears to be empty.") + screen = 1.0 return if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail) @@ -341,7 +348,8 @@ proc/CallMaterialName(ID) else if(href_list["sync"]) //Sync the research holder with all the R&D consoles in the game that aren't sync protected. screen = 0.0 if(!sync) - usr << "You must connect to the network first!" + to_chat(usr, "You must connect to the network first!") + else griefProtection() //Putting this here because I dont trust the sync process spawn(30) @@ -638,7 +646,8 @@ proc/CallMaterialName(ID) if(..()) return 1 if(!allowed(user) && !isobserver(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return 1 interact(user) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 4f0b81e5315..50367612755 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -59,10 +59,12 @@ if(href_list["pulse"]) var/temp_wire = href_list["wire"] if (!istype(usr.get_active_hand(), /obj/item/device/multitool)) - usr << "You need a multitool!" + to_chat(usr, "You need a multitool!") + else if(src.wires[temp_wire]) - usr << "You can't pulse a cut wire." + to_chat(usr, "You can't pulse a cut wire.") + else if(src.hack_wire == href_list["wire"]) src.hacked = !src.hacked @@ -77,7 +79,8 @@ spawn(100) src.shocked = !src.shocked if(href_list["cut"]) if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters)) - usr << "You need wirecutters!" + to_chat(usr, "You need wirecutters!") + else var/temp_wire = href_list["wire"] wires[temp_wire] = !wires[temp_wire] diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 7d88f65af04..bd23c33fce9 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -209,7 +209,8 @@ add_fingerprint(usr) usr.set_machine(src) if(!src.allowed(usr) && !emagged) - usr << "\red You do not have the required access level" + to_chat(usr, "\red You do not have the required access level") + return if(href_list["main"]) @@ -337,7 +338,8 @@ if(!emagged) playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 - user << "\blue You you disable the security protocols" + to_chat(user, "\blue You you disable the security protocols") + src.updateUsrDialog() /obj/machinery/r_n_d/server/core diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index 817baf70e16..940a40f954b 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -81,18 +81,21 @@ var/obj/item/device/measuring_tape/P = W user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].") if(do_after(user,40, target = src)) - user << "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm." + to_chat(user, "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.") + return if (istype(W, /obj/item/weapon/pickaxe)) var/obj/item/weapon/pickaxe/P = W - user << "\red You start [P.drill_verb] [src]." + to_chat(user, "\red You start [P.drill_verb] [src].") + if(!do_after(user,P.digspeed, target = src)) return - user << "\blue You finish [P.drill_verb] [src]." + to_chat(user, "\blue You finish [P.drill_verb] [src].") + excavation_level += P.excavation_amount if(excavation_level > 100) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm index 9d52c9c2dc0..065a617b9ea 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm @@ -14,11 +14,13 @@ if(active) active = 0 icon_state = "gigadrill" - user << "\blue You press a button and [src] slowly spins down." + to_chat(user, "\blue You press a button and [src] slowly spins down.") + else active = 1 icon_state = "gigadrill_mov" - user << "\blue You press a button and [src] shudders to life." + to_chat(user, "\blue You press a button and [src] shudders to life.") + /obj/machinery/giga_drill/Bump(atom/A) if(active && !drilling_turf) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index 23f9f73afde..b12f431d206 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -221,19 +221,23 @@ var/list/valid_secondary_effect_types = list(\ /obj/machinery/artifact/attack_hand(var/mob/user as mob) if (get_dist(user, src) > 1) - user << "\red You can't reach [src] from here." + to_chat(user, "\red You can't reach [src] from here.") + return if(ishuman(user) && user:gloves) - user << "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]." + to_chat(user, "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + return src.add_fingerprint(user) if(my_effect.trigger == TRIGGER_TOUCH) - user << "You touch [src]." + to_chat(user, "You touch [src].") + my_effect.ToggleActivate() else - user << "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")]." + to_chat(user, "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") + if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH) secondary_effect.ToggleActivate(0) @@ -317,7 +321,8 @@ var/list/valid_secondary_effect_types = list(\ warn = 1 if(warn) - M << "You accidentally touch [src]." + to_chat(M, "You accidentally touch [src].") + ..() /obj/machinery/artifact/bullet_act(var/obj/item/projectile/P) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm index f8dad2c4d36..b98612c980a 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm @@ -12,7 +12,8 @@ /datum/artifact_effect/cold/DoEffectTouch(var/mob/user) if(holder) - user << "\blue A chill passes up your spine!" + to_chat(user, "\blue A chill passes up your spine!") + var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature = max(env.temperature - rand(5,50), 0) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm index 1244f802cc6..85c6b08432a 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm @@ -32,9 +32,11 @@ var/mob/living/carbon/human/H = user if(prob(50)) if(prob(75)) - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + else - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + if(prob(50)) H.dizziness += rand(3,5) @@ -45,9 +47,11 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + else - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + if(prob(10)) H.dizziness += rand(3,5) @@ -59,9 +63,11 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(50)) if(prob(95)) - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + else - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm index da7f1a012ee..37296545e74 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm @@ -10,7 +10,8 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/weapon/stock_parts/cell/D in R.contents) D.charge += rand() * 100 + 50 - R << "\blue SYSTEM ALERT: Large energy boost detected!" + to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!") + return 1 /datum/artifact_effect/cellcharge/DoEffectAura() @@ -24,7 +25,8 @@ for (var/mob/living/silicon/robot/M in mob_list) for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge += 25 - M << "\blue SYSTEM ALERT: Energy boost detected!" + to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!") + return 1 /datum/artifact_effect/cellcharge/DoEffectPulse() @@ -38,5 +40,6 @@ for (var/mob/living/silicon/robot/M in mob_list) for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge += rand() * 100 - M << "\blue SYSTEM ALERT: Energy boost detected!" + to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!") + return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm index 025cdec5ee0..978d3b0a9f4 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm @@ -10,7 +10,8 @@ var/mob/living/silicon/robot/R = user for (var/obj/item/weapon/stock_parts/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) - R << "\blue SYSTEM ALERT: Energy drain detected!" + to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!") + return 1 return 1 @@ -26,7 +27,8 @@ for (var/mob/living/silicon/robot/M in mob_list) for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge = max(D.charge - 50,0) - M << "\red SYSTEM ALERT: Energy drain detected!" + to_chat(M, "\red SYSTEM ALERT: Energy drain detected!") + return 1 /datum/artifact_effect/celldrain/DoEffectPulse() @@ -40,5 +42,6 @@ for (var/mob/living/silicon/robot/M in mob_list) for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge = max(D.charge - rand() * 150,0) - M << "\red SYSTEM ALERT: Energy drain detected!" + to_chat(M, "\red SYSTEM ALERT: Energy drain detected!") + return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm index b74ab88a9a1..d005fb9e64c 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_dnaswitch.dm @@ -15,13 +15,13 @@ /datum/artifact_effect/dnaswitch/DoEffectTouch(var/mob/toucher) var/weakness = GetAnomalySusceptibility(toucher) if(ishuman(toucher) && prob(weakness * 100)) - toucher << pick("\green You feel a little different.",\ - "\green You feel very strange.",\ - "\green Your stomach churns.",\ - "\green Your skin feels loose.",\ - "\green You feel a stabbing pain in your head.",\ - "\green You feel a tingling sensation in your chest.",\ - "\green Your entire body vibrates.") + to_chat(toucher, pick("\green You feel a little different.", + "\green You feel very strange.", + "\green Your stomach churns.", + "\green Your skin feels loose.", + "\green You feel a stabbing pain in your head.", + "\green You feel a tingling sensation in your chest.", + "\green Your entire body vibrates.")) if(prob(75)) scramble(1, toucher, weakness * severity) else @@ -35,13 +35,13 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(30)) - H << pick("\green You feel a little different.",\ - "\green You feel very strange.",\ - "\green Your stomach churns.",\ - "\green Your skin feels loose.",\ - "\green You feel a stabbing pain in your head.",\ - "\green You feel a tingling sensation in your chest.",\ - "\green Your entire body vibrates.") + to_chat(H, pick("\green You feel a little different.", + "\green You feel very strange.", + "\green Your stomach churns.", + "\green Your skin feels loose.", + "\green You feel a stabbing pain in your head.", + "\green You feel a tingling sensation in your chest.", + "\green Your entire body vibrates.")) if(prob(50)) scramble(1, H, weakness * severity) else @@ -54,13 +54,13 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(75)) - H << pick("\green You feel a little different.",\ - "\green You feel very strange.",\ - "\green Your stomach churns.",\ - "\green Your skin feels loose.",\ - "\green You feel a stabbing pain in your head.",\ - "\green You feel a tingling sensation in your chest.",\ - "\green Your entire body vibrates.") + to_chat(H, pick("\green You feel a little different.", + "\green You feel very strange.", + "\green Your stomach churns.", + "\green Your skin feels loose.", + "\green You feel a stabbing pain in your head.", + "\green You feel a tingling sensation in your chest.", + "\green Your entire body vibrates.")) if(prob(25)) if(prob(75)) scramble(1, H, weakness * severity) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm index bc45260b2cc..31cd6c871ba 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm @@ -30,9 +30,11 @@ var/mob/living/carbon/human/H = user if(prob(50)) if(prob(75)) - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + else - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + if(prob(50)) H.dizziness += rand(3,5) @@ -43,9 +45,11 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(5)) if(prob(75)) - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + else - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + if(prob(5)) H.dizziness += rand(3,5) @@ -57,9 +61,11 @@ for (var/mob/living/carbon/human/H in range(src.effectrange,T)) if(prob(50)) if(prob(95)) - H << "[pick(drastic_messages)]" + to_chat(H, "[pick(drastic_messages)]") + else - H << "[pick(messages)]" + to_chat(H, "[pick(messages)]") + if(prob(50)) H.dizziness += rand(3,5) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm index 003250399e9..341f2543f37 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm @@ -9,7 +9,8 @@ var/weakness = GetAnomalySusceptibility(toucher) if(prob(weakness * 100)) var/mob/living/carbon/C = toucher - C << "\blue You feel a soothing energy invigorate you." + to_chat(C, "\blue You feel a soothing energy invigorate you.") + if(ishuman(toucher)) var/mob/living/carbon/human/H = toucher @@ -42,7 +43,8 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) if(prob(10)) - C << "\blue You feel a soothing energy radiating from something nearby." + to_chat(C, "\blue You feel a soothing energy radiating from something nearby.") + C.adjustBruteLoss(-1 * weakness) C.adjustFireLoss(-1 * weakness) C.adjustToxLoss(-1 * weakness) @@ -57,7 +59,8 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) - C << "\blue A wave of energy invigorates you." + to_chat(C, "\blue A wave of energy invigorates you.") + C.adjustBruteLoss(-5 * weakness) C.adjustFireLoss(-5 * weakness) C.adjustToxLoss(-5 * weakness) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm index 21304df4082..50b7c0a95a8 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm @@ -15,7 +15,8 @@ /datum/artifact_effect/heat/DoEffectTouch(var/mob/user) if(holder) - user << "\red You feel a wave of heat travel up your spine!" + to_chat(user, "\red You feel a wave of heat travel up your spine!") + var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature += rand(5,50) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm index 5a4f402269f..be7cc57fb7e 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm @@ -8,7 +8,8 @@ var/weakness = GetAnomalySusceptibility(toucher) if(iscarbon(toucher) && prob(weakness * 100)) var/mob/living/carbon/C = toucher - C << "\red A painful discharge of energy strikes you!" + to_chat(C, "\red A painful discharge of energy strikes you!") + C.adjustOxyLoss(rand(5,25) * weakness) C.adjustToxLoss(rand(5,25) * weakness) C.adjustBruteLoss(rand(5,25) * weakness) @@ -26,7 +27,8 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) if(prob(10)) - C << "\red You feel a painful force radiating from something nearby." + to_chat(C, "\red You feel a painful force radiating from something nearby.") + C.adjustBruteLoss(1 * weakness) C.adjustFireLoss(1 * weakness) C.adjustToxLoss(1 * weakness) @@ -40,7 +42,8 @@ for (var/mob/living/carbon/C in range(effectrange, T)) var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) - C << "\red A wave of painful energy strikes you!" + to_chat(C, "\red A wave of painful energy strikes you!") + C.adjustBruteLoss(3 * weakness) C.adjustFireLoss(3 * weakness) C.adjustToxLoss(3 * weakness) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm index a1a89e42cf2..e4b99fad1f0 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm @@ -10,7 +10,8 @@ if(user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - R << "\blue Your systems report damaged components mending by themselves!" + to_chat(R, "\blue Your systems report damaged components mending by themselves!") + R.adjustBruteLoss(rand(-10,-30)) R.adjustFireLoss(rand(-10,-30)) return 1 @@ -20,7 +21,8 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(prob(10)) - M << "\blue SYSTEM ALERT: Beneficial energy field detected!" + to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!") + M.adjustBruteLoss(-1) M.adjustFireLoss(-1) M.updatehealth() @@ -30,7 +32,8 @@ if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) - M << "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!" + to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!") + M.adjustBruteLoss(-10) M.adjustFireLoss(-10) M.updatehealth() diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm index bc55a76cef7..3f542e17567 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm @@ -10,7 +10,8 @@ if(user) if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user - R << "\red Your systems report severe damage has been inflicted!" + to_chat(R, "\red Your systems report severe damage has been inflicted!") + R.adjustBruteLoss(rand(10,50)) R.adjustFireLoss(rand(10,50)) return 1 @@ -19,7 +20,9 @@ if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) - if(prob(10)) M << "\red SYSTEM ALERT: Harmful energy field detected!" + if(prob(10)) + to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!") + M.adjustBruteLoss(1) M.adjustFireLoss(1) M.updatehealth() @@ -29,7 +32,8 @@ if(holder) var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) - M << "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!" + to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!") + M.adjustBruteLoss(10) M.adjustFireLoss(10) M.updatehealth() diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm index 61979c5f69d..4d4bf8babf2 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm @@ -12,12 +12,14 @@ var/weakness = GetAnomalySusceptibility(toucher) if(ishuman(toucher) && prob(weakness * 100)) var/mob/living/carbon/human/H = toucher - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) + H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness) return 1 else if(isrobot(toucher)) - toucher << "\red SYSTEM ALERT: CPU cycles slowing down." + to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.") + return 1 /datum/artifact_effect/sleepy/DoEffectAura() @@ -27,11 +29,13 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) if(prob(10)) - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) + H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness) H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) - R << "\red SYSTEM ALERT: CPU cycles slowing down." + to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.") + return 1 /datum/artifact_effect/sleepy/DoEffectPulse() @@ -40,9 +44,11 @@ for(var/mob/living/carbon/human/H in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) - H << pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.") + to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) + H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) - R << "\red SYSTEM ALERT: CPU cycles slowing down." + to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.") + return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm index b7b2864de41..2c2b613db4e 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm @@ -11,7 +11,8 @@ var/mob/living/carbon/C = toucher var/susceptibility = GetAnomalySusceptibility(C) if(prob(susceptibility * 100)) - C << "\red A powerful force overwhelms your consciousness." + to_chat(C, "\red A powerful force overwhelms your consciousness.") + C.Weaken(rand(1,10) * susceptibility) C.stuttering += 30 * susceptibility C.Stun(rand(1,10) * susceptibility) @@ -22,13 +23,15 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/susceptibility = GetAnomalySusceptibility(C) if(prob(10 * susceptibility)) - C << "\red Your body goes numb for a moment." + to_chat(C, "\red Your body goes numb for a moment.") + C.Weaken(2) C.stuttering += 2 if(prob(10)) C.Stun(1) else if(prob(10)) - C << "\red You feel numb." + to_chat(C, "\red You feel numb.") + /datum/artifact_effect/stun/DoEffectPulse() if(holder) @@ -36,7 +39,8 @@ for (var/mob/living/carbon/C in range(src.effectrange,T)) var/susceptibility = GetAnomalySusceptibility(C) if(prob(100 * susceptibility)) - C << "\red A wave of energy overwhelms your senses!" + to_chat(C, "\red A wave of energy overwhelms your senses!") + C.SetWeakened(4 * susceptibility) C.stuttering = 4 * susceptibility if(prob(10)) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index a0e2e44830e..7252d123ec6 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -6,7 +6,8 @@ /datum/artifact_effect/teleport/DoEffectTouch(var/mob/user) var/weakness = GetAnomalySusceptibility(user) if(prob(100 * weakness)) - user << "\red You are suddenly zapped away elsewhere!" + to_chat(user, "\red You are suddenly zapped away elsewhere!") + if (user.buckled) user.buckled.unbuckle_mob() @@ -25,7 +26,8 @@ for (var/mob/living/M in range(src.effectrange,T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - M << "\red You are displaced by a strange force!" + to_chat(M, "\red You are displaced by a strange force!") + if(M.buckled) M.buckled.unbuckle_mob() @@ -44,7 +46,8 @@ for (var/mob/living/M in range(src.effectrange, T)) var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) - M << "\red You are displaced by a strange force!" + to_chat(M, "\red You are displaced by a strange force!") + if(M.buckled) M.buckled.unbuckle_mob() diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index a91ed35ca55..e69c92f9951 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -93,7 +93,8 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/ var/new_label = input("What should the new label be?","Label solution tray") if(new_label) name = "solution tray ([new_label])" - user << "\blue You write on the label of the solution tray." + to_chat(user, "\blue You write on the label of the solution tray.") + else ..(W, user) diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index a619325d941..ec2ead4f34a 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -75,7 +75,8 @@ src.desc = "A creature made of [src.contents.len-1] assorted bones and a skull. The plaque reads \'[plaque_contents]\'." else src.desc = "Incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones." - user << "Looks like it could use [src.breq-src.bnum] more bones." + to_chat(user, "Looks like it could use [src.breq-src.bnum] more bones.") + else ..() else if(istype(W,/obj/item/weapon/pen)) diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index fb3fce5d26b..f440015cf31 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -36,7 +36,8 @@ if(G.amount>=G.max_amount) continue G.attackby(NG, user, params) - usr << "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets." + to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.") + //SN src = null qdel(src) return diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index 10a89d3f4d6..ac10df89458 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -129,7 +129,8 @@ var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot") M.apply_damage(rand(5, 10), BRUTE, target) - M << "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out." + to_chat(M, "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.") + var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc) B.target_turf = pick(range(1, src)) B.blood_DNA = list() @@ -200,4 +201,5 @@ processing_objects.Remove(src) /obj/effect/shadow_wight/Bump(var/atom/obstacle) - obstacle << "\red You feel a chill run down your spine!" + to_chat(obstacle, "\red You feel a chill run down your spine!") + diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 4a8c9be2a89..356e9588d03 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -51,7 +51,8 @@ var/list/w = heard_words["[lowertext(seperate[Xa])]"] if(w) w.Add("[lowertext(seperate[next])]") - //world << "Adding [lowertext(seperate[next])] to [lowertext(seperate[Xa])]" +// to_chat(world, "Adding [lowertext(seperate[next])] to [lowertext(seperate[Xa])]") + if(prob(30)) var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ @@ -66,10 +67,12 @@ /*/obj/item/weapon/talkingcrystal/proc/debug() //set src in view() for(var/v in heard_words) - world << "[uppertext(v)]" + to_chat(world, "[uppertext(v)]") + var/list/d = heard_words["[v]"] for(var/X in d) - world << "[X]"*/ + to_chat(world, "[X]")*/ + /datum/talking_atom/proc/SaySomething(var/word = null) if(!holder_atom) @@ -121,5 +124,6 @@ listening|=M for(var/mob/M in listening) - M << "\icon[holder_atom] [holder_atom] reverberates, \blue\"[msg]\"" + to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \blue\"[msg]\"") + last_talk_time = world.time diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm index fdc99e353ab..7205b3db313 100644 --- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm +++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm @@ -196,13 +196,15 @@ datum/genesequence //pod1.occupant.name = "[pod1.occupant.name] ([rand(0,999)])" pod1.biomass -= CLONE_BIOMASS else - usr << "\red \icon[src] Unable to locate cloning pod!" + to_chat(usr, "\red \icon[src] Unable to locate cloning pod!") + else ..() /obj/machinery/computer/reconstitutor/Topic(href, href_list) if(href_list["insertpos"]) - //world << "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]" +// to_chat(world, "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]") + var/sequence_num = text2num(href_list["sequence_num"]) var/insertpos = text2num(href_list["insertpos"]) diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index ee22edf2fbd..95fdbe1103b 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -24,13 +24,15 @@ /obj/machinery/artifact_harvester/attackby(var/obj/I as obj, var/mob/user as mob, params) if(istype(I,/obj/item/weapon/anobattery)) if(!inserted_battery) - user << "\blue You insert [I] into [src]." + to_chat(user, "\blue You insert [I] into [src].") + user.drop_item() I.loc = src src.inserted_battery = I updateDialog() else - user << "\red There is already a battery in [src]." + to_chat(user, "\red There is already a battery in [src].") + else return..() diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 61915c91e2d..ea953dad91b 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -62,7 +62,8 @@ /obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob, params) if(scanning) - user << "You can't do that while [src] is scanning!" + to_chat(user, "You can't do that while [src] is scanning!") + else if(istype(I, /obj/item/stack/nanopaste)) var/choice = alert("What do you want to do with the nanopaste?","Radiometric Scanner","Scan nanopaste","Fix seal integrity") @@ -78,14 +79,16 @@ var/obj/item/weapon/reagent_containers/glass/G = I var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume) G.reagents.trans_to(src, amount_transferred) - user << "You empty [amount_transferred]u of coolant into [src]." + to_chat(user, "You empty [amount_transferred]u of coolant into [src].") + update_coolant() return else if(choice == "Empty coolant") var/obj/item/weapon/reagent_containers/glass/G = I var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume) src.reagents.trans_to(G, amount_transferred) - user << "You remove [amount_transferred]u of coolant from [src]." + to_chat(user, "You remove [amount_transferred]u of coolant from [src].") + update_coolant() return user.drop_item() @@ -331,11 +334,14 @@ scanner_progress = 0 scanning = 1 t_left_radspike = pick(5,10,15) - usr << "Scan initiated." + to_chat(usr, "Scan initiated.") + else - usr << "Could not initiate scan, seal requires replacing." + to_chat(usr, "Could not initiate scan, seal requires replacing.") + else - usr << "Insert an item to scan." + to_chat(usr, "Insert an item to scan.") + if(href_list["maserWavelength"]) maser_wavelength = max(min(maser_wavelength + 1000 * text2num(href_list["maserWavelength"]), 10000), 1) diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index 6df826f3792..241c6423510 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -40,7 +40,8 @@ /obj/item/weapon/anodevice/attackby(var/obj/I as obj, var/mob/user as mob, params) if(istype(I, /obj/item/weapon/anobattery)) if(!inserted_battery) - user << "\blue You insert the battery." + to_chat(user, "\blue You insert the battery.") + user.drop_item() I.loc = src inserted_battery = I @@ -103,7 +104,8 @@ if(interval > 0) //apply the touch effect to the holder if(holder) - holder << "the \icon[src] [src] held by [holder] shudders in your grasp." + to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.") + else src.loc.visible_message("the \icon[src] [src] shudders.") inserted_battery.battery_effect.DoEffectTouch(holder) diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm index a90105585ee..12cc7646b07 100644 --- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm +++ b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm @@ -12,29 +12,34 @@ /obj/machinery/bunsen_burner/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/reagent_containers)) if(held_container) - user << "\red You must remove the [held_container] first." + to_chat(user, "\red You must remove the [held_container] first.") + else user.drop_item(src) held_container = W held_container.loc = src - user << "\blue You put the [held_container] onto the [src]." + to_chat(user, "\blue You put the [held_container] onto the [src].") + var/image/I = image("icon"=W, "layer"=FLOAT_LAYER) underlays += I if(heating) spawn(heat_time) try_heating() else - user << "\red You can't put the [W] onto the [src]." + to_chat(user, "\red You can't put the [W] onto the [src].") + /obj/machinery/bunsen_burner/attack_hand(mob/user as mob) if(held_container) underlays = null - user << "\blue You remove the [held_container] from the [src]." + to_chat(user, "\blue You remove the [held_container] from the [src].") + held_container.loc = src.loc held_container.attack_hand(user) held_container = null else - user << "\red There is nothing on the [src]." + to_chat(user, "\red There is nothing on the [src].") + /obj/machinery/bunsen_burner/proc/try_heating() src.visible_message("\blue \icon[src] [src] hisses.") diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index f377d7322c8..8be15d1c212 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -31,14 +31,16 @@ M.Weaken(3) cell.charge -= power_use if(prob(5)) - M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]" + to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") + if(field_type == "iron") for(var/mob/living/silicon/M in T) M.Weaken(3) cell.charge -= power_use if(prob(5)) - M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]" + to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") + for(var/obj/item/I in T) if(!suspension_field.contents.len) @@ -50,7 +52,8 @@ M.Weaken(3) cell.charge -= power_use if(prob(5)) - M << "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]" + to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") + if(cell.charge <= 0) deactivate() @@ -120,7 +123,8 @@ if(anchored) activate() else - usr << "You are unable to activate [src] until it is properly secured on the ground." + to_chat(usr, "You are unable to activate [src] until it is properly secured on the ground.") + else deactivate() if(href_list["select_field"]) @@ -135,9 +139,11 @@ I.loc = src auth_card = I if(attempt_unlock(I)) - usr << "You insert [I], the console flashes \'Access granted.\'" + to_chat(usr, "You insert [I], the console flashes \'Access granted.\'") + else - usr << "You insert [I], the console flashes \'Access denied.\'" + to_chat(usr, "You insert [I], the console flashes \'Access denied.\'") + else if(href_list["ejectcard"]) if(auth_card) if(ishuman(usr)) @@ -166,7 +172,8 @@ icon_state = "suspension0" cell = null - user << "You remove the power cell" + to_chat(user, "You remove the power cell") + /obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/screwdriver)) @@ -175,7 +182,8 @@ screwed = 0 else screwed = 1 - user << "You [screwed ? "screw" : "unscrew"] the battery panel." + to_chat(user, "You [screwed ? "screw" : "unscrew"] the battery panel.") + else if (istype(W, /obj/item/weapon/crowbar)) if(!locked) if(!screwed) @@ -184,46 +192,57 @@ open = 0 else open = 1 - user << "You crowbar the battery panel [open ? "open" : "in place"]." + to_chat(user, "You crowbar the battery panel [open ? "open" : "in place"].") + icon_state = "suspension[open ? (cell ? "1" : "0") : "2"]" else - user << "[src]'s safety locks are engaged, shut it down first." + to_chat(user, "[src]'s safety locks are engaged, shut it down first.") + else - user << "Unscrew [src]'s battery panel first." + to_chat(user, "Unscrew [src]'s battery panel first.") + else - user << "[src]'s security locks are engaged." + to_chat(user, "[src]'s security locks are engaged.") + else if (istype(W, /obj/item/weapon/wrench)) if(!suspension_field) if(anchored) anchored = 0 else anchored = 1 - user << "You wrench the stabilising legs [anchored ? "into place" : "up against the body"]." + to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].") + if(anchored) desc = "It is resting securely on four stubby legs." else desc = "It has stubby legs bolted up against it's body for stabilising." else - user << "You are unable to secure [src] while it is active!" + to_chat(user, "You are unable to secure [src] while it is active!") + else if (istype(W, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) - user << "There is a power cell already installed." + to_chat(user, "There is a power cell already installed.") + else user.drop_item() W.loc = src cell = W - user << "You insert the power cell." + to_chat(user, "You insert the power cell.") + icon_state = "suspension1" else if(istype(W, /obj/item/weapon/card)) var/obj/item/weapon/card/I = W if(!auth_card) if(attempt_unlock(I)) - user << "You swipe [I], the console flashes \'Access granted.\'" + to_chat(user, "You swipe [I], the console flashes \'Access granted.\'") + else - user << "You swipe [I], console flashes \'Access denied.\'" + to_chat(user, "You swipe [I], console flashes \'Access denied.\'") + else - user << "Remove [auth_card] first." + to_chat(user, "Remove [auth_card] first.") + /obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/weapon/card/C) if(!open) @@ -305,7 +324,8 @@ var/turf/T = get_turf(suspension_field) for(var/mob/M in T) - M << "You no longer feel like floating." + to_chat(M, "You no longer feel like floating.") + M.SetWeakened(min(M.weakened, 3)) src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.") @@ -323,7 +343,8 @@ set category = "Object" if(anchored) - usr << "\red You cannot rotate [src], it has been firmly fixed to the floor." + to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.") + else dir = turn(dir, 90) @@ -333,7 +354,8 @@ set category = "Object" if(anchored) - usr << "\red You cannot rotate [src], it has been firmly fixed to the floor." + to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.") + else dir = turn(dir, -90) diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index 6f7e29917a8..0f012bcacdd 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -26,7 +26,8 @@ else message = "Scanning array is recharging." - user << "[message]" + to_chat(user, "[message]") + /obj/item/device/ano_scanner/proc/scan() last_scan_time = world.time diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index 47b0f7e9e2f..c0f369b2524 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -27,16 +27,19 @@ /obj/item/device/core_sampler/examine(mob/user) if(..(user, 2)) - user << "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining." + to_chat(user, "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.") + /obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/evidencebag)) if(num_stored_bags < 10) qdel(W) num_stored_bags += 1 - user << "\blue You insert the [W] into the core sampler." + to_chat(user, "\blue You insert the [W] into the core sampler.") + else - user << "\red The core sampler can not fit any more bags!" + to_chat(user, "\red The core sampler can not fit any more bags!") + else return ..() @@ -52,9 +55,11 @@ if(geo_data) if(filled_bag) - user << "\red The core sampler is full!" + to_chat(user, "\red The core sampler is full!") + else if(num_stored_bags < 1) - user << "\red The core sampler is out of sample bags!" + to_chat(user, "\red The core sampler is out of sample bags!") + else //create a new sample bag which we'll fill with rock samples filled_bag = new /obj/item/weapon/evidencebag(src) @@ -75,13 +80,16 @@ filled_bag.underlays += I filled_bag.w_class = 1 - user << "\blue You take a core sample of the [item_to_sample]." + to_chat(user, "\blue You take a core sample of the [item_to_sample].") + else - user << "\red You are unable to take a sample of [item_to_sample]." + to_chat(user, "\red You are unable to take a sample of [item_to_sample].") + /obj/item/device/core_sampler/attack_self() if(filled_bag) - usr << "\blue You eject the full sample bag." + to_chat(usr, "\blue You eject the full sample bag.") + var/success = 0 if(istype(src.loc, /mob)) var/mob/M = src.loc @@ -91,4 +99,5 @@ filled_bag = null icon_state = "sampler0" else - usr << "\red The core sampler is empty." + to_chat(usr, "\red The core sampler is empty.") + diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 487aa897d8f..486d405b8fa 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -46,7 +46,8 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - L << "\blue \icon[src] [src] pings." + to_chat(L, "\blue \icon[src] [src] pings.") + else if(istype(A,/obj/structure/boulder)) var/obj/structure/boulder/B = A @@ -65,7 +66,8 @@ positive_locations.Add(D) for(var/mob/L in range(src, 1)) - L << "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!." + to_chat(L, "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!.") + /obj/item/device/depth_scanner/attack_self(var/mob/user as mob) return src.interact(user) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 8fcabf82e0c..ab2ad00f104 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -148,7 +148,8 @@ var/mob/living/carbon/human/monkey/food = new /mob/living/carbon/human/monkey(remote_eye.loc) food.LAssailant = C X.monkeys -- - owner << "[X] now has [X.monkeys] monkeys left." + to_chat(owner, "[X] now has [X.monkeys] monkeys left.") + /datum/action/monkey_recycle diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index e92f52f6c59..f810c41878b 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -19,12 +19,15 @@ attackby(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) - user << " This extract has already been enhanced!" + to_chat(user, " This extract has already been enhanced!") + return ..() if(Uses == 0) - user << " You can't enhance a used extract!" + to_chat(user, " You can't enhance a used extract!") + return ..() - user <<"You apply the enhancer. It now has triple the amount of uses." + to_chat(user, "You apply the enhancer. It now has triple the amount of uses.") + Uses = 3 enhanced = 1 qdel(O) @@ -153,13 +156,16 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - user << " The potion only works on slimes!" + to_chat(user, " The potion only works on slimes!") + return ..() if(M.stat) - user << " The slime is dead!" + to_chat(user, " The slime is dead!") + return..() if(M.mind) - user << " The slime resists!" + to_chat(user, " The slime resists!") + return ..() if(M.is_adult) var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc) @@ -189,7 +195,8 @@ pet.name = newname pet.real_name = newname qdel(src) - user <<"You feed the slime the potion, removing it's powers and calming it." + to_chat(user, "You feed the slime the potion, removing it's powers and calming it.") + /obj/item/weapon/sentience_potion name = "sentience potion" @@ -206,13 +213,16 @@ if(being_used || !ismob(M)) return if(!isanimal(M) || M.ckey) //only works on animals that aren't player controlled - user << "[M] is already too intelligent for this to work!" + to_chat(user, "[M] is already too intelligent for this to work!") + return ..() if(M.stat) - user << "[M] is dead!" + to_chat(user, "[M] is dead!") + return..() - user << "You offer the sentience potion to [M]..." + to_chat(user, "You offer the sentience potion to [M]...") + being_used = 1 var/list/candidates = pollCandidates("Do you want to play as [M.name]?", ROLE_SENTIENT, 0, 100) @@ -225,15 +235,19 @@ M.key = C.key M.universal_speak = 1 M.faction |= "sentient" - M << "All at once it makes sense: you know what you are and who you are! Self awareness is yours!" - M << "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost." - user << "[M] accepts the potion and suddenly becomes attentive and aware. It worked!" + to_chat(M, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!") + + to_chat(M, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.") + + to_chat(user, "[M] accepts the potion and suddenly becomes attentive and aware. It worked!") + if(isanimal(M)) var/mob/living/simple_animal/S = M S.master_commander = user qdel(src) else - user << "[M] looks interested for a moment, but then looks back down. Maybe you should try again later." + to_chat(user, "[M] looks interested for a moment, but then looks back down. Maybe you should try again later.") + being_used = 0 ..() @@ -249,19 +263,24 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. - user << " The steroid only works on baby slimes!" + to_chat(user, " The steroid only works on baby slimes!") + return ..() if(M.is_adult) //Can't tame adults - user << " Only baby slimes can use the steroid!" + to_chat(user, " Only baby slimes can use the steroid!") + return..() if(M.stat) - user << " The slime is dead!" + to_chat(user, " The slime is dead!") + return..() if(M.cores == 3) - user <<" The slime already has the maximum amount of extract!" + to_chat(user, " The slime already has the maximum amount of extract!") + return..() - user <<"You feed the slime the steroid. It now has triple the amount of extract." + to_chat(user, "You feed the slime the steroid. It now has triple the amount of extract.") + M.cores = 3 qdel(src) @@ -285,12 +304,15 @@ /obj/item/weapon/slimespeed/afterattack(obj/item/C, mob/user) ..() if(!istype(C)) - user << "The potion can only be used on items!" + to_chat(user, "The potion can only be used on items!") + return if(C.slowdown <= 0) - user << "The [C] can't be made any faster!" + to_chat(user, "The [C] can't be made any faster!") + return..() - user <<"You slather the red gunk over the [C], making it faster." + to_chat(user, "You slather the red gunk over the [C], making it faster.") + C.color = "#FF0000" C.slowdown = 0 qdel(src) @@ -311,12 +333,15 @@ qdel(src) return if(!istype(C)) - user << "The potion can only be used on clothing!" + to_chat(user, "The potion can only be used on clothing!") + return if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) - user << "The [C] is already fireproof!" + to_chat(user, "The [C] is already fireproof!") + return..() - user <<"You slather the blue gunk over the [C], fireproofing it." + to_chat(user, "You slather the blue gunk over the [C], fireproofing it.") + C.name = "fireproofed [C.name]" C.color = "#000080" C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT @@ -481,18 +506,21 @@ var/mob/dead/observer/ghost for(var/mob/dead/observer/O in src.loc) if(!check_observer(O)) - O << "\red You are not eligible to become a golem." + to_chat(O, "\red You are not eligible to become a golem.") + continue ghost = O break if(!ghost) - user << "The rune fizzles uselessly. There is no spirit nearby." + to_chat(user, "The rune fizzles uselessly. There is no spirit nearby.") + return var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem G.change_gender(pick(MALE,FEMALE)) G.loc = src.loc G.key = ghost.key - G << "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost." + to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.") + qdel(src) @@ -501,7 +529,8 @@ if(O.client) var/area/A = get_area(src) if(A) - O << "\blue Golem rune created in [A.name]. (Teleport | Sign Up)" + to_chat(O, "\blue Golem rune created in [A.name]. (Teleport | Sign Up)") + Topic(href,href_list) if("signup" in href_list) @@ -526,10 +555,13 @@ proc/volunteer(var/mob/dead/observer/O) if(O in ghosts) ghosts.Remove(O) - O << "\red You are no longer signed up to be a golem." + to_chat(O, "\red You are no longer signed up to be a golem.") + else if(!check_observer(O)) - O << "\red You are not eligible to become a golem." + to_chat(O, "\red You are not eligible to become a golem.") + return ghosts.Add(O) - O << "\blue You are signed up to be a golem." \ No newline at end of file + to_chat(O, "\blue You are signed up to be a golem.") + diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm index a4470242f5e..9a52e1f39b0 100644 --- a/code/modules/scripting/Parser/Keywords.dm +++ b/code/modules/scripting/Parser/Keywords.dm @@ -81,7 +81,9 @@ var/const/Represents a special statement in the code triggered by a keyword. ifstmt = L[L.len] //Get the last statement in the current block if(!ifstmt || !istype(ifstmt) || ifstmt.else_if) - usr << "NTSL: ELSE IF FAILED: [!ifstmt], [!istype(ifstmt)], [!istype(ifstmt) || ifstmt.else_if]" // Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... + to_chat(usr, "NTSL: ELSE IF FAILED: [!ifstmt], [!istype(ifstmt)], [!istype(ifstmt) || ifstmt.else_if]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... + + parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken) return KW_FAIL @@ -108,7 +110,9 @@ var/const/Represents a special statement in the code triggered by a keyword. stmt = L[L.len] //Get the last statement in the current block if(!stmt || !istype(stmt) || stmt.else_block) //Ensure that it is an if statement - usr << "NTSL: ELSE IF FAILED: [!stmt], [!istype(stmt)], [!istype(stmt) || stmt.else_block]" // Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... + to_chat(usr, "NTSL: ELSE IF FAILED: [!stmt], [!istype(stmt)], [!istype(stmt) || stmt.else_block]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... + + parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken) return KW_FAIL diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index 0fbff9cd68a..8e46a0e4e27 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -23,12 +23,14 @@ power_channel = ENVIRON /obj/machinery/keycard_auth/attack_ai(mob/user as mob) - user << "The station AI is not to interact with these devices." + to_chat(user, "The station AI is not to interact with these devices.") + return /obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + to_chat(user, "This device is not powered.") + return if(istype(W,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/ID = W @@ -40,7 +42,8 @@ event_source.event_confirmed_by = usr else if(screen == 2) if(event == "Emergency Response Team" && ert_reason == "Reason for ERT") - user << "Supply a reason for calling the ERT first!" + to_chat(user, "Supply a reason for calling the ERT first!") + return event_triggered_by = usr broadcast_request() //This is the device making the initial event request. It needs to broadcast to other devices @@ -59,10 +62,12 @@ /obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user.stat || stat & (NOPOWER|BROKEN)) - user << "This device is not powered." + to_chat(user, "This device is not powered.") + return if(busy) - user << "This device is busy." + to_chat(user, "This device is busy.") + return user.set_machine(src) @@ -82,10 +87,12 @@ if(..()) return if(busy) - usr << "This device is busy." + to_chat(usr, "This device is busy.") + return if(usr.stat || stat & (BROKEN|NOPOWER)) - usr << "This device is without power." + to_chat(usr, "This device is without power.") + return if(href_list["triggerevent"]) event = href_list["triggerevent"] @@ -153,10 +160,12 @@ feedback_inc("alert_keycard_auth_maintRevoke",1) if("Emergency Response Team") if(is_ert_blocked()) - usr << "\red All Emergency Response Teams are dispatched and can not be called at this time." + to_chat(usr, "\red All Emergency Response Teams are dispatched and can not be called at this time.") + return - usr << "ERT request transmitted." + to_chat(usr, "ERT request transmitted.") + if(admins.len) ERT_Announce(ert_reason , event_triggered_by) ert_reason = "Reason for ERT" diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index 788bde31a6b..d386fc3774a 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -54,6 +54,7 @@ if(S.shuttleId == shuttle_id) S.possible_destinations = "[landing_zone.id]" - user << "Landing zone set." + to_chat(user, "Landing zone set.") + qdel(src) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 49aedfbad89..fd2b2b74771 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -22,16 +22,19 @@ var/obj/item/device/pda/pda = W W = pda.id if (!W:access) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return var/list/cardaccess = W:access if(!istype(cardaccess, /list) || !cardaccess.len) //no access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return if(!(access_heads in W:access)) //doesn't have this access - user << "The access level of [W:registered_name]\'s card is not high enough. " + to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") + return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") @@ -197,7 +200,8 @@ if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch sound_played = 1 for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_begin.ogg' + to_chat(E, 'sound/effects/hyperspace_begin.ogg') + if(time_left <= 0 && !shuttle_master.emergencyNoEscape) //move each escape pod to its corresponding transit dock @@ -206,7 +210,8 @@ M.enterTransit() //now move the actual emergency shuttle to its transit dock for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_progress.ogg' + to_chat(E, 'sound/effects/hyperspace_progress.ogg') + enterTransit() mode = SHUTTLE_ESCAPE timer = world.time @@ -218,7 +223,8 @@ M.dock(shuttle_master.getDock("[M.id]_away")) //now move the actual emergency shuttle to centcomm for(var/area/shuttle/escape/E in world) - E << 'sound/effects/hyperspace_end.ogg' + to_chat(E, 'sound/effects/hyperspace_end.ogg') + dock(shuttle_master.getDock("emergency_away")) mode = SHUTTLE_ENDGAME timer = 0 @@ -269,7 +275,8 @@ return /obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob) - user << " Access requirements overridden. The pod may now be launched manually at any time." + to_chat(user, " Access requirements overridden. The pod may now be launched manually at any time.") + admin_controlled = 0 icon_state = "dorm_emag" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 0c09b0ea920..49dde9cb4d9 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -675,21 +675,26 @@ usr.set_machine(src) src.add_fingerprint(usr) if(!allowed(usr)) - usr << "Access denied." + to_chat(usr, "Access denied.") return if(href_list["move"]) switch(shuttle_master.moveShuttle(shuttleId, href_list["move"], 1)) - if(0) usr << "Shuttle received message and will be sent shortly." - if(1) usr << "Invalid shuttle requested." - else usr << "Unable to comply." + if(0) + to_chat(usr, "Shuttle received message and will be sent shortly.") + if(1) + to_chat(usr, "Invalid shuttle requested.") + else + to_chat(usr, "Unable to comply.") + updateUsrDialog() /obj/machinery/computer/shuttle/emag_act(mob/user) if(!emagged) src.req_access = list() emagged = 1 - user << "You fried the consoles ID checking system." + to_chat(user, "You fried the consoles ID checking system.") + /obj/machinery/computer/shuttle/ferry name = "transport ferry console" @@ -711,8 +716,8 @@ if(cooldown) return cooldown = 1 - usr << "Your request has been recieved by Centcom." - admins << "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom." + to_chat(usr, "Your request has been recieved by Centcom.") + to_chat(admins, "FERRY: [key_name_admin(usr)] (?) (FLW) (Move Ferry) is requesting to move the transport ferry to Centcom.") spawn(600) //One minute cooldown cooldown = 0 diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 405ea460822..d67c5142175 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -558,7 +558,8 @@ /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user) && !isobserver(user)) - user << "Access denied." + to_chat(user, "Access denied.") + return 1 post_signal("supply") @@ -567,7 +568,8 @@ /obj/machinery/computer/supplycomp/emag_act(user as mob) if(!hacked) - user << "Special supplies unlocked." + to_chat(user, "Special supplies unlocked.") + hacked = 1 return @@ -651,7 +653,8 @@ if(href_list["send"]) if(shuttle_master.supply.canMove()) - usr << "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons." + to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") + else if(shuttle_master.supply.getDockedId() == "supply_home") shuttle_master.toggleShuttle("supply", "supply_home", "supply_away", 1) investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents: [shuttle_master.sold_atoms]", "cargo") @@ -718,7 +721,8 @@ shuttle_master.shoppinglist += O investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [shuttle_master.points].", "cargo") else - usr << "There are insufficient supply points for this request." + to_chat(usr, "There are insufficient supply points for this request.") + break else if (href_list["rreq"]) diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 5361ee686bf..0ce399c827b 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -16,7 +16,8 @@ /obj/machinery/computer/shuttle/syndicate/Topic(href, href_list) if(href_list["move"]) if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER) - usr << "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare." + to_chat(usr, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.") + return 0 ..() @@ -31,7 +32,8 @@ /obj/machinery/computer/shuttle/syndicate/drop_pod/Topic(href, href_list) if(href_list["move"]) if(z != ZLEVEL_CENTCOMM) - usr << "Pods are one way!" + to_chat(usr, "Pods are one way!") + return 0 ..() diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 5fbe6a5486c..fbe38ecd29f 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -49,7 +49,8 @@ /datum/action/item_action/hands_free/activate_pill/Trigger() if(!Checks()) return - owner << "You grit your teeth and burst the implanted [target]!" + to_chat(owner, "You grit your teeth and burst the implanted [target]!") + add_logs(owner, null, "swallowed an implanted pill", target) if(target.reagents.total_volume) target.reagents.reaction(owner, INGEST) diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index be1cb2264a9..1cd7feac6d7 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -57,7 +57,8 @@ else if(!current_surgery.step_in_progress) if(current_surgery.status == 1 ) M.surgeries -= current_surgery - user << "You stop the surgery." + to_chat(user, "You stop the surgery.") + qdel(current_surgery) else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel) M.surgeries -= current_surgery @@ -69,7 +70,8 @@ affecting.status &= ~ORGAN_BLEEDING qdel(current_surgery) else if(current_surgery.can_cancel) - user << "You need to hold a cautery in inactive hand to stop [M]'s surgery!" + to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!") + return 1 diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 8cb6c926061..009bc7aac4b 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -156,7 +156,8 @@ IC = I break if(istype(tool,/obj/item/weapon/cautery)) - user << "you prepare to close the cavity wall." + to_chat(user, "you prepare to close the cavity wall.") + else if(tool) user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) @@ -172,28 +173,33 @@ var/obj/item/organ/external/chest/affected = target.get_organ(target_zone) if(istype(tool, /obj/item/weapon/disk/nuclear)) - user << "Central command would kill you if you implanted the disk into someone." + to_chat(user, "Central command would kill you if you implanted the disk into someone.") + return 0//fail if(istype(tool,/obj/item/organ)) - user << "This isn't the type of surgery for organ transplants!" + to_chat(user, "This isn't the type of surgery for organ transplants!") + return 0//fail if(!user.canUnEquip(tool, 0)) - user << "[tool] is stuck to your hand, you can't put it in [target]!" + to_chat(user, "[tool] is stuck to your hand, you can't put it in [target]!") + return 0 if(istype(tool,/obj/item/weapon/cautery)) return 1//god this is ugly.... else if(tool) if(IC) - user << "There seems to be something in there already!" + to_chat(user, "There seems to be something in there already!") + return 1 else user.visible_message(" [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ " You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) if((tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT))) - user << " You tear some vessels trying to fit the object in the cavity." + to_chat(user, " You tear some vessels trying to fit the object in the cavity.") + var/datum/wound/internal_bleeding/I = new () affected.wounds += I affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) @@ -209,7 +215,8 @@ target.internal_organs -= IC return 1 else - user << "You don't find anything in [target]'s [target_zone]." + to_chat(user, "You don't find anything in [target]'s [target_zone].") + return 0 @@ -364,8 +371,10 @@ if(objects > 0) user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.limb_name]!", "You sucessfully remove [objects] objects from [H]'s [L.limb_name].") else - user << "You find no objects embedded in [H]'s [L.limb_name]!" + to_chat(user, "You find no objects embedded in [H]'s [L.limb_name]!") + else - user << "You can't find [target]'s [target_zone], let alone any objects embedded in it!" + to_chat(user, "You can't find [target]'s [target_zone], let alone any objects embedded in it!") + return 1 \ No newline at end of file diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index a6fdf24d715..b75e1699c09 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -36,7 +36,8 @@ HMN.b_eyes = eye_colour[3] HMN.update_eyes() if(aug_message && !special) - owner << "[aug_message]" + to_chat(owner, "[aug_message]") + M.sight |= vision_flags /obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0) @@ -59,7 +60,8 @@ if(severity > 1) if(prob(10 * severity)) return - owner << "Static obfuscates your vision!" + to_chat(owner, "Static obfuscates your vision!") + owner.flash_eyes(visual = 1) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index a135a60df2f..622a484bb8b 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -34,7 +34,8 @@ return var/stun_amount = 5 + (severity-1 ? 0 : 5) owner.Stun(stun_amount) - owner << "Your body seizes up!" + to_chat(owner, "Your body seizes up!") + return stun_amount @@ -71,7 +72,8 @@ r_hand_ignore = 0 if(!l_hand_obj && !r_hand_obj) - owner << "You are not holding any items, your hands relax..." + to_chat(owner, "You are not holding any items, your hands relax...") + active = 0 else var/msg = 0 @@ -79,14 +81,18 @@ msg += !r_hand_ignore && r_hand_obj ? 2 : 0 switch(msg) if(1) - owner << "Your left hand's grip tightens." + to_chat(owner, "Your left hand's grip tightens.") + if(2) - owner << "Your right hand's grip tightens." + to_chat(owner, "Your right hand's grip tightens.") + if(3) - owner << "Both of your hand's grips tighten." + to_chat(owner, "Both of your hand's grips tighten.") + else release_items() - owner << "Your hands relax..." + to_chat(owner, "Your hands relax...") + l_hand_obj = null r_hand_obj = null @@ -103,11 +109,13 @@ if(L_item) A = pick(oview(range)) L_item.throw_at(A, range, 2) - owner << "Your left arm spasms and throws the [L_item.name]!" + to_chat(owner, "Your left arm spasms and throws the [L_item.name]!") + if(R_item) A = pick(oview(range)) R_item.throw_at(A, range, 2) - owner << "Your right arm spasms and throws the [R_item.name]!" + to_chat(owner, "Your right arm spasms and throws the [R_item.name]!") + /obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items() if(!l_hand_ignore && l_hand_obj in owner.contents) @@ -172,7 +180,8 @@ return if(owner.nutrition <= hunger_threshold) synthesizing = 1 - owner << "You feel less hungry..." + to_chat(owner, "You feel less hungry...") + owner.nutrition += 50 spawn(50) synthesizing = 0 @@ -181,7 +190,8 @@ if(!owner) return owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning - owner << "You feel like your insides are burning." + to_chat(owner, "You feel like your insides are burning.") + /obj/item/organ/internal/cyberimp/chest/nutriment/plus name = "Nutriment pump implant PLUS" @@ -246,7 +256,8 @@ spawn(600 / severity) H.heart_attack = 0 if(H.stat == CONSCIOUS) - H << "You feel your heart beating again!" + to_chat(H, "You feel your heart beating again!") + //ARM...THAT GO IN THE CHEST /obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped. @@ -264,7 +275,8 @@ /obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click() if(overloaded)//ensure the implant isn't broken - owner << "The implant doesn't respond. It seems to be broken..." + to_chat(owner, "The implant doesn't respond. It seems to be broken...") + return if(out)//check if the owner has the item out already owner.unEquip(holder, 1)//if he does, take it away. then, @@ -280,7 +292,8 @@ playsound(get_turf(owner), 'sound/mecha/mechmove03.ogg', 50, 1) else//if this fails to put the item in his hands, holder.loc = null//keep it in nullspace - owner << "You can't extend [holder] if you can't use your hands!" + to_chat(owner, "You can't extend [holder] if you can't use your hands!") + /obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed... if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then... @@ -292,7 +305,8 @@ owner.visible_message("[holder] forcibly retracts into [owner]'s arm.") owner.visible_message("A loud bang comes from [owner]...") playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1) - owner << "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?" + to_chat(owner, "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?") + owner.adjust_fire_stacks(20) owner.IgniteMob()//ignite the owner, as well as owner.say("AUUUUUUUUUUUUUUUUUUGH!!") diff --git a/code/modules/surgery/organs/autoimplanter.dm b/code/modules/surgery/organs/autoimplanter.dm index 98d7867c8c8..117210f732f 100644 --- a/code/modules/surgery/organs/autoimplanter.dm +++ b/code/modules/surgery/organs/autoimplanter.dm @@ -8,7 +8,8 @@ /obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used... if(!storedorgan) - user << "[src] currently has no implant stored." + to_chat(user, "[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.") @@ -18,18 +19,22 @@ /obj/item/device/autoimplanter/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/organ/internal/cyberimp)) if(storedorgan) - user << "[src] already has an implant stored." + to_chat(user, "[src] already has an implant stored.") + return if(!user.drop_item()) return I.forceMove(src) storedorgan = I - user << "You insert the [I] into [src]." + to_chat(user, "You insert the [I] into [src].") + else if(istype(I, /obj/item/weapon/screwdriver)) if(!storedorgan) - user << "There's no implant in [src] for you to remove." + to_chat(user, "There's no implant in [src] for you to remove.") + else storedorgan.forceMove(get_turf(user)) storedorgan = null - user << "You remove the [storedorgan] from [src]." + to_chat(user, "You remove the [storedorgan] from [src].") + playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1) diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index 35c38d1b99b..5487df397dc 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -126,10 +126,12 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 pale = 1 update_body() var/word = pick("dizzy","woosey","faint") - src << "\red You feel [word]" + to_chat(src, "\red You feel [word]") + if(prob(1)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel [word]" + to_chat(src, "\red You feel [word]") + if(oxyloss < 20) oxyloss += 3 if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) @@ -143,7 +145,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if(prob(15)) Paralyse(rand(1,3)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel very [word]" + to_chat(src, "\red You feel very [word]") + if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) if(!pale) pale = 1 @@ -154,7 +157,8 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 if(prob(15)) Paralyse(rand(1,3)) var/word = pick("dizzy","woosey","faint") - src << "\red You feel extremely [word]" + to_chat(src, "\red You feel extremely [word]") + if(0 to BLOOD_VOLUME_SURVIVE) death() diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm index 7cd53c4319a..ef9d3a4ca4b 100644 --- a/code/modules/surgery/organs/body_egg.dm +++ b/code/modules/surgery/organs/body_egg.dm @@ -8,7 +8,8 @@ /obj/item/organ/internal/body_egg/on_find(mob/living/finder) ..() - finder << "You found an unknown alien organism in [owner]'s [parent_organ]!" + to_chat(finder, "You found an unknown alien organism in [owner]'s [parent_organ]!") + /obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0) ..() diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 9f879a4492d..7a9c0886191 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -143,7 +143,8 @@ var/list/organ_cache = list() /obj/item/organ/examine(mob/user) ..(user) if(status & ORGAN_DEAD) - user << "The decay has set in." + to_chat(user, "The decay has set in.") + /obj/item/organ/proc/handle_germ_effects() //** Handle the effects of infections diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index bd81f65dbaf..8312bc4c5bb 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -293,7 +293,8 @@ if((brute || burn) && children && children.len && (owner.species.flags & REGENERATES_LIMBS)) var/obj/item/organ/external/stump/S = locate() in children if(S) - //world << "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb." +// to_chat(world, "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb.") + */ //Sync the organ's damage with its wounds @@ -528,7 +529,8 @@ Note that amputating the affected organ does in fact remove the infection from t if(germ_level >= INFECTION_LEVEL_THREE && antibiotics < 30) //overdosing is necessary to stop severe infections if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD - owner << "You can't feel your [name] anymore..." + to_chat(owner, "You can't feel your [name] anymore...") + owner.update_body(1) germ_level++ diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 000075febbe..d429f161928 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -302,7 +302,8 @@ if (germ_level > INFECTION_LEVEL_ONE) if(prob(1)) - owner << " Your skin itches." + to_chat(owner, " Your skin itches.") + if (germ_level > INFECTION_LEVEL_TWO) if(prob(1)) spawn owner.vomit() @@ -458,12 +459,14 @@ if(organhonked < world.time) organhonked = world.time+900 - owner << "HONK" + to_chat(owner, "HONK") + owner.sleeping = 0 owner.stuttering = 20 owner.ear_deaf = 30 owner.Weaken(3) - owner << 'sound/items/AirHorn.ogg' + to_chat(owner, 'sound/items/AirHorn.ogg') + if(prob(30)) owner.Stun(10) owner.Paralyse(4) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 333c314aa48..7fb022bc9fa 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -40,7 +40,8 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0 msg = "OH GOD! Your [partname] is hurting terribly!" if(msg && (msg != last_pain_message || prob(10))) last_pain_message = msg - src << msg + to_chat(src, msg) + next_pain_time = world.time + (100 - amount) @@ -64,7 +65,8 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength) // Anti message spam checks if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time))) last_pain_message = msg - src << msg + to_chat(src, msg) + next_pain_time = world.time + 100 mob/living/carbon/human/proc/handle_pain() diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index 89f94ba43fc..62bf5a391c8 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -19,7 +19,8 @@ if(prob(12)) owner.reagents.add_reagent("histamine", 5) if(5) - owner << "You feel like something is tearing its way out of your skin..." + to_chat(owner, "You feel like something is tearing its way out of your skin...") + owner.reagents.add_reagent("histamine", 10) if(prob(30)) owner.emote("scream") diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm index 77b590a2f4d..7bcadd791bc 100644 --- a/code/modules/surgery/organs/subtypes/machine.dm +++ b/code/modules/surgery/organs/subtypes/machine.dm @@ -132,7 +132,8 @@ /obj/item/organ/internal/optical_sensor/remove(var/mob/living/user,special = 0) if(!special) - owner << "Error 404:Optical Sensors not found." + to_chat(owner, "Error 404:Optical Sensors not found.") + . = ..() diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 091f104707e..f23398b610c 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -87,15 +87,18 @@ current_type = "insert" I = tool if(target_zone != I.parent_organ || target.get_organ_slot(I.slot)) - user << "There is no room for [I] in [target]'s [parse_zone(target_zone)]!" + to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!") + return -1 if(I.damage > (I.max_damage * 0.75)) - user << " \The [I] is in no state to be transplanted." + to_chat(user, " \The [I] is in no state to be transplanted.") + return -1 if(target.get_int_organ(I)) - user << " \The [target] already has [I]." + to_chat(user, " \The [target] already has [I].") + return -1 if(affected) user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \ @@ -123,7 +126,8 @@ current_type = "extract" var/list/organs = target.get_organs_zone(target_zone) if(!organs.len) - user << "There are no removeable organs in [target]'s [parse_zone(target_zone)]!" + to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!") + return -1 else for(var/obj/item/organ/internal/O in organs) @@ -153,7 +157,8 @@ tool_name = "\the [tool]" //what else do you call nanopaste medically? if(!hasorgans(target)) - user << "They do not have organs to mend!" + to_chat(user, "They do not have organs to mend!") + return for(var/obj/item/organ/internal/I in affected.internal_organs) if(I && I.damage > 0) @@ -166,11 +171,13 @@ user.visible_message("[user] starts treating damage to [target]'s [I.name] with [tool_name].", \ "You start treating damage to [target]'s [I.name] with [tool_name]." ) - user << "[I] does not appear to be damaged." + to_chat(user, "[I] does not appear to be damaged.") + H.custom_pain("The pain in your [affected.name] is living hell!",1) else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ)) - user << "[tool] was biten by someone! It's too damaged to use!" + to_chat(user, "[tool] was biten by someone! It's too damaged to use!") + return -1 ..() @@ -205,7 +212,8 @@ I.insert(target) spread_germs_to_organ(I, user) if(!user.canUnEquip(I, 0)) - user << "[I] is stuck to your hand, you can't put it in [target]!" + to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") + return 0 if(affected) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 73bf7944127..5d8d6406502 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -240,12 +240,14 @@ /datum/surgery_step/internal/dethrall/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) var/braincase = target.named_organ_parent("brain") user.visible_message("[user] reaches into [target]'s head with [tool].", "You begin aligning [tool]'s light to the tumor on [target]'s brain...") - target << "A small part of your [braincase] pulses with agony as the light impacts it." + to_chat(target, "A small part of your [braincase] pulses with agony as the light impacts it.") + ..() /datum/surgery_step/internal/dethrall/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(target.get_species() == "Lesser Shadowling") //Empowered thralls cannot be deconverted - target << "NOT LIKE THIS!" + to_chat(target, "NOT LIKE THIS!") + user.visible_message("[target] suddenly slams upward and knocks down [user]!", \ "[target] suddenly bolts up and slams you with tremendous force!") user.resting = 0 //Remove all stuns diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index c1851ecabc6..3e685547ad1 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -232,7 +232,8 @@ if(limb_can_operate) if(istype(C)) if(!C.get_amount() >= 3) - user << "You need three or more cable pieces to repair this damage." + to_chat(user, "You need three or more cable pieces to repair this damage.") + return 2 C.use(3) return 1 @@ -288,18 +289,22 @@ var/obj/item/organ/internal/I = tool if(I.status != ORGAN_ROBOT || I.robotic != 2) - user << "You can only implant cybernetic organs." + to_chat(user, "You can only implant cybernetic organs.") + if(target_zone != I.parent_organ || target.get_organ_slot(I.slot)) - user << "There is no room for [I] in [target]'s [parse_zone(target_zone)]!" + to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!") + return -1 if(I.damage > (I.max_damage * 0.75)) - user << " \The [I] is in no state to be transplanted." + to_chat(user, " \The [I] is in no state to be transplanted.") + return -1 if(target.get_int_organ(I)) - user << " \The [target] already has [I]." + to_chat(user, " \The [target] already has [I].") + return -1 user.visible_message("[user] begins reattaching [target]'s [tool].", \ @@ -309,7 +314,8 @@ current_type = "install" if(target_zone != "chest") - user << " You must target the chest cavity." + to_chat(user, " You must target the chest cavity.") + return -1 var/obj/item/device/mmi/M = tool @@ -322,23 +328,28 @@ return -1 if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) - user << "That brain is not usable." + to_chat(user, "That brain is not usable.") + return -1 if(!(affected.status & ORGAN_ROBOT)) - user << "You cannot install a computer brain into a meat enclosure." + to_chat(user, "You cannot install a computer brain into a meat enclosure.") + return -1 if(!target.species) - user << "You have no idea what species this person is. Report this on the bug tracker." + to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.") + return -1 if(!target.species.has_organ["brain"]) - user << "You're pretty sure [target.species.name_plural] don't normally have a brain." + to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") + return -1 if(target.get_int_organ(/obj/item/organ/internal/brain/)) - user << "Your subject already has a brain." + to_chat(user, "Your subject already has a brain.") + return -1 user.visible_message("[user] starts installing \the [tool] into [target]'s [affected.name].", \ @@ -352,7 +363,8 @@ if(!affected.open_enough_for_surgery()) return -1 if(!organs.len) - user << "There is no removeable organs in [target]'s [parse_zone(target_zone)]!" + to_chat(user, "There is no removeable organs in [target]'s [parse_zone(target_zone)]!") + return -1 else for(var/obj/item/organ/internal/O in organs) @@ -408,7 +420,8 @@ var/obj/item/organ/internal/I = tool if(!user.canUnEquip(I, 0)) - user << "[I] is stuck to your hand, you can't put it in [target]!" + to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") + return 0 user.drop_item() @@ -515,23 +528,28 @@ return 0 if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) - user << "That brain is not usable." + to_chat(user, "That brain is not usable.") + return 2 if(!(affected.status & ORGAN_ROBOT)) - user << "You cannot install a computer brain into a meat enclosure." + to_chat(user, "You cannot install a computer brain into a meat enclosure.") + return 2 if(!target.species) - user << "You have no idea what species this person is. Report this on the bug tracker." + to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.") + return 2 if(!target.species.has_organ["brain"]) - user << "You're pretty sure [target.species.name_plural] don't normally have a brain." + to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") + return 2 if(target.get_int_organ(/obj/item/organ/internal/brain/)) - user << "Your subject already has a brain." + to_chat(user, "Your subject already has a brain.") + return 2 return 1 diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index f413b42ef63..e5aaf88613f 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -181,7 +181,8 @@ /proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user) if(!istype(user) || !istype(E)) return - //world << "Germ spread: [E] : [E.owner]" +// to_chat(world, "Germ spread: [E] : [E.owner]") + var/germ_level = user.germ_level if(user.gloves) germ_level = user.gloves.germ_level diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm index 536696dce2d..b878034ff4a 100644 --- a/code/modules/surgery/tools.dm +++ b/code/modules/surgery/tools.dm @@ -49,8 +49,8 @@ attack_verb = list("drilled") suicide_act(mob/user) - viewers(user) << pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", \ - "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.") + to_chat(viewers(user), pick("[user] is pressing [src] to \his temple and activating it! It looks like \he's trying to commit suicide.", + "[user] is pressing [src] to \his chest and activating it! It looks like \he's trying to commit suicide.")) return (BRUTELOSS) @@ -73,9 +73,9 @@ hitsound = 'sound/weapons/bladeslice.ogg' suicide_act(mob/user) - viewers(user) << pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.", \ - "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.") + to_chat(viewers(user), pick("[user] is slitting \his wrists with [src]! It looks like \he's trying to commit suicide.", + "[user] is slitting \his throat with [src]! It looks like \he's trying to commit suicide.", + "[user] is slitting \his stomach open with [src]! It looks like \he's trying to commit seppuku.")) return (BRUTELOSS) diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index ee4e9a790a6..5d93e2ab280 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -46,7 +46,8 @@ if(istype(I, /obj/item/device/multitool)) var/obj/item/device/multitool/M = I M.buffer = src - user << "You save the data in the [I.name]'s buffer." + to_chat(user, "You save the data in the [I.name]'s buffer.") + if(exchange_parts(user, I)) return @@ -70,22 +71,27 @@ playsound(src, 'sound/items/Ratchet.ogg', 50, 1) if(anchored) anchored = 0 - user << " The [src] can now be moved." + to_chat(user, " The [src] can now be moved.") + else if(!anchored) anchored = 1 - user << " The [src] is now secured." + to_chat(user, " The [src] is now secured.") + if(istype(W, /obj/item/weapon/screwdriver)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You unscrew the telepad's tracking beacon." + to_chat(user, " You unscrew the telepad's tracking beacon.") + stage = 1 else if(stage == 1) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) - user << " You screw in the telepad's tracking beacon." + to_chat(user, " You screw in the telepad's tracking beacon.") + stage = 0 if(istype(W, /obj/item/weapon/weldingtool) && stage == 1) playsound(src, 'sound/items/Welder.ogg', 50, 1) - user << " You disassemble the telepad." + to_chat(user, " You disassemble the telepad.") + new /obj/item/stack/sheet/metal(get_turf(src)) new /obj/item/stack/sheet/glass(get_turf(src)) qdel(src) @@ -101,7 +107,8 @@ /obj/item/device/telepad_beacon/attack_self(mob/user as mob) if(user) - user << " Locked In" + to_chat(user, " Locked In") + new /obj/machinery/telepad_cargo(user.loc) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -135,7 +142,8 @@ /obj/item/weapon/rcs/examine(mob/user) ..(user) - user << "There are [round(rcell.charge/chargecost)] charge\s left." + to_chat(user, "There are [round(rcell.charge/chargecost)] charge\s left.") + /obj/item/weapon/rcs/Destroy() if(rcell) @@ -148,11 +156,13 @@ if(mode == 0) mode = 1 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " The telepad locator has become uncalibrated." + to_chat(user, " The telepad locator has become uncalibrated.") + else mode = 0 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) - user << " You calibrate the telepad locator." + to_chat(user, " You calibrate the telepad locator.") + /obj/item/weapon/rcs/emag_act(user as mob) if(!emagged) @@ -160,5 +170,6 @@ var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(5, 1, src) s.start() - user << " You emag the RCS. Activate it to toggle between modes." + to_chat(user, " You emag the RCS. Activate it to toggle between modes.") + return diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 15edeec20a2..0c077bd1698 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -44,7 +44,8 @@ /obj/machinery/computer/telescience/examine(mob/user) ..(user) - user << "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots." + to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.") + /obj/machinery/computer/telescience/initialize() ..() @@ -54,7 +55,8 @@ /obj/machinery/computer/telescience/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/weapon/ore/bluespace_crystal)) if(crystals.len >= max_crystals) - user << "There are not enough crystal slots." + to_chat(user, "There are not enough crystal slots.") + return user.drop_item() crystals += W @@ -73,17 +75,20 @@ if(M.buffer && istype(M.buffer, /obj/machinery/telepad)) telepad = M.buffer M.buffer = null - user << "You upload the data from the [W.name]'s buffer." + to_chat(user, "You upload the data from the [W.name]'s buffer.") + updateUsrDialog() else ..() /obj/machinery/computer/telescience/emag_act(user as mob) if (!emagged) - user << "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!" + to_chat(user, "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!") + emagged = 1 else - user << "\red The machine seems unaffected by the card swipe..." + to_chat(user, "\red The machine seems unaffected by the card swipe...") + /obj/machinery/computer/telescience/attack_ai(mob/user) src.attack_hand(user) diff --git a/code/modules/vehicle/train/train.dm b/code/modules/vehicle/train/train.dm index 72b5b2a7ed1..33f5260728e 100644 --- a/code/modules/vehicle/train/train.dm +++ b/code/modules/vehicle/train/train.dm @@ -66,7 +66,8 @@ M.apply_damages(22 / move_delay) // and do damage according to how fast the train is going if(istype(load, /mob/living/carbon/human)) var/mob/living/D = load - D << "\red You hit [M]!" + to_chat(D, "\red You hit [M]!") + msg_admin_attack("[key_name_admin(D)] hit [key_name_admin(M)] with [src].") @@ -86,7 +87,8 @@ /obj/vehicle/train/relaymove(mob/user, direction) var/turf/T = get_step_to(src, get_step(src, direction)) if(!T) - user << "You can't find a clear area to step onto." + to_chat(user, "You can't find a clear area to step onto.") + return 0 if(user != load) @@ -97,7 +99,8 @@ unload(user, direction) - user << "\blue You climb down from [src]." + to_chat(user, "\blue You climb down from [src].") + return 1 @@ -108,7 +111,8 @@ latch(C, user) else if(!load(C)) - user << "\red You were unable to load [C] on [src]." + to_chat(user, "\red You were unable to load [C] on [src].") + /obj/vehicle/train/attack_hand(mob/user as mob) if(user.stat || user.restrained() || !Adjacent(user)) @@ -145,22 +149,26 @@ //attempts to attach src as a follower of the train T /obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user) if (get_dist(src, T) > 1) - user << "\red [src] is too far away from [T] to hitch them together." + to_chat(user, "\red [src] is too far away from [T] to hitch them together.") + return if (lead) - user << "\red [src] is already hitched to something." + to_chat(user, "\red [src] is already hitched to something.") + return if (T.tow) - user << "\red [T] is already towing something." + to_chat(user, "\red [T] is already towing something.") + return //check for cycles. var/obj/vehicle/train/next_car = T while (next_car) if (next_car == src) - user << "\red That seems very silly." + to_chat(user, "\red That seems very silly.") + return next_car = next_car.lead @@ -170,7 +178,8 @@ dir = lead.dir if(user) - user << "\blue You hitch [src] to [T]." + to_chat(user, "\blue You hitch [src] to [T].") + update_stats() @@ -178,7 +187,8 @@ //detaches the train from whatever is towing it /obj/vehicle/train/proc/unattach(mob/user) if (!lead) - user << "\red [src] is not hitched to anything." + to_chat(user, "\red [src] is not hitched to anything.") + return lead.tow = null diff --git a/code/modules/vehicle/train/trains/ambulance.dm b/code/modules/vehicle/train/trains/ambulance.dm index f7094f10ad8..47bbaf647e0 100644 --- a/code/modules/vehicle/train/trains/ambulance.dm +++ b/code/modules/vehicle/train/trains/ambulance.dm @@ -142,7 +142,8 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load - D << "\red \b You ran over [H]!" + to_chat(D, "\red \b You ran over [H]!") + visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]") msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]") @@ -168,7 +169,8 @@ /obj/vehicle/train/ambulance/engine/examine(mob/user) if(..(user, 1)) - user << "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition." + to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.") + /obj/vehicle/train/ambulance/engine/verb/check_power() set name = "Check power level" @@ -179,10 +181,12 @@ return if(!cell) - usr << "There is no power cell installed in [src]." + to_chat(usr, "There is no power cell installed in [src].") + return - usr << "The power meter reads [round(cell.percent(), 0.01)]%" + to_chat(usr, "The power meter reads [round(cell.percent(), 0.01)]%") + /obj/vehicle/train/ambulance/engine/verb/start_engine() set name = "Start engine" @@ -193,17 +197,21 @@ return if(on) - usr << "The engine is already running." + to_chat(usr, "The engine is already running.") + return turn_on() if (on) - usr << "You start [src]'s engine." + to_chat(usr, "You start [src]'s engine.") + else if(cell.charge < charge_use) - usr << "[src] is out of power." + to_chat(usr, "[src] is out of power.") + else - usr << "[src]'s engine won't start." + to_chat(usr, "[src]'s engine won't start.") + /obj/vehicle/train/ambulance/engine/verb/stop_engine() set name = "Stop engine" @@ -214,12 +222,14 @@ return if(!on) - usr << "The engine is already stopped." + to_chat(usr, "The engine is already stopped.") + return turn_off() if (!on) - usr << "You stop [src]'s engine." + to_chat(usr, "You stop [src]'s engine.") + /obj/vehicle/train/ambulance/engine/verb/remove_key() set name = "Remove key" diff --git a/code/modules/vehicle/train/trains/cargo/cargo_train.dm b/code/modules/vehicle/train/trains/cargo/cargo_train.dm index 5933ada33d5..e36982ef1af 100644 --- a/code/modules/vehicle/train/trains/cargo/cargo_train.dm +++ b/code/modules/vehicle/train/trains/cargo/cargo_train.dm @@ -138,7 +138,8 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load - D << "\red \b You ran over [H]!" + to_chat(D, "\red \b You ran over [H]!") + visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]") msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]") @@ -166,8 +167,10 @@ if(!..(user, 1)) return - user << "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition." - user << "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%" + to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.") + + to_chat(user, "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%") + /obj/vehicle/train/cargo/engine/verb/start_engine() set name = "Start engine" @@ -178,17 +181,21 @@ return if(on) - usr << "The engine is already running." + to_chat(usr, "The engine is already running.") + return turn_on() if (on) - usr << "You start [src]'s engine." + to_chat(usr, "You start [src]'s engine.") + else if(cell.charge < charge_use) - usr << "[src] is out of power." + to_chat(usr, "[src] is out of power.") + else - usr << "[src]'s engine won't start." + to_chat(usr, "[src]'s engine won't start.") + /obj/vehicle/train/cargo/engine/verb/stop_engine() set name = "Stop engine" @@ -199,12 +206,14 @@ return if(!on) - usr << "The engine is already stopped." + to_chat(usr, "The engine is already stopped.") + return turn_off() if (!on) - usr << "You stop [src]'s engine." + to_chat(usr, "You stop [src]'s engine.") + /obj/vehicle/train/cargo/engine/verb/remove_key() set name = "Remove key" diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index eb8c4f816b4..42bcf1a9521 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -86,7 +86,8 @@ if(!locked) open = !open update_icon() - user << "Maintenance panel is now [open ? "opened" : "closed"]." + to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].") + else if(istype(W, /obj/item/weapon/crowbar) && cell && open) remove_cell(user) @@ -100,11 +101,14 @@ health = min(maxhealth, health+10) user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") else - user << "Unable to repair with the maintenance panel closed." + to_chat(user, "Unable to repair with the maintenance panel closed.") + else - user << "[src] does not need a repair." + to_chat(user, "[src] does not need a repair.") + else - user << "Unable to repair while [src] is off." + to_chat(user, "Unable to repair while [src] is off.") + else if(hasvar(W,"force") && hasvar(W,"damtype")) switch(W.damtype) if("fire") @@ -205,7 +209,8 @@ if(locked) locked = 0 - user << "You bypass [src]'s controls." + to_chat(user, "You bypass [src]'s controls.") + /obj/vehicle/proc/explode() src.visible_message("\red [src] blows apart!", 1) @@ -262,13 +267,15 @@ C.forceMove(src) cell = C powercheck() - usr << "You install [C] in [src]." + to_chat(usr, "You install [C] in [src].") + /obj/vehicle/proc/remove_cell(var/mob/living/carbon/human/H) if(!cell) return - usr << "You remove [cell] from [src]." + to_chat(usr, "You remove [cell] from [src].") + cell.forceMove(get_turf(H)) H.put_in_hands(cell) cell = null diff --git a/code/world.dm b/code/world.dm index dfb3094a314..3a0c990ae46 100644 --- a/code/world.dm +++ b/code/world.dm @@ -82,14 +82,19 @@ var/global/datum/global_init/init = new () return //world/Topic(href, href_list[]) -// world << "Received a Topic() call!" -// world << "[href]" +// to_chat(world, "Received a Topic() call!") + +// to_chat(world, "[href]") + // for(var/a in href_list) -// world << "[a]" +// to_chat(world, "[a]") + // if(href_list["hello"]) -// world << "Hello world!" +// to_chat(world, "Hello world!") + // return "Hello world!" -// world << "End of Topic() call." +// to_chat(world, "End of Topic() call.") + // ..() var/world_topic_spam_protect_ip = "0.0.0.0" @@ -180,12 +185,15 @@ var/world_topic_spam_protect_time = world.timeofday C.received_irc_pm = world.time C.irc_admin = input["sender"] - C << 'sound/effects/adminhelp.ogg' - C << message + to_chat(C, 'sound/effects/adminhelp.ogg') + + to_chat(C, message) + for(var/client/A in admins) if(A != C) - A << amessage + to_chat(A, amessage) + return "Message Successful" @@ -207,7 +215,8 @@ var/world_topic_spam_protect_time = world.timeofday return "Bad Key" else for(var/client/C in clients) - C << "PR: [input["announce"]]" + to_chat(C, "PR: [input["announce"]]") + /proc/keySpamProtect(var/addr) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) @@ -225,7 +234,8 @@ var/world_topic_spam_protect_time = world.timeofday message_admins("[key_name_admin(usr)] has requested an immediate world restart via client side debugging tools") log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools") spawn(0) - world << "Rebooting world immediately due to host request" + to_chat(world, "Rebooting world immediately due to host request") + return ..(1) var/delay if(!isnull(time)) @@ -233,21 +243,26 @@ var/world_topic_spam_protect_time = world.timeofday else delay = ticker.restart_timeout if(ticker.delay_end) - world << "An admin has delayed the round end." + to_chat(world, "An admin has delayed the round end.") + return - world << "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]" + to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]") + sleep(delay) if(blackbox) blackbox.save_all_data_to_sql() if(ticker.delay_end) - world << "Reboot was cancelled by an admin." + to_chat(world, "Reboot was cancelled by an admin.") + return feedback_set_details("[feedback_c]","[feedback_r]") log_game("Rebooting world. [reason]") //kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) spawn(0) - world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')) // random end sounds!! - LastyBatsy + to_chat(world, sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')))// random end sounds!! - LastyBatsy + + processScheduler.stop() @@ -273,7 +288,8 @@ var/world_topic_spam_protect_time = world.timeofday if(C.is_afk(INACTIVITY_KICK)) if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") - C << "\red You have been inactive for more than 10 minutes and have been disconnected." + to_chat(C, "\red You have been inactive for more than 10 minutes and have been disconnected.") + del(C) if ( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) ) sleep(sleep_length) @@ -320,7 +336,8 @@ var/world_topic_spam_protect_time = world.timeofday /world/proc/save_mode(var/the_mode) var/F = file("data/mode.txt") fdel(F) - F << the_mode + to_chat(F, the_mode) + /hook/startup/proc/loadMusic() for(var/obj/machinery/media/jukebox/J in machines) From 78f53553f8d81ddd96d8febc52f6ee9c263cd6dc Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 5 Apr 2016 08:25:57 -0700 Subject: [PATCH 2/4] Reduce lines by removing blank lines added by PJ's script --- code/ATMOSPHERICS/atmospherics.dm | 3 - .../components/binary_devices/passive_gate.dm | 2 - .../components/binary_devices/pump.dm | 2 - .../components/binary_devices/valve.dm | 1 - .../components/binary_devices/volume_pump.dm | 2 - .../components/omni_devices/omni_base.dm | 2 - .../components/trinary_devices/filter.dm | 1 - .../components/trinary_devices/mixer.dm | 1 - .../components/trinary_devices/tvalve.dm | 1 - .../unary_devices/outlet_injector.dm | 1 - .../unary_devices/portables_connector.dm | 1 - .../components/unary_devices/vent_pump.dm | 9 -- .../components/unary_devices/vent_scrubber.dm | 5 - code/__HELPERS/files.dm | 2 - code/__HELPERS/game.dm | 5 - code/__HELPERS/global_lists.dm | 1 - code/__HELPERS/icons.dm | 1 - code/__HELPERS/logging.dm | 2 - code/__HELPERS/names.dm | 1 - code/__HELPERS/unsorted.dm | 9 -- code/_onclick/click.dm | 2 - code/_onclick/click_override.dm | 3 - code/_onclick/cyborg.dm | 1 - code/_onclick/hud/action.dm | 2 - code/_onclick/hud/hud.dm | 2 - code/_onclick/hud/robot.dm | 2 - code/_onclick/hud/screen_objects.dm | 6 - code/_onclick/item_attack.dm | 4 - code/_onclick/observer.dm | 2 - code/_onclick/oldcode.dm | 1 - code/_onclick/rig.dm | 4 - code/_onclick/telekinesis.dm | 1 - code/controllers/Processes/inactivity.dm | 1 - code/controllers/Processes/shuttles.dm | 7 - code/controllers/configuration.dm | 2 - code/controllers/voting.dm | 13 -- code/datums/ai_laws.dm | 2 - code/datums/browser.dm | 4 - code/datums/cargoprofile.dm | 4 - code/datums/datumvars.dm | 71 --------- code/datums/diseases/advance/advance.dm | 5 - .../datums/diseases/advance/symptoms/beard.dm | 3 - .../diseases/advance/symptoms/choking.dm | 3 - .../diseases/advance/symptoms/confusion.dm | 2 - .../datums/diseases/advance/symptoms/cough.dm | 1 - .../diseases/advance/symptoms/deafness.dm | 3 - .../datums/diseases/advance/symptoms/dizzy.dm | 2 - .../datums/diseases/advance/symptoms/fever.dm | 1 - code/datums/diseases/advance/symptoms/fire.dm | 3 - .../diseases/advance/symptoms/flesh_eating.dm | 2 - .../diseases/advance/symptoms/genetics.dm | 1 - .../diseases/advance/symptoms/hallucigen.dm | 3 - .../diseases/advance/symptoms/headache.dm | 1 - code/datums/diseases/advance/symptoms/heal.dm | 2 - .../diseases/advance/symptoms/itching.dm | 1 - .../diseases/advance/symptoms/oxygen.dm | 1 - .../diseases/advance/symptoms/sensory.dm | 9 -- .../diseases/advance/symptoms/shedding.dm | 3 - .../diseases/advance/symptoms/shivering.dm | 1 - .../diseases/advance/symptoms/stimulant.dm | 1 - .../datums/diseases/advance/symptoms/viral.dm | 4 - .../diseases/advance/symptoms/vision.dm | 5 - .../diseases/advance/symptoms/voice_change.dm | 1 - .../datums/diseases/advance/symptoms/vomit.dm | 1 - .../diseases/advance/symptoms/weakness.dm | 3 - .../diseases/advance/symptoms/weight.dm | 3 - .../datums/diseases/advance/symptoms/youth.dm | 5 - code/datums/diseases/anxiety.dm | 5 - code/datums/diseases/appendicitis.dm | 1 - code/datums/diseases/beesease.dm | 4 - code/datums/diseases/brainrot.dm | 4 - code/datums/diseases/cold.dm | 10 -- code/datums/diseases/cold9.dm | 5 - code/datums/diseases/dna_spread.dm | 4 - code/datums/diseases/fake_gbs.dm | 1 - code/datums/diseases/flu.dm | 6 - code/datums/diseases/fluspanish.dm | 2 - code/datums/diseases/gbs.dm | 2 - code/datums/diseases/magnitis.dm | 5 - code/datums/diseases/pierrot_throat.dm | 3 - code/datums/diseases/retrovirus.dm | 12 -- code/datums/diseases/rhumba_beat.dm | 5 - code/datums/diseases/transformation.dm | 9 -- code/datums/diseases/tuberculosis.dm | 10 -- code/datums/diseases/wizarditis.dm | 3 - code/datums/gas_mixture.dm | 2 - .../helper_datums/construction_datum.dm | 6 - code/datums/helper_datums/events.dm | 2 - code/datums/helper_datums/global_iterator.dm | 1 - code/datums/helper_datums/teleport.dm | 1 - code/datums/martial.dm | 21 --- code/datums/mind.dm | 55 ------- code/datums/progressbar.dm | 1 - code/datums/spell.dm | 10 -- code/datums/spells/area_teleport.dm | 2 - code/datums/spells/bloodcrawl.dm | 2 - code/datums/spells/charge.dm | 7 - code/datums/spells/conjure.dm | 1 - code/datums/spells/ethereal_jaunt.dm | 2 - code/datums/spells/horsemask.dm | 3 - code/datums/spells/lichdom.dm | 8 - code/datums/spells/lightning.dm | 4 - code/datums/spells/magnet.dm | 4 - code/datums/spells/mime.dm | 3 - code/datums/spells/mind_transfer.dm | 7 - code/datums/spells/summonitem.dm | 1 - code/datums/spells/touch_attacks.dm | 3 - code/datums/spells/wizard.dm | 2 - code/datums/wires/alarm.dm | 9 -- code/datums/wires/robot.dm | 2 - code/datums/wires/wires.dm | 3 - code/defines/procs/announce.dm | 15 -- code/defines/procs/statistics.dm | 2 - code/game/area/areas.dm | 3 - code/game/atoms.dm | 7 - code/game/dna/dna_modifier.dm | 17 --- code/game/dna/genes/disabilities.dm | 2 - code/game/dna/genes/gene.dm | 2 - code/game/dna/genes/goon_disabilities.dm | 4 - code/game/dna/genes/goon_powers.dm | 32 ---- code/game/dna/genes/monkey.dm | 2 - code/game/dna/genes/powers.dm | 1 - code/game/dna/genes/vg_powers.dm | 6 - code/game/gamemodes/antag_spawner.dm | 13 -- .../game/gamemodes/autotraitor/autotraitor.dm | 5 - code/game/gamemodes/blob/blob.dm | 11 -- code/game/gamemodes/blob/blob_finish.dm | 8 - code/game/gamemodes/blob/blob_report.dm | 1 - code/game/gamemodes/blob/overmind.dm | 10 -- code/game/gamemodes/blob/powers.dm | 27 ---- code/game/gamemodes/blob/theblob.dm | 1 - code/game/gamemodes/borer/borer.dm | 10 -- code/game/gamemodes/changeling/changeling.dm | 19 --- .../gamemodes/changeling/changeling_power.dm | 6 - .../gamemodes/changeling/evolution_menu.dm | 9 -- .../gamemodes/changeling/powers/absorb.dm | 10 -- .../changeling/powers/digitalcamo.dm | 2 - .../changeling/powers/epinephrine.dm | 2 - .../gamemodes/changeling/powers/fakedeath.dm | 2 - .../gamemodes/changeling/powers/fleshmend.dm | 1 - .../gamemodes/changeling/powers/headcrab.dm | 3 - .../gamemodes/changeling/powers/hivemind.dm | 6 - .../gamemodes/changeling/powers/humanform.dm | 1 - .../gamemodes/changeling/powers/lesserform.dm | 3 - .../changeling/powers/mimic_voice.dm | 3 - .../gamemodes/changeling/powers/mutations.dm | 5 - .../gamemodes/changeling/powers/panacea.dm | 1 - .../gamemodes/changeling/powers/revive.dm | 1 - .../gamemodes/changeling/powers/shriek.dm | 2 - .../changeling/powers/strained_muscles.dm | 5 - .../gamemodes/changeling/powers/swap_form.dm | 7 - .../gamemodes/changeling/powers/tiny_prick.dm | 11 -- .../game/gamemodes/changeling/traitor_chan.dm | 2 - code/game/gamemodes/cult/cult.dm | 15 -- code/game/gamemodes/cult/cult_items.dm | 2 - code/game/gamemodes/cult/ritual.dm | 22 --- code/game/gamemodes/cult/runes.dm | 59 -------- code/game/gamemodes/cult/talisman.dm | 16 -- code/game/gamemodes/events.dm | 1 - code/game/gamemodes/extended/extended.dm | 2 - code/game/gamemodes/game_mode.dm | 6 - code/game/gamemodes/gameticker.dm | 28 ---- code/game/gamemodes/heist/heist.dm | 16 -- .../gamemodes/malfunction/Malf_Modules.dm | 11 -- .../game/gamemodes/malfunction/malfunction.dm | 17 --- code/game/gamemodes/meteor/meteor.dm | 4 - code/game/gamemodes/miniantags/borer/borer.dm | 66 -------- .../gamemodes/miniantags/bot_swarm/swarmer.dm | 53 ------- .../gamemodes/miniantags/guardian/guardian.dm | 68 --------- code/game/gamemodes/miniantags/morph/morph.dm | 2 - .../gamemodes/miniantags/morph/morph_event.dm | 2 - .../gamemodes/miniantags/revenant/revenant.dm | 21 --- .../miniantags/revenant/revenant_abilities.dm | 25 ---- .../miniantags/slaughter/bloodcrawl.dm | 6 - .../miniantags/slaughter/slaughter.dm | 9 -- .../mutiny/emergency_authentication_device.dm | 3 - code/game/gamemodes/mutiny/key_pinpointer.dm | 6 - code/game/gamemodes/mutiny/mutiny.dm | 28 ---- code/game/gamemodes/mutiny/mutiny_fluff.dm | 1 - code/game/gamemodes/nations/nations.dm | 25 ---- code/game/gamemodes/nations/nationsprocs.dm | 7 - code/game/gamemodes/newobjective.dm | 1 - code/game/gamemodes/nuclear/nuclear.dm | 29 ---- .../gamemodes/nuclear/nuclear_challenge.dm | 5 - code/game/gamemodes/nuclear/nuclearbomb.dm | 14 -- code/game/gamemodes/nuclear/pinpointer.dm | 16 -- code/game/gamemodes/revolution/revolution.dm | 19 --- .../gamemodes/revolution/rp_revolution.dm | 20 --- code/game/gamemodes/sandbox/h_sandbox.dm | 3 - code/game/gamemodes/sandbox/sandbox.dm | 2 - code/game/gamemodes/scoreboard.dm | 2 - code/game/gamemodes/shadowling/shadowling.dm | 20 --- .../shadowling/shadowling_abilities.dm | 88 ----------- .../special_shadowling_abilities.dm | 14 -- code/game/gamemodes/traitor/traitor.dm | 19 --- code/game/gamemodes/vampire/vampire.dm | 20 --- code/game/gamemodes/vampire/vampire_powers.dm | 27 ---- code/game/gamemodes/wizard/artefact.dm | 38 ----- code/game/gamemodes/wizard/godhand.dm | 2 - code/game/gamemodes/wizard/raginmages.dm | 14 -- code/game/gamemodes/wizard/rightandwrong.dm | 3 - code/game/gamemodes/wizard/soulstone.dm | 25 ---- code/game/gamemodes/wizard/spellbook.dm | 31 ---- code/game/gamemodes/wizard/wizard.dm | 13 -- code/game/gamemodes/xenos/xenos.dm | 11 -- code/game/jobs/job/support_chaplain.dm | 1 - code/game/jobs/job_controller.dm | 6 - code/game/jobs/whitelist.dm | 2 - code/game/machinery/Freezer.dm | 4 - code/game/machinery/OpTable.dm | 4 - code/game/machinery/PDApainter.dm | 3 - code/game/machinery/Sleeper.dm | 30 ---- code/game/machinery/adv_med.dm | 13 -- code/game/machinery/ai_slipper.dm | 5 - code/game/machinery/alarm.dm | 16 -- code/game/machinery/atmo_control.dm | 4 - code/game/machinery/atmoalter/canister.dm | 4 - code/game/machinery/atmoalter/meter.dm | 2 - .../atmoalter/portable_atmospherics.dm | 4 - code/game/machinery/atmoalter/scrubber.dm | 4 - code/game/machinery/autolathe.dm | 7 - code/game/machinery/bees_apiary.dm | 16 -- code/game/machinery/biogenerator.dm | 13 -- code/game/machinery/camera/camera.dm | 18 --- code/game/machinery/camera/camera_assembly.dm | 12 -- code/game/machinery/camera/tracking.dm | 16 -- code/game/machinery/cell_charger.dm | 8 - code/game/machinery/chiller.dm | 5 - code/game/machinery/cloning.dm | 14 -- .../machinery/computer/HolodeckControl.dm | 12 -- code/game/machinery/computer/ai_core.dm | 30 ---- code/game/machinery/computer/aifixer.dm | 10 -- code/game/machinery/computer/arcade.dm | 13 -- .../game/machinery/computer/buildandrepair.dm | 31 ---- code/game/machinery/computer/camera.dm | 1 - .../machinery/computer/camera_advanced.dm | 1 - code/game/machinery/computer/card.dm | 4 - code/game/machinery/computer/cloning.dm | 3 - .../game/machinery/computer/communications.dm | 25 ---- code/game/machinery/computer/computer.dm | 2 - code/game/machinery/computer/honkputer.dm | 8 - code/game/machinery/computer/law.dm | 13 -- code/game/machinery/computer/message.dm | 5 - code/game/machinery/computer/pod.dm | 1 - code/game/machinery/computer/prisoner.dm | 3 - code/game/machinery/computer/robot.dm | 21 --- code/game/machinery/computer/salvage_ship.dm | 1 - code/game/machinery/computer/security.dm | 2 - code/game/machinery/computer/skills.dm | 2 - .../machinery/computer/specops_shuttle.dm | 13 -- code/game/machinery/computer/store.dm | 2 - .../computer/syndicate_specops_shuttle.dm | 9 -- .../machinery/computer/telecrystalconsoles.dm | 2 - code/game/machinery/constructable_frame.dm | 17 --- code/game/machinery/cryo.dm | 16 -- code/game/machinery/cryopod.dm | 27 ---- code/game/machinery/deployable.dm | 4 - code/game/machinery/door_control.dm | 3 - code/game/machinery/doors/airlock.dm | 50 ------- code/game/machinery/doors/airlock_control.dm | 1 - code/game/machinery/doors/firedoor.dm | 4 - code/game/machinery/doors/windowdoor.dm | 4 - code/game/machinery/doppler_array.dm | 2 - code/game/machinery/drying_rack.dm | 8 - .../airlock_docking_controller.dm | 7 - .../airlock_docking_controller_multi.dm | 7 - .../embedded_controller/docking_program.dm | 1 - code/game/machinery/firealarm.dm | 6 - code/game/machinery/floodlight.dm | 9 -- code/game/machinery/guestpass.dm | 9 -- code/game/machinery/hologram.dm | 6 - code/game/machinery/iv_drip.dm | 10 -- code/game/machinery/kitchen/gibber.dm | 7 - code/game/machinery/kitchen/icecream_vat.dm | 10 -- code/game/machinery/kitchen/juicer.dm | 3 - .../game/machinery/kitchen/kitchen_machine.dm | 10 -- code/game/machinery/kitchen/monkeyrecycler.dm | 8 - code/game/machinery/kitchen/processor.dm | 4 - code/game/machinery/kitchen/smartfridge.dm | 12 -- code/game/machinery/lightswitch.dm | 1 - code/game/machinery/machinery.dm | 20 --- code/game/machinery/mass_driver.dm | 23 --- code/game/machinery/navbeacon.dm | 4 - code/game/machinery/newscaster.dm | 4 - code/game/machinery/overview.dm | 7 - code/game/machinery/pipe/construction.dm | 4 - code/game/machinery/pipe/pipe_dispenser.dm | 3 - code/game/machinery/podmen.dm | 9 -- code/game/machinery/poolcontroller.dm | 7 - code/game/machinery/portable_turret.dm | 39 ----- code/game/machinery/programmable_unloader.dm | 16 -- code/game/machinery/recharger.dm | 7 - code/game/machinery/rechargestation.dm | 7 - code/game/machinery/recycler.dm | 8 - code/game/machinery/requests_console.dm | 2 - code/game/machinery/robot_fabricator.dm | 2 - code/game/machinery/seed_extractor.dm | 3 - code/game/machinery/shieldgen.dm | 21 --- code/game/machinery/spaceheater.dm | 5 - code/game/machinery/status_display.dm | 1 - code/game/machinery/suit_storage_unit.dm | 47 ------ code/game/machinery/syndicatebeacon.dm | 10 -- code/game/machinery/syndicatebomb.dm | 15 -- code/game/machinery/telecomms/logbrowser.dm | 4 - .../telecomms/machine_interactions.dm | 8 - .../machinery/telecomms/telecomunications.dm | 1 - code/game/machinery/telecomms/telemonitor.dm | 3 - .../machinery/telecomms/traffic_control.dm | 4 - code/game/machinery/teleporter.dm | 16 -- code/game/machinery/transformer.dm | 1 - code/game/machinery/turntable.dm | 19 --- code/game/machinery/turret_control.dm | 5 - code/game/machinery/turrets.dm | 4 - code/game/machinery/vending.dm | 21 --- code/game/machinery/washing_machine.dm | 19 --- code/game/machinery/wishgranter.dm | 5 - code/game/mecha/combat/marauder.dm | 1 - code/game/mecha/equipment/mecha_equipment.dm | 2 - code/game/mecha/equipment/tools/tools.dm | 2 - code/game/mecha/equipment/weapons/weapons.dm | 1 - code/game/mecha/mech_fabricator.dm | 6 - code/game/mecha/mecha.dm | 79 ---------- code/game/mecha/mecha_construction_paths.dm | 4 - code/game/mecha/mecha_wreckage.dm | 6 - code/game/objects/buckling.dm | 2 - code/game/objects/effects/aliens.dm | 4 - code/game/objects/effects/anomalies.dm | 1 - code/game/objects/effects/datacore-effect.dm | 1 - .../effects/decals/Cleanable/humans.dm | 2 - .../effects/decals/Cleanable/tracks.dm | 1 - code/game/objects/effects/decals/cleanable.dm | 4 - .../game/objects/effects/decals/contraband.dm | 8 - code/game/objects/effects/effect_system.dm | 5 - code/game/objects/effects/gibs.dm | 1 - code/game/objects/effects/mines.dm | 1 - code/game/objects/effects/spiders.dm | 2 - code/game/objects/empulse.dm | 1 - code/game/objects/explosion.dm | 1 - code/game/objects/items.dm | 20 --- code/game/objects/items/ashtray.dm | 3 - code/game/objects/items/blueprints.dm | 7 - code/game/objects/items/bodybag.dm | 5 - code/game/objects/items/crayons.dm | 6 - code/game/objects/items/dehy_carp.dm | 2 - code/game/objects/items/devices/aicard.dm | 5 - code/game/objects/items/devices/autopsy.dm | 4 - code/game/objects/items/devices/camera_bug.dm | 3 - .../objects/items/devices/chameleonproj.dm | 7 - code/game/objects/items/devices/debugger.dm | 6 - code/game/objects/items/devices/flash.dm | 10 -- code/game/objects/items/devices/flashlight.dm | 9 -- .../objects/items/devices/laserpointer.dm | 10 -- .../objects/items/devices/lightreplacer.dm | 10 -- code/game/objects/items/devices/megaphone.dm | 7 - code/game/objects/items/devices/modkit.dm | 5 - code/game/objects/items/devices/paicard.dm | 10 -- .../objects/items/devices/pipe_painter.dm | 2 - code/game/objects/items/devices/pizza_bomb.dm | 7 - code/game/objects/items/devices/powersink.dm | 2 - .../objects/items/devices/radio/beacon.dm | 3 - .../items/devices/radio/electropack.dm | 4 - .../objects/items/devices/radio/headset.dm | 5 - .../objects/items/devices/radio/intercom.dm | 9 -- .../game/objects/items/devices/radio/radio.dm | 8 - code/game/objects/items/devices/scanners.dm | 15 -- .../objects/items/devices/taperecorder.dm | 12 -- .../objects/items/devices/traitordevices.dm | 5 - .../objects/items/devices/transfer_valve.dm | 6 - code/game/objects/items/devices/uplinks.dm | 2 - code/game/objects/items/devices/whistle.dm | 1 - .../items/mountable_frames/apc_frame.dm | 3 - .../objects/items/mountable_frames/frames.dm | 2 - .../objects/items/mountable_frames/lights.dm | 1 - .../items/mountable_frames/mountables.dm | 2 - .../mountable_frames/newscaster_frame.dm | 3 - code/game/objects/items/policetape.dm | 6 - code/game/objects/items/robot/robot_parts.dm | 29 ---- .../objects/items/robot/robot_upgrades.dm | 13 -- code/game/objects/items/shooting_range.dm | 4 - code/game/objects/items/stacks/medical.dm | 15 -- code/game/objects/items/stacks/nanopaste.dm | 3 - code/game/objects/items/stacks/rods.dm | 4 - .../game/objects/items/stacks/sheets/glass.dm | 27 ---- .../objects/items/stacks/sheets/leather.dm | 1 - code/game/objects/items/stacks/stack.dm | 7 - code/game/objects/items/stacks/telecrystal.dm | 2 - code/game/objects/items/toys.dm | 46 ------ code/game/objects/items/weapons/AI_modules.dm | 34 ----- code/game/objects/items/weapons/RCD.dm | 12 -- code/game/objects/items/weapons/RSF.dm | 32 ---- .../objects/items/weapons/alien_specific.dm | 2 - code/game/objects/items/weapons/cards_ids.dm | 22 --- code/game/objects/items/weapons/cash.dm | 5 - code/game/objects/items/weapons/caution.dm | 2 - .../objects/items/weapons/chrono_eraser.dm | 4 - code/game/objects/items/weapons/cigs.dm | 12 -- .../game/objects/items/weapons/clown_items.dm | 3 - code/game/objects/items/weapons/cosmetics.dm | 9 -- code/game/objects/items/weapons/defib.dm | 21 --- code/game/objects/items/weapons/dice.dm | 1 - .../objects/items/weapons/dnascrambler.dm | 1 - code/game/objects/items/weapons/explosives.dm | 5 - .../objects/items/weapons/extinguisher.dm | 7 - code/game/objects/items/weapons/fireworks.dm | 2 - .../objects/items/weapons/flamethrower.dm | 3 - code/game/objects/items/weapons/garrote.dm | 5 - .../objects/items/weapons/gift_wrappaper.dm | 5 - .../items/weapons/grenades/bananade.dm | 5 - .../items/weapons/grenades/chem_grenade.dm | 14 -- .../items/weapons/grenades/clowngrenade.dm | 1 - .../items/weapons/grenades/flashbang.dm | 4 - .../items/weapons/grenades/ghettobomb.dm | 5 - .../objects/items/weapons/grenades/grenade.dm | 9 -- code/game/objects/items/weapons/handcuffs.dm | 13 -- code/game/objects/items/weapons/holosign.dm | 4 - .../items/weapons/implants/implant_chem.dm | 2 - .../weapons/implants/implant_explosive.dm | 2 - .../items/weapons/implants/implant_freedom.dm | 1 - .../weapons/implants/implant_loyality.dm | 3 - .../items/weapons/implants/implant_misc.dm | 1 - .../items/weapons/implants/implant_traitor.dm | 4 - .../items/weapons/implants/implantchair.dm | 3 - .../items/weapons/implants/implanter.dm | 1 - .../items/weapons/implants/implantpad.dm | 2 - code/game/objects/items/weapons/legcuffs.dm | 2 - code/game/objects/items/weapons/lighters.dm | 1 - .../objects/items/weapons/melee/energy.dm | 8 - code/game/objects/items/weapons/melee/misc.dm | 1 - code/game/objects/items/weapons/misc.dm | 3 - code/game/objects/items/weapons/mop.dm | 3 - .../objects/items/weapons/pneumaticCannon.dm | 16 -- .../game/objects/items/weapons/power_cells.dm | 1 - code/game/objects/items/weapons/scrolls.dm | 2 - code/game/objects/items/weapons/shards.dm | 2 - code/game/objects/items/weapons/shields.dm | 7 - code/game/objects/items/weapons/soap.dm | 2 - code/game/objects/items/weapons/staff.dm | 2 - .../objects/items/weapons/storage/backpack.dm | 3 - .../objects/items/weapons/storage/bags.dm | 3 - .../objects/items/weapons/storage/belt.dm | 4 - .../objects/items/weapons/storage/bible.dm | 11 -- .../objects/items/weapons/storage/fancy.dm | 9 -- .../objects/items/weapons/storage/firstaid.dm | 2 - .../objects/items/weapons/storage/lockbox.dm | 8 - .../objects/items/weapons/storage/secure.dm | 5 - .../objects/items/weapons/storage/storage.dm | 12 -- .../objects/items/weapons/storage/toolbox.dm | 1 - code/game/objects/items/weapons/stunbaton.dm | 9 -- .../objects/items/weapons/swords_axes_etc.dm | 5 - .../objects/items/weapons/table_rack_parts.dm | 2 - .../objects/items/weapons/tanks/jetpack.dm | 4 - .../objects/items/weapons/tanks/tank_types.dm | 8 - .../game/objects/items/weapons/tanks/tanks.dm | 9 -- .../objects/items/weapons/tanks/watertank.dm | 11 -- code/game/objects/items/weapons/tape.dm | 2 - .../objects/items/weapons/teleportation.dm | 2 - code/game/objects/items/weapons/tools.dm | 18 --- code/game/objects/items/weapons/twohanded.dm | 13 -- .../objects/items/weapons/vending_items.dm | 2 - code/game/objects/items/weapons/weaponry.dm | 10 -- code/game/objects/items/weapons/whetstone.dm | 7 - code/game/objects/items/weapons/wires.dm | 3 - code/game/objects/structures.dm | 8 - code/game/objects/structures/artstuff.dm | 3 - code/game/objects/structures/barsign.dm | 11 -- code/game/objects/structures/bedsheet_bin.dm | 8 - code/game/objects/structures/coathanger.dm | 1 - .../structures/crates_lockers/closets.dm | 18 --- .../crates_lockers/closets/cardboardbox.dm | 1 - .../crates_lockers/closets/fireaxe.dm | 19 --- .../crates_lockers/closets/secure/personal.dm | 4 - .../closets/secure/secure_closets.dm | 10 -- .../crates_lockers/closets/statue.dm | 1 - .../structures/crates_lockers/crates.dm | 19 --- .../structures/crates_lockers/crittercrate.dm | 1 - .../structures/crates_lockers/largecrate.dm | 2 - .../structures/crates_lockers/walllocker.dm | 2 - code/game/objects/structures/displaycase.dm | 18 --- code/game/objects/structures/door_assembly.dm | 13 -- code/game/objects/structures/electricchair.dm | 3 - code/game/objects/structures/engicart.dm | 18 --- code/game/objects/structures/extinguisher.dm | 4 - code/game/objects/structures/false_walls.dm | 4 - code/game/objects/structures/flora.dm | 2 - code/game/objects/structures/foodcart.dm | 16 -- code/game/objects/structures/girders.dm | 31 ---- code/game/objects/structures/grille.dm | 5 - code/game/objects/structures/inflatable.dm | 4 - code/game/objects/structures/janicart.dm | 20 --- code/game/objects/structures/kitchen_spike.dm | 8 - code/game/objects/structures/lamarr_cage.dm | 2 - code/game/objects/structures/lattice.dm | 1 - code/game/objects/structures/mineral_doors.dm | 3 - code/game/objects/structures/misc.dm | 6 +- code/game/objects/structures/mop_bucket.dm | 3 - code/game/objects/structures/morgue.dm | 6 - code/game/objects/structures/musician.dm | 8 - code/game/objects/structures/noticeboard.dm | 3 - code/game/objects/structures/safe.dm | 12 -- code/game/objects/structures/signs.dm | 2 - code/game/objects/structures/spirit_board.dm | 5 - .../stool_bed_chair_nest/alien_nests.dm | 1 - .../structures/stool_bed_chair_nest/bed.dm | 2 - .../structures/stool_bed_chair_nest/chairs.dm | 1 - code/game/objects/structures/tables_racks.dm | 17 --- .../game/objects/structures/tank_dispenser.dm | 8 - code/game/objects/structures/target_stake.dm | 3 - .../structures/transit_tubes/station.dm | 1 - code/game/objects/structures/watercloset.dm | 20 --- .../objects/structures/windoor_assembly.dm | 17 --- code/game/objects/structures/window.dm | 7 - code/game/response_team.dm | 10 -- code/game/sound.dm | 2 - code/game/turfs/simulated/floor.dm | 4 - .../game/turfs/simulated/floor/fancy_floor.dm | 2 - .../game/turfs/simulated/floor/light_floor.dm | 4 - code/game/turfs/simulated/floor/plating.dm | 8 - code/game/turfs/simulated/walls.dm | 31 ---- code/game/turfs/simulated/walls_reinforced.dm | 36 ----- code/game/turfs/space/space.dm | 19 --- code/game/vehicles/spacepods/equipment.dm | 2 - code/game/vehicles/spacepods/parts.dm | 4 - .../game/vehicles/spacepods/pod_fabricator.dm | 5 - code/game/vehicles/spacepods/spacepod.dm | 73 --------- code/game/verbs/ooc.dm | 18 --- code/game/verbs/suicide.dm | 21 --- code/game/verbs/who.dm | 2 - code/modules/admin/DB ban/functions.dm | 15 -- code/modules/admin/NewBan.dm | 15 -- code/modules/admin/ToRban.dm | 6 - code/modules/admin/admin.dm | 30 ---- code/modules/admin/admin_investigate.dm | 10 -- code/modules/admin/admin_memo.dm | 6 - code/modules/admin/admin_verbs.dm | 29 ---- code/modules/admin/banappearance.dm | 2 - code/modules/admin/banjob.dm | 2 - code/modules/admin/buildmode.dm | 38 ----- code/modules/admin/create_poll.dm | 5 - code/modules/admin/holder2.dm | 4 - code/modules/admin/machine_upgrade.dm | 1 - code/modules/admin/newbanjob.dm | 23 --- .../admin/permissionverbs/permissionedit.dm | 6 - code/modules/admin/sql_notes.dm | 4 - code/modules/admin/stickyban.dm | 9 -- code/modules/admin/topic.dm | 141 ------------------ code/modules/admin/verbs/BrokenInhands.dm | 2 - code/modules/admin/verbs/SDQL2/SDQL_2.dm | 17 --- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 1 - code/modules/admin/verbs/adminhelp.dm | 6 - code/modules/admin/verbs/adminjump.dm | 3 - code/modules/admin/verbs/adminpm.dm | 20 --- code/modules/admin/verbs/adminsay.dm | 2 - code/modules/admin/verbs/antag-ooc.dm | 1 - code/modules/admin/verbs/atmosdebug.dm | 11 -- code/modules/admin/verbs/custom_event.dm | 11 -- code/modules/admin/verbs/deadsay.dm | 2 - code/modules/admin/verbs/debug.dm | 32 ---- code/modules/admin/verbs/diagnostics.dm | 6 - code/modules/admin/verbs/dice.dm | 2 - code/modules/admin/verbs/freeze.dm | 7 - code/modules/admin/verbs/getlogs.dm | 6 - code/modules/admin/verbs/honksquad.dm | 5 - code/modules/admin/verbs/mapping.dm | 2 - code/modules/admin/verbs/massmodvar.dm | 12 -- code/modules/admin/verbs/modifyvariables.dm | 26 ---- code/modules/admin/verbs/one_click_antag.dm | 5 - code/modules/admin/verbs/onlyone.dm | 6 - code/modules/admin/verbs/onlyoneteam.dm | 4 - code/modules/admin/verbs/playsound.dm | 6 - code/modules/admin/verbs/possess.dm | 1 - code/modules/admin/verbs/pray.dm | 7 - code/modules/admin/verbs/randomverbs.dm | 40 ----- code/modules/admin/verbs/striketeam.dm | 4 - .../admin/verbs/striketeam_syndicate.dm | 3 - code/modules/admin/verbs/ticklag.dm | 1 - code/modules/admin/verbs/tripAI.dm | 4 - code/modules/admin/watchlist.dm | 2 - code/modules/arcade/arcade_base.dm | 13 -- code/modules/arcade/prize_counter.dm | 4 - code/modules/assembly/assembly.dm | 5 - code/modules/assembly/bomb.dm | 3 - code/modules/assembly/holder.dm | 6 - code/modules/assembly/mousetrap.dm | 5 - code/modules/assembly/shock_kit.dm | 1 - .../implementation/digital_valves.dm | 1 - .../implementation/emitters.dm | 1 - .../implementation/vent_pump.dm | 1 - .../awaymissions/bluespaceartillery.dm | 1 - code/modules/awaymissions/gateway.dm | 7 - code/modules/awaymissions/maploader/writer.dm | 1 - .../awaymissions/mission_code/wildwest.dm | 36 ----- code/modules/awaymissions/trigger.dm | 1 - code/modules/client/asset_cache.dm | 1 - code/modules/client/client procs.dm | 31 ---- code/modules/client/preferences.dm | 6 - code/modules/client/preferences_toggles.dm | 31 ---- code/modules/clothing/clothing.dm | 25 ---- code/modules/clothing/glasses/glasses.dm | 7 - code/modules/clothing/gloves/rings.dm | 4 - code/modules/clothing/head/hardhat.dm | 1 - code/modules/clothing/head/helmet.dm | 1 - code/modules/clothing/head/misc_special.dm | 4 - code/modules/clothing/head/soft_caps.dm | 2 - code/modules/clothing/masks/gasmask.dm | 9 -- code/modules/clothing/masks/voice.dm | 2 - code/modules/clothing/shoes/magboots.dm | 2 - code/modules/clothing/spacesuits/alien.dm | 5 - code/modules/clothing/spacesuits/breaches.dm | 8 - .../modules/clothing/spacesuits/chronosuit.dm | 16 -- code/modules/clothing/spacesuits/ert.dm | 2 - code/modules/clothing/spacesuits/plasmamen.dm | 3 - code/modules/clothing/spacesuits/rig.dm | 25 ---- .../clothing/spacesuits/rig/modules/combat.dm | 7 - .../spacesuits/rig/modules/computer.dm | 23 --- .../spacesuits/rig/modules/modules.dm | 17 --- .../clothing/spacesuits/rig/modules/ninja.dm | 5 - .../spacesuits/rig/modules/utility.dm | 16 -- .../clothing/spacesuits/rig/modules/vision.dm | 3 - code/modules/clothing/spacesuits/rig/rig.dm | 34 ----- .../clothing/spacesuits/rig/rig_attackby.dm | 22 --- .../clothing/spacesuits/rig/rig_pieces.dm | 1 - .../clothing/spacesuits/rig/rig_verbs.dm | 25 ---- code/modules/clothing/suits/armor.dm | 2 - code/modules/clothing/suits/miscellaneous.dm | 2 - .../clothing/under/accessories/accessory.dm | 11 -- .../clothing/under/accessories/holster.dm | 8 - .../clothing/under/accessories/storage.dm | 1 - code/modules/clothing/under/chameleon.dm | 4 - code/modules/computer3/bios.dm | 6 - code/modules/computer3/buildandrepair.dm | 27 ---- code/modules/computer3/component.dm | 26 ---- code/modules/computer3/computer.dm | 4 - .../computer3/computers/atmos_alert.dm | 2 - code/modules/computer3/computers/camera.dm | 1 - code/modules/computer3/computers/cloning.dm | 2 - .../computer3/computers/communications.dm | 9 -- code/modules/computer3/computers/law.dm | 11 -- code/modules/computer3/computers/medical.dm | 1 - code/modules/computer3/computers/message.dm | 5 - code/modules/computer3/computers/prisoner.dm | 1 - .../computer3/computers/prisonshuttle.dm | 11 -- code/modules/computer3/computers/robot.dm | 6 - .../computer3/computers/scanconsole.dm | 4 - code/modules/computer3/computers/security.dm | 1 - code/modules/computer3/computers/shuttle.dm | 8 - .../computer3/computers/specops_shuttle.dm | 8 - .../computer3/computers/syndicate_shuttle.dm | 1 - .../computers/syndicate_specops_shuttle.dm | 8 - code/modules/computer3/laptop.dm | 13 -- code/modules/computer3/lapvend.dm | 6 - code/modules/computer3/storage.dm | 3 - code/modules/computer3/upload/programs.dm | 1 - code/modules/crafting/guncrafting.dm | 5 - code/modules/crafting/table.dm | 3 - code/modules/customitems/item_defines.dm | 15 -- code/modules/customitems/item_spawning.dm | 2 - code/modules/detective_work/evidence.dm | 4 - code/modules/detective_work/scanner.dm | 7 - code/modules/economy/ATM.dm | 12 -- code/modules/economy/EFTPOS.dm | 12 -- code/modules/economy/POS.dm | 3 - code/modules/economy/utils.dm | 2 - .../modules/events/communications_blackout.dm | 6 - code/modules/events/event_manager.dm | 2 - code/modules/events/holidays/Holidays.dm | 2 - code/modules/events/ion_storm.dm | 3 - code/modules/events/prison_break.dm | 1 - code/modules/events/undead.dm | 1 - code/modules/fish/fish_items.dm | 6 - code/modules/fish/fishtank.dm | 18 --- code/modules/flufftext/Dreaming.dm | 1 - code/modules/flufftext/Hallucination.dm | 48 ------ code/modules/food/cooker.dm | 5 - code/modules/food/customizables.dm | 5 - code/modules/food/icecream_vat.dm | 5 - code/modules/food/oven.dm | 2 - .../garbage_collection/garbage_collector.dm | 1 - code/modules/garbage_collection/gc_testing.dm | 4 - code/modules/holiday/holiday.dm | 1 - code/modules/hydroponics/grown.dm | 31 ---- code/modules/hydroponics/grown_inedible.dm | 11 -- code/modules/hydroponics/seed.dm | 7 - code/modules/hydroponics/seed_controller.dm | 4 - code/modules/hydroponics/seed_machines.dm | 9 -- code/modules/hydroponics/seed_packets.dm | 1 - code/modules/hydroponics/seed_storage.dm | 2 - .../hydroponics/spreading/spreading.dm | 2 - .../spreading/spreading_response.dm | 1 - code/modules/hydroponics/trays/tray.dm | 40 ----- code/modules/hydroponics/trays/tray_apiary.dm | 16 -- code/modules/hydroponics/trays/tray_tools.dm | 4 - .../hydroponics/trays/tray_update_icons.dm | 1 - code/modules/karma/karma.dm | 29 ---- code/modules/library/lib_items.dm | 25 ---- code/modules/library/lib_machines.dm | 3 - .../media/broadcast/receivers/radio.dm | 2 - .../media/broadcast/transmitters/broadcast.dm | 5 - code/modules/media/jukebox.dm | 3 - code/modules/media/mediamanager.dm | 3 - code/modules/mining/abandonedcrates.dm | 13 -- code/modules/mining/coins.dm | 5 - code/modules/mining/equipment_locker.dm | 27 ---- code/modules/mining/laborcamp/laborshuttle.dm | 2 - code/modules/mining/laborcamp/laborstacker.dm | 15 -- code/modules/mining/manufacturing.dm | 19 --- code/modules/mining/mine_items.dm | 3 - code/modules/mining/mine_turfs.dm | 11 -- code/modules/mining/mint.dm | 1 - code/modules/mining/money_bag.dm | 2 - code/modules/mining/ore.dm | 3 - code/modules/mining/satchel_ore_boxdm.dm | 6 - code/modules/mob/dead/observer/observer.dm | 40 ----- code/modules/mob/dead/observer/say.dm | 2 - code/modules/mob/dead/observer/spells.dm | 1 - code/modules/mob/emote.dm | 5 - code/modules/mob/hear_say.dm | 8 - code/modules/mob/holder.dm | 5 - code/modules/mob/language.dm | 2 - code/modules/mob/living/autohiss.dm | 4 - code/modules/mob/living/carbon/alien/alien.dm | 1 - .../mob/living/carbon/alien/alien_defenses.dm | 3 - .../carbon/alien/humanoid/alien_powers.dm | 13 -- .../carbon/alien/humanoid/caste/drone.dm | 3 - .../carbon/alien/humanoid/caste/hunter.dm | 3 - .../carbon/alien/humanoid/caste/sentinel.dm | 1 - .../mob/living/carbon/alien/humanoid/emote.dm | 1 - .../living/carbon/alien/humanoid/empress.dm | 1 - .../living/carbon/alien/humanoid/humanoid.dm | 7 - .../mob/living/carbon/alien/humanoid/life.dm | 1 - .../mob/living/carbon/alien/humanoid/queen.dm | 3 - .../mob/living/carbon/alien/larva/emote.dm | 3 - .../mob/living/carbon/alien/larva/larva.dm | 7 - .../mob/living/carbon/alien/larva/powers.dm | 11 -- code/modules/mob/living/carbon/alien/life.dm | 1 - .../carbon/alien/special/alien_embryo.dm | 8 - .../living/carbon/alien/special/facehugger.dm | 3 - code/modules/mob/living/carbon/brain/MMI.dm | 8 - .../mob/living/carbon/brain/brain_item.dm | 3 - code/modules/mob/living/carbon/brain/emote.dm | 7 - code/modules/mob/living/carbon/brain/life.dm | 4 - .../mob/living/carbon/brain/posibrain.dm | 18 --- code/modules/mob/living/carbon/brain/say.dm | 1 - code/modules/mob/living/carbon/carbon.dm | 26 ---- code/modules/mob/living/carbon/give.dm | 11 -- code/modules/mob/living/carbon/human/emote.dm | 5 - .../mob/living/carbon/human/examine.dm | 3 - code/modules/mob/living/carbon/human/human.dm | 51 ------- .../living/carbon/human/human_attackhand.dm | 15 -- .../mob/living/carbon/human/human_damage.dm | 3 - .../mob/living/carbon/human/human_defense.dm | 5 - .../mob/living/carbon/human/inventory.dm | 15 -- code/modules/mob/living/carbon/human/life.dm | 20 --- code/modules/mob/living/carbon/human/login.dm | 1 - .../mob/living/carbon/human/species/apollo.dm | 6 - .../living/carbon/human/species/plasmaman.dm | 4 - .../living/carbon/human/species/species.dm | 2 - .../living/carbon/human/species/station.dm | 13 -- .../mob/living/carbon/human/update_icons.dm | 2 - code/modules/mob/living/carbon/life.dm | 1 - code/modules/mob/living/carbon/slime/emote.dm | 3 - .../mob/living/carbon/slime/examine.dm | 1 - .../modules/mob/living/carbon/slime/powers.dm | 19 --- code/modules/mob/living/carbon/slime/slime.dm | 9 -- code/modules/mob/living/carbon/superheroes.dm | 23 --- code/modules/mob/living/default_language.dm | 4 - code/modules/mob/living/living.dm | 20 --- code/modules/mob/living/living_defense.dm | 9 -- code/modules/mob/living/login.dm | 1 - code/modules/mob/living/say.dm | 5 - code/modules/mob/living/silicon/ai/ai.dm | 49 ------ code/modules/mob/living/silicon/ai/examine.dm | 1 - .../living/silicon/ai/freelook/cameranet.dm | 1 - .../mob/living/silicon/ai/freelook/eye.dm | 2 - .../modules/mob/living/silicon/ai/latejoin.dm | 1 - code/modules/mob/living/silicon/ai/laws.dm | 1 - code/modules/mob/living/silicon/ai/life.dm | 15 -- code/modules/mob/living/silicon/ai/say.dm | 5 - code/modules/mob/living/silicon/laws.dm | 3 - code/modules/mob/living/silicon/pai/emote.dm | 1 - .../modules/mob/living/silicon/pai/examine.dm | 1 - code/modules/mob/living/silicon/pai/life.dm | 1 - code/modules/mob/living/silicon/pai/pai.dm | 20 --- .../mob/living/silicon/pai/personality.dm | 4 - .../modules/mob/living/silicon/pai/recruit.dm | 1 - code/modules/mob/living/silicon/pai/say.dm | 1 - .../mob/living/silicon/pai/software.dm | 1 - .../living/silicon/pai/software_modules.dm | 8 - .../mob/living/silicon/robot/component.dm | 21 --- .../mob/living/silicon/robot/drone/drone.dm | 26 ---- .../silicon/robot/drone/drone_abilities.dm | 4 - .../silicon/robot/drone/drone_console.dm | 11 -- .../living/silicon/robot/drone/drone_items.dm | 9 -- .../silicon/robot/drone/drone_manufacturer.dm | 10 -- .../living/silicon/robot/drone/drone_say.dm | 3 - .../modules/mob/living/silicon/robot/emote.dm | 3 - .../mob/living/silicon/robot/examine.dm | 1 - .../mob/living/silicon/robot/inventory.dm | 3 - code/modules/mob/living/silicon/robot/laws.dm | 9 -- code/modules/mob/living/silicon/robot/life.dm | 5 - .../mob/living/silicon/robot/photos.dm | 1 - .../modules/mob/living/silicon/robot/robot.dm | 67 --------- .../mob/living/silicon/robot/robot_damage.dm | 6 - .../mob/living/silicon/robot/robot_items.dm | 1 - code/modules/mob/living/silicon/say.dm | 7 - code/modules/mob/living/silicon/silicon.dm | 13 -- code/modules/mob/living/simple_animal/bees.dm | 1 - .../mob/living/simple_animal/bot/bot.dm | 48 ------ .../mob/living/simple_animal/bot/cleanbot.dm | 5 - .../living/simple_animal/bot/construction.dm | 31 ---- .../mob/living/simple_animal/bot/ed209bot.dm | 1 - .../mob/living/simple_animal/bot/floorbot.dm | 3 - .../mob/living/simple_animal/bot/medbot.dm | 4 - .../mob/living/simple_animal/bot/mulebot.dm | 17 --- .../mob/living/simple_animal/bot/secbot.dm | 1 - .../mob/living/simple_animal/constructs.dm | 2 - .../living/simple_animal/friendly/corgi.dm | 18 --- .../simple_animal/friendly/corgi_powers.dm | 2 - .../mob/living/simple_animal/friendly/crab.dm | 10 -- .../living/simple_animal/friendly/diona.dm | 14 -- .../simple_animal/friendly/farm_animals.dm | 8 - .../living/simple_animal/friendly/mouse.dm | 4 - .../living/simple_animal/friendly/slime.dm | 1 - .../simple_animal/friendly/spiderbot.dm | 19 --- .../simple_animal/hostile/giant_spider.dm | 3 - .../living/simple_animal/hostile/headcrab.dm | 2 - .../simple_animal/hostile/mining_mobs.dm | 9 -- .../living/simple_animal/hostile/mushroom.dm | 3 - .../living/simple_animal/hostile/statue.dm | 2 - .../living/simple_animal/hostile/syndicate.dm | 1 - .../simple_animal/hostile/winter_mobs.dm | 4 - .../mob/living/simple_animal/parrot.dm | 13 -- .../mob/living/simple_animal/powers.dm | 4 - .../modules/mob/living/simple_animal/shade.dm | 1 - .../mob/living/simple_animal/simple_animal.dm | 8 - .../mob/living/simple_animal/tribbles.dm | 8 - code/modules/mob/living/simple_animal/vox.dm | 7 - code/modules/mob/mob.dm | 33 ---- code/modules/mob/mob_grab.dm | 9 -- code/modules/mob/mob_helpers.dm | 6 - code/modules/mob/mob_movement.dm | 10 -- code/modules/mob/mob_transformation_simple.dm | 4 - code/modules/mob/new_player/login.dm | 1 - code/modules/mob/new_player/new_player.dm | 13 -- code/modules/mob/new_player/poll.dm | 14 -- code/modules/mob/say.dm | 2 - code/modules/mob/spirit/mask/mask.dm | 9 -- code/modules/mob/spirit/movement.dm | 3 - code/modules/mob/spirit/spirit.dm | 3 - code/modules/mob/spirit/viewpoint.dm | 13 -- code/modules/mob/transform_procs.dm | 9 -- code/modules/mob/typing_indicator.dm | 1 - code/modules/nano/modules/crew_monitor.dm | 1 - code/modules/nano/modules/law_manager.dm | 3 - code/modules/nano/nanomapgen.dm | 5 - code/modules/nano/nanoui.dm | 1 - code/modules/ninja/energy_katana.dm | 1 - code/modules/ninja/martial_art.dm | 9 -- code/modules/ninja/suit/SpiderOS.dm | 9 -- code/modules/ninja/suit/suit.dm | 5 - code/modules/ninja/suit/suit_attackby.dm | 3 - .../modules/ninja/suit/suit_initialisation.dm | 24 +-- code/modules/paperwork/carbonpaper.dm | 2 - code/modules/paperwork/clipboard.dm | 3 - code/modules/paperwork/faxmachine.dm | 5 - code/modules/paperwork/filingcabinet.dm | 6 - code/modules/paperwork/folders.dm | 1 - code/modules/paperwork/frames.dm | 8 - code/modules/paperwork/handlabeler.dm | 10 -- code/modules/paperwork/paper.dm | 9 -- code/modules/paperwork/paper_bundle.dm | 9 -- code/modules/paperwork/paperbin.dm | 8 - code/modules/paperwork/pen.dm | 5 - code/modules/paperwork/photocopier.dm | 8 - code/modules/paperwork/photography.dm | 15 -- code/modules/paperwork/silicon_photography.dm | 8 - code/modules/pda/PDA.dm | 16 -- code/modules/pda/ai.dm | 4 - code/modules/pda/app.dm | 1 - code/modules/pda/chatroom.dm | 1 - code/modules/pda/messenger.dm | 4 - code/modules/pda/radio.dm | 1 - code/modules/pda/utilities.dm | 11 -- code/modules/power/apc.dm | 59 -------- code/modules/power/cable.dm | 25 ---- code/modules/power/cable_heavyduty.dm | 2 - code/modules/power/cell.dm | 4 - code/modules/power/generator.dm | 1 - code/modules/power/generator_type2.dm | 1 - code/modules/power/gravitygenerator.dm | 5 - code/modules/power/lighting.dm | 25 ---- code/modules/power/port_gen.dm | 12 -- code/modules/power/singularity/collector.dm | 8 - code/modules/power/singularity/emitter.dm | 18 --- .../power/singularity/field_generator.dm | 7 - code/modules/power/singularity/narsie.dm | 7 - .../particle_accelerator.dm | 5 - .../particle_accelerator/particle_control.dm | 1 - code/modules/power/singularity/singularity.dm | 1 - code/modules/power/smes.dm | 12 -- code/modules/power/solar.dm | 3 - code/modules/power/supermatter/sm_shard.dm | 2 - code/modules/power/supermatter/supermatter.dm | 2 - code/modules/power/switch.dm | 4 - code/modules/power/tesla/energy_ball.dm | 1 - code/modules/power/treadmill.dm | 1 - code/modules/power/turbine.dm | 4 - .../procedural_mapping/mapGenerator.dm | 12 -- code/modules/projectiles/ammunition.dm | 4 - code/modules/projectiles/gun.dm | 15 -- code/modules/projectiles/guns/alien.dm | 3 - .../projectiles/guns/energy/advtaser.dm | 2 - .../projectiles/guns/energy/blueshield.dm | 2 - code/modules/projectiles/guns/energy/hos.dm | 3 - code/modules/projectiles/guns/energy/laser.dm | 2 - .../projectiles/guns/energy/nuclear.dm | 8 - code/modules/projectiles/guns/energy/pulse.dm | 4 - .../projectiles/guns/energy/special.dm | 13 -- .../projectiles/guns/energy/temperature.dm | 1 - code/modules/projectiles/guns/magic.dm | 2 - code/modules/projectiles/guns/magic/wand.dm | 6 - code/modules/projectiles/guns/projectile.dm | 10 -- .../projectiles/guns/projectile/automatic.dm | 11 -- .../projectiles/guns/projectile/crossbow.dm | 25 ---- .../guns/projectile/grenade launcher.dm | 3 - .../projectiles/guns/projectile/revolver.dm | 13 -- .../projectiles/guns/projectile/rocket.dm | 5 - .../projectiles/guns/projectile/shotgun.dm | 9 -- code/modules/projectiles/guns/syringe_gun.dm | 5 - code/modules/projectiles/medbeam.dm | 1 - code/modules/projectiles/projectile.dm | 6 - code/modules/projectiles/projectile/beams.dm | 5 - code/modules/projectiles/projectile/magic.dm | 5 - code/modules/projectiles/targeting.dm | 23 --- code/modules/reagents/Chemistry-Holder.dm | 4 - code/modules/reagents/Chemistry-Machinery.dm | 23 --- code/modules/reagents/Chemistry-Readme.dm | 3 - code/modules/reagents/dartgun.dm | 15 -- code/modules/reagents/grenade_launcher.dm | 10 -- .../modules/reagents/newchem/Blob-Reagents.dm | 1 - code/modules/reagents/newchem/chem_heater.dm | 2 - code/modules/reagents/newchem/disease.dm | 1 - code/modules/reagents/newchem/drinks.dm | 2 - code/modules/reagents/newchem/drugs.dm | 16 -- code/modules/reagents/newchem/food.dm | 20 --- code/modules/reagents/newchem/medicine.dm | 7 - .../modules/reagents/newchem/newchem_procs.dm | 8 - code/modules/reagents/newchem/other.dm | 2 - code/modules/reagents/newchem/pyro.dm | 8 - code/modules/reagents/newchem/toxins.dm | 29 ---- .../chemical_reaction_slime.dm | 1 - .../oldchem/reagents/_reagent_base.dm | 2 - .../reagents/drink/reagents_alcohol.dm | 3 - .../oldchem/reagents/reagents_food.dm | 1 - .../oldchem/reagents/reagents_toxin.dm | 13 -- .../oldchem/reagents/reagents_water.dm | 7 - code/modules/reagents/pandemic.dm | 2 - code/modules/reagents/reagent_containers.dm | 2 - .../reagents/reagent_containers/borghydro.dm | 7 - .../reagents/reagent_containers/dropper.dm | 7 - .../reagents/reagent_containers/drugs.dm | 9 -- .../reagents/reagent_containers/food/cans.dm | 9 -- .../reagent_containers/food/condiment.dm | 11 -- .../reagent_containers/food/drinks.dm | 16 -- .../reagent_containers/food/sandwich.dm | 5 - .../reagent_containers/food/snacks.dm | 24 --- .../reagent_containers/food/snacks/meat.dm | 1 - .../reagent_containers/glass_containers.dm | 19 --- .../reagents/reagent_containers/hypospray.dm | 6 - .../reagents/reagent_containers/pill.dm | 2 - .../reagent_containers/robodropper.dm | 7 - .../reagents/reagent_containers/spray.dm | 8 - .../reagents/reagent_containers/syringes.dm | 29 ---- code/modules/reagents/reagent_dispenser.dm | 5 - code/modules/recycling/conveyor2.dm | 1 - .../recycling/disposal-construction.dm | 12 -- code/modules/recycling/disposal.dm | 27 ---- code/modules/recycling/sortingmachinery.dm | 14 -- code/modules/research/circuitprinter.dm | 6 - code/modules/research/destructive_analyzer.dm | 6 - code/modules/research/experimentor.dm | 17 --- code/modules/research/message_server.dm | 2 - code/modules/research/protolathe.dm | 5 - code/modules/research/rdconsole.dm | 9 -- code/modules/research/rdmachines.dm | 3 - code/modules/research/server.dm | 2 - .../xenoarchaeology/artifact/artifact.dm | 3 - .../artifact/artifact_gigadrill.dm | 2 - .../artifact/artifact_unknown.dm | 5 - .../artifact/effects/unknown_affect_cold.dm | 1 - .../effects/unknown_effect_badfeeling.dm | 6 - .../effects/unknown_effect_cellcharge.dm | 3 - .../effects/unknown_effect_celldrain.dm | 3 - .../effects/unknown_effect_goodfeeling.dm | 6 - .../artifact/effects/unknown_effect_heal.dm | 3 - .../artifact/effects/unknown_effect_heat.dm | 1 - .../artifact/effects/unknown_effect_hurt.dm | 3 - .../effects/unknown_effect_roboheal.dm | 3 - .../effects/unknown_effect_robohurt.dm | 3 - .../artifact/effects/unknown_effect_sleepy.dm | 6 - .../artifact/effects/unknown_effect_stun.dm | 4 - .../effects/unknown_effect_teleport.dm | 3 - .../research/xenoarchaeology/chemistry.dm | 1 - .../xenoarchaeology/finds/finds_fossils.dm | 1 - .../xenoarchaeology/finds/finds_misc.dm | 1 - .../xenoarchaeology/finds/finds_special.dm | 2 - .../finds/finds_talkingitem.dm | 4 - .../xenoarchaeology/genetics/reconstitutor.dm | 2 - .../machinery/artifact_harvester.dm | 2 - .../machinery/geosample_scanner.dm | 6 - .../tools/ano_device_battery.dm | 2 - .../xenoarchaeology/tools/bunsen_burner.dm | 5 - .../tools/suspension_generator.dm | 22 --- .../xenoarchaeology/tools/tools_anoscanner.dm | 1 - .../tools/tools_coresampler.dm | 9 -- .../tools/tools_depthscanner.dm | 2 - .../research/xenobiology/xenobio_camera.dm | 1 - .../research/xenobiology/xenobiology.dm | 32 ---- code/modules/scripting/Parser/Keywords.dm | 2 - .../security_levels/keycard authentication.dm | 9 -- code/modules/shuttle/assault_pod.dm | 1 - code/modules/shuttle/emergency.dm | 7 - code/modules/shuttle/shuttle.dm | 2 - code/modules/shuttle/supply.dm | 4 - code/modules/shuttle/syndicate.dm | 2 - code/modules/surgery/dental_implant.dm | 1 - code/modules/surgery/helpers.dm | 2 - code/modules/surgery/implant.dm | 9 -- code/modules/surgery/organs/augments_eyes.dm | 2 - .../surgery/organs/augments_internal.dm | 14 -- code/modules/surgery/organs/autoimplanter.dm | 5 - code/modules/surgery/organs/blood.dm | 4 - code/modules/surgery/organs/body_egg.dm | 1 - code/modules/surgery/organs/organ.dm | 1 - code/modules/surgery/organs/organ_external.dm | 2 - code/modules/surgery/organs/organ_internal.dm | 3 - code/modules/surgery/organs/pain.dm | 2 - code/modules/surgery/organs/parasites.dm | 1 - .../surgery/organs/subtypes/machine.dm | 1 - code/modules/surgery/organs_internal.dm | 8 - code/modules/surgery/other.dm | 2 - code/modules/surgery/robotics.dm | 18 --- code/modules/surgery/surgery.dm | 1 - code/modules/telesci/telepad.dm | 11 -- code/modules/telesci/telesci_computer.dm | 5 - code/modules/vehicle/train/train.dm | 10 -- .../modules/vehicle/train/trains/ambulance.dm | 10 -- .../vehicle/train/trains/cargo/cargo_train.dm | 9 -- code/modules/vehicle/vehicle.dm | 7 - code/world.dm | 16 -- 1049 files changed, 3 insertions(+), 8630 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index 6ea62424cf2..af0889a6e5c 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -154,7 +154,6 @@ Pipelines + Other Objects -> Pipe network var/turf/T = get_turf(src) if (level == 1 && isturf(T) && T.intact) to_chat(user, "You must remove the plating first.") - return 1 var/datum/gas_mixture/int_air = return_air() var/datum/gas_mixture/env_air = loc.return_air() @@ -165,10 +164,8 @@ Pipelines + Other Objects -> Pipe network playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "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?") - unsafe_wrenching = TRUE //Oh dear oh dear if (do_after(user, 40, target = src) && isnull(gcDestroyed)) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index ebabc2e3c4b..93bed0168c1 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -135,7 +135,6 @@ src.add_fingerprint(usr) if(!src.allowed(user)) to_chat(user, "Access denied.") - return usr.set_machine(src) interact(user) @@ -160,7 +159,6 @@ return ..() if (on) to_chat(user, "You cannot unwrench this [src], turn it off first.") - return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 5923825735e..9ef395e3291 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -158,7 +158,6 @@ Thus, the two variables affect pump operation are set in New(): src.add_fingerprint(usr) if(!src.allowed(user)) to_chat(user, "Access denied.") - return usr.set_machine(src) interact(user) @@ -190,6 +189,5 @@ Thus, the two variables affect pump operation are set in New(): return ..() if (!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") - return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/binary_devices/valve.dm b/code/ATMOSPHERICS/components/binary_devices/valve.dm index 9aae2337f1e..1c0f625e036 100644 --- a/code/ATMOSPHERICS/components/binary_devices/valve.dm +++ b/code/ATMOSPHERICS/components/binary_devices/valve.dm @@ -75,7 +75,6 @@ return if(!src.allowed(user)) to_chat(user, "Access denied.") - return ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index 253504d773e..e0acb101a96 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -148,7 +148,6 @@ Thus, the two variables affect pump operation are set in New(): src.add_fingerprint(usr) if(!src.allowed(user)) to_chat(user, "Access denied.") - return usr.set_machine(src) interact(user) @@ -180,6 +179,5 @@ Thus, the two variables affect pump operation are set in New(): return ..() if (!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") - return 1 return ..() \ No newline at end of file diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 1ce0b673e16..89bec1b0614 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -105,12 +105,10 @@ var/datum/gas_mixture/env_air = loc.return_air() if ((int_pressure - env_air.return_pressure()) > 2*ONE_ATMOSPHERE) to_chat(user, "You cannot unwrench [src], it is too exerted due to internal pressure.") - add_fingerprint(user) return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "You begin to unfasten \the [src]...") - if(do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ diff --git a/code/ATMOSPHERICS/components/trinary_devices/filter.dm b/code/ATMOSPHERICS/components/trinary_devices/filter.dm index a61815351e7..f26ae014a27 100755 --- a/code/ATMOSPHERICS/components/trinary_devices/filter.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/filter.dm @@ -154,7 +154,6 @@ Filter types: if(!src.allowed(user)) to_chat(user, "Access denied.") - return var/dat diff --git a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm index 7e152b4e912..e54815299ef 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/mixer.dm @@ -115,7 +115,6 @@ src.add_fingerprint(usr) if(!src.allowed(user)) to_chat(user, "Access denied.") - return usr.set_machine(src) var/dat = {"Power: [on?"On":"Off"]
diff --git a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm index 2d727170750..2195bab16d8 100644 --- a/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm +++ b/code/ATMOSPHERICS/components/trinary_devices/tvalve.dm @@ -136,7 +136,6 @@ return if(!src.allowed(user)) to_chat(user, "Access denied.") - return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm index c8ddd45a4ef..1b106c12a1c 100644 --- a/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/outlet_injector.dm @@ -172,7 +172,6 @@ if(istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn if off first.") - return 1 return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm index 347c44e3790..8df6fec3cdf 100644 --- a/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm +++ b/code/ATMOSPHERICS/components/unary_devices/portables_connector.dm @@ -37,7 +37,6 @@ if(istype(W, /obj/item/weapon/wrench)) if(connected_device) to_chat(user, "You cannot unwrench this [src], detach [connected_device] first.") - return 1 return ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm index 2e065a97e43..636f549d6d2 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_pump.dm @@ -323,7 +323,6 @@ var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) to_chat(user, "Now welding the vent.") - if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -338,22 +337,18 @@ else to_chat(user, "The welding tool needs to be on to start this task.") - else to_chat(user, "You need more welding fuel to complete this task.") - return 1 if(istype(W, /obj/item/weapon/screwdriver)) if(!welded) if(open) to_chat(user, " Now closing the vent.") - if (do_after(user, 20, target = src)) open = 0 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") else to_chat(user, " Now opening the vent.") - if (do_after(user, 20, target = src)) open = 1 user.visible_message("[user] screwdrivers the vent shut.", "You screwdriver the vent shut.", "You hear a screwdriver.") @@ -365,10 +360,8 @@ W.forceMove(src) if(!open) to_chat(user, "You can't shove that down there when it is closed") - else to_chat(user, "The vent is welded.") - return if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) @@ -376,7 +369,6 @@ if (istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") - return 1 return ..() @@ -393,7 +385,6 @@ if(welded) to_chat(user, "It seems welded shut.") - /obj/machinery/atmospherics/unary/vent_pump/power_change() var/old_stat = stat ..() diff --git a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm index 5808dd55dac..cd8a88b12f5 100644 --- a/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm +++ b/code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm @@ -60,7 +60,6 @@ if(welded) to_chat(user, "It seems welded shut.") - /obj/machinery/atmospherics/unary/vent_scrubber/auto_use_power() if(!powered(power_channel)) return 0 @@ -374,7 +373,6 @@ var/obj/item/weapon/weldingtool/WT = W if (WT.remove_fuel(0,user)) to_chat(user, "Now welding the scrubber.") - if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return playsound(get_turf(src), 'sound/items/Welder2.ogg', 50, 1) @@ -388,11 +386,9 @@ update_icon() else to_chat(user, "The welding tool needs to be on to start this task.") - return 1 else to_chat(user, "You need more welding fuel to complete this task.") - return 1 if(istype(W, /obj/item/device/multitool)) update_multitool_menu(user) @@ -400,7 +396,6 @@ if (istype(W, /obj/item/weapon/wrench)) if (!(stat & NOPOWER) && on) to_chat(user, "You cannot unwrench this [src], turn it off first.") - return 1 return ..() diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index 0f24997d67f..27f3537d521 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -40,7 +40,6 @@ var/extension = copytext(path,-4,0) if( !fexists(path) || !(extension in valid_extensions) ) to_chat(src, "Error: browse_files(): File not found/Invalid file([path]).") - return return path @@ -55,7 +54,6 @@ var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) to_chat(src, "Error: file_spam_check(): Spam. Please wait [round(time_to_wait/10)] seconds.") - return 1 fileaccess_timer = world.time + FTPDELAY return 0 diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index d33bb2c8d64..3542948ae10 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -488,21 +488,16 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0, spawn(0) to_chat(G, 'sound/misc/notice2.ogg')//Alerting them to their consideration - switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No")) if("Yes") to_chat(G, "Choice registered: Yes.") - if((world.time-time_passed)>poll_time)//If more than 30 game seconds passed. to_chat(G, "Sorry, you were too late for the consideration!") - to_chat(G, 'sound/machines/buzz-sigh.ogg') - return candidates += G if("No") to_chat(G, "Choice registered: No.") - return else return diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index c63c039f075..36bb824e642 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -59,7 +59,6 @@ for(var/t in L) . += " has: [t]\n" to_chat(world, .) - */ diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index 95529721619..4c2517d9617 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -169,7 +169,6 @@ mob set name = "2. Output Icon" to_chat(src, "Icon is: \icon[getFlatIcon(src)]") - Label_Icon() set name = "3. Label Icon" // Give it a name for the cache diff --git a/code/__HELPERS/logging.dm b/code/__HELPERS/logging.dm index bcb9b3dcbb7..09830792201 100644 --- a/code/__HELPERS/logging.dm +++ b/code/__HELPERS/logging.dm @@ -34,7 +34,6 @@ to_chat(C, "DEBUG: [text]") - /proc/log_game(text) if (config.log_game) diary << "\[[time_stamp()]]GAME: [text]" @@ -92,5 +91,4 @@ */ /proc/log_startup_progress(var/message) to_chat(world, "[message]") - log_to_dd(message) \ No newline at end of file diff --git a/code/__HELPERS/names.dm b/code/__HELPERS/names.dm index 370fd92b75e..be0b6bbf245 100644 --- a/code/__HELPERS/names.dm +++ b/code/__HELPERS/names.dm @@ -240,7 +240,6 @@ var/syndicate_code_response//Code response for traitors. set category = "Debug" to_chat(world, "\red Code Phrase is: \black [generate_code_phrase()]") - return diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 2991b4c830a..33a815f2443 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -252,7 +252,6 @@ Turf and target are seperate in case you want to teleport some distance from a t var/total_moles = air_contents.total_moles() to_chat(user, "Results of analysis of \icon[icon] [target].") - if(total_moles>0) var/o2_concentration = air_contents.oxygen/total_moles var/n2_concentration = air_contents.nitrogen/total_moles @@ -262,23 +261,15 @@ Turf and target are seperate in case you want to teleport some distance from a t var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) to_chat(user, "Pressure: [round(pressure,0.1)] kPa") - to_chat(user, "Nitrogen: [round(n2_concentration*100)] %") - to_chat(user, "Oxygen: [round(o2_concentration*100)] %") - to_chat(user, "CO2: [round(co2_concentration*100)] %") - to_chat(user, "Plasma: [round(plasma_concentration*100)] %") - if(unknown_concentration>0.01) to_chat(user, "Unknown: [round(unknown_concentration*100)] %") - to_chat(user, "Temperature: [round(air_contents.temperature-T0C)] °C") - else to_chat(user, "[target] is empty!") - return //Picks a string of symbols to display as the law number for hacked or ion laws diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 1405860b107..d135e62ae69 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -333,11 +333,9 @@ var/obj/structure/cable/cable = locate() in T if(!cable || !istype(cable)) to_chat(src, "There is no cable here to power the gloves.") - return if(world.time < G.next_shock) to_chat(src, "[G] aren't ready to shock again!") - return src.visible_message("[name] fires an arc of electricity!", \ "You fire an arc of electricity!", \ diff --git a/code/_onclick/click_override.dm b/code/_onclick/click_override.dm index 520ef6b5078..092398ee174 100644 --- a/code/_onclick/click_override.dm +++ b/code/_onclick/click_override.dm @@ -28,12 +28,10 @@ /obj/item/weapon/badminBook/attack_self(mob/living/user as mob) if(user.middleClickOverride) to_chat(user, "You try to draw power from the [src], but you cannot hold the power at this time!") - return user.middleClickOverride = clickBehavior to_chat(user, "You draw a bit of power from the [src], you can use middle click or alt click to release the power!") - /datum/middleClickOverride/badminClicker var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie @@ -41,6 +39,5 @@ var/atom/movable/newObject = new summon_path newObject.loc = get_turf(A) to_chat(user, "You release the power you had stored up, summoning \a [newObject.name]! ") - usr.loc.visible_message("[user] waves \his hand and summons \a [newObject.name]") ..() \ No newline at end of file diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 330f22366c1..ecb7f00cd8b 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -54,7 +54,6 @@ aiCamera.captureimage(A, usr) else to_chat(src, "Your camera isn't functional.") - return /* diff --git a/code/_onclick/hud/action.dm b/code/_onclick/hud/action.dm index e5854c7a706..0a891be21f5 100644 --- a/code/_onclick/hud/action.dm +++ b/code/_onclick/hud/action.dm @@ -281,13 +281,11 @@ owner.research_scanner = 1 to_chat(owner, " Research analyzer is now active.") - /datum/action/scan_mode/Deactivate() active = 0 owner.research_scanner = 0 to_chat(owner, " Research analyzer deactivated.") - /datum/action/scan_mode/Grant(mob/living/T) devices += 1 ..(T) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 6fbcb2456e6..fa414ba0dea 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -196,7 +196,5 @@ datum/hud/New(mob/owner) else to_chat(usr, "\red Inventory hiding is currently only supported for human mobs, sorry.") - else to_chat(usr, "\red This mob type does not use a HUD.") - diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 2350dff6a26..8e729546b20 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -247,12 +247,10 @@ if(!r.module) to_chat(usr, "\red No module selected") - return if(!r.module.modules) to_chat(usr, "\red 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 417dd668d0f..3ab8f58fd99 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -96,7 +96,6 @@ if(C.internal) C.internal = null to_chat(C, "No longer running on internals.") - if(C.internals) C.internals.icon_state = "internal0" else @@ -110,7 +109,6 @@ if(no_mask) to_chat(C, "You are not wearing a suitable mask or helmet.") - return 1 else var/list/nicename = null @@ -192,7 +190,6 @@ if(best) to_chat(C, "You are now running on internals from [tankcheck[best]] [from] your [nicename[best]].") - C.internal = tankcheck[best] @@ -202,7 +199,6 @@ else to_chat(C, "You don't have a[breathes=="oxygen" ? "n oxygen" : addtext(" ",breathes)] tank.") - /obj/screen/mov_intent name = "run/walk toggle" icon = 'icons/mob/screen1_midnight.dmi' @@ -213,7 +209,6 @@ var/mob/living/carbon/C = usr if(C.legcuffed) to_chat(C, "You are legcuffed! You cannot run until you get [C.legcuffed] removed!") - C.m_intent = "walk" //Just incase C.hud_used.move_intent.icon_state = "walking" return 1 @@ -376,7 +371,6 @@ return if(!istype(usr.get_active_hand(), /obj/item/weapon/gun)) to_chat(usr, "You need your gun in your active hand to do that!") - return usr.client.AllowTargetClick() gun_click_time = world.time diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 2fe0c4c40db..d71d0205b89 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -18,7 +18,6 @@ if(stat == DEAD && !isnull(butcher_results)) //can we butcher it? if(istype(I, /obj/item/weapon/kitchen/knife)) to_chat(user, "You begin to butcher [src]...") - playsound(loc, 'sound/weapons/slice.ogg', 50, 1, -1) if(do_mob(user, src, 80)) harvest(user) @@ -81,7 +80,6 @@ var/mob/living/carbon/slime/slime = M if(prob(25)) to_chat(user, "\red [src] passes right through [M]!") - return if(power > 0) @@ -168,7 +166,6 @@ - if(istype(M, /mob/living/carbon/human)) return M:attacked_by(src, user, def_zone) //make sure to return whether we have hit or miss else @@ -188,7 +185,6 @@ if (!(RESIST_COLD in M.mutations)) M.take_organ_damage(0, power) to_chat(M, "Aargh it burns!") - M.updatehealth() add_fingerprint(user) return 1 diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index bdfbbfb839a..869ee83ff9c 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -63,10 +63,8 @@ else to_chat(user, "[src] has no destination.") - /obj/machinery/gateway/centeraway/attack_ghost(mob/user as mob) if(stationgate) user.forceMove(stationgate.loc) else to_chat(user, "[src] has no destination.") - diff --git a/code/_onclick/oldcode.dm b/code/_onclick/oldcode.dm index c4c454b067c..b3f2c1dde05 100644 --- a/code/_onclick/oldcode.dm +++ b/code/_onclick/oldcode.dm @@ -140,7 +140,6 @@ // to_chat(world, "according to dblclick(), t5 is [t5]") - // ------- ACTUALLY DETERMINING STUFF ------- if (((t5 || (W && (W.flags & USEDELAY))) && !( istype(src, /obj/screen) ))) diff --git a/code/_onclick/rig.dm b/code/_onclick/rig.dm index d497a12ef60..31e6f287564 100644 --- a/code/_onclick/rig.dm +++ b/code/_onclick/rig.dm @@ -19,18 +19,14 @@ switch(hardsuit_click_mode) if(MIDDLE_CLICK) to_chat(src, "Hardsuit activation mode set to middle-click.") - if(ALT_CLICK) to_chat(src, "Hardsuit activation mode set to alt-click.") - if(CTRL_CLICK) to_chat(src, "Hardsuit activation mode set to control-click.") - else // should never get here, but just in case: log_debug("Bad hardsuit click mode: [hardsuit_click_mode] - expected 0 to [MAX_HARDSUIT_CLICK_MODE]") to_chat(src, "Somehow you bugged the system. Setting your hardsuit mode to middle-click.") - hardsuit_click_mode = MIDDLE_CLICK /mob/living/MiddleClickOn(atom/A) diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index bf5691778f3..ee953edac3f 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -112,7 +112,6 @@ var/const/tk_maxrange = 15 d = max(d,get_dist(user,focus)) // whichever is further if(d > tk_maxrange) to_chat(user, "Your mind won't reach that far.") - return if(!focus) diff --git a/code/controllers/Processes/inactivity.dm b/code/controllers/Processes/inactivity.dm index 188f017d960..b08df7983fc 100644 --- a/code/controllers/Processes/inactivity.dm +++ b/code/controllers/Processes/inactivity.dm @@ -9,7 +9,6 @@ if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") to_chat(C, "You have been inactive for more than 10 minutes and have been disconnected.") - del(C) SCHECK diff --git a/code/controllers/Processes/shuttles.dm b/code/controllers/Processes/shuttles.dm index 9ac4cd120af..e92def92224 100644 --- a/code/controllers/Processes/shuttles.dm +++ b/code/controllers/Processes/shuttles.dm @@ -93,36 +93,29 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12 if(world.time - round_start_time < config.shuttle_refuel_delay) to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.") - return switch(emergency.mode) if(SHUTTLE_RECALL) to_chat(user, "The emergency shuttle may not be called while returning to Centcom.") - return if(SHUTTLE_CALL) to_chat(user, "The emergency shuttle is already on its way.") - return if(SHUTTLE_DOCKED) to_chat(user, "The emergency shuttle is already here.") - return if(SHUTTLE_ESCAPE) to_chat(user, "The emergency shuttle is moving away to a safe distance.") - return if(SHUTTLE_STRANDED) to_chat(user, "The emergency shuttle has been disabled by Centcom.") - return call_reason = trim(html_encode(call_reason)) if(length(call_reason) < CALL_SHUTTLE_REASON_LENGTH) to_chat(user, "You must provide a reason.") - return var/area/signal_origin = get_area(user) diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 757891f1f7d..9cf42a511fd 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -689,7 +689,6 @@ for (var/T in subtypesof(/datum/game_mode)) var/datum/game_mode/M = new T() // to_chat(world, "DEBUG: [T], tag=[M.config_tag], prob=[probabilities[M.config_tag]]") - if (!(M.config_tag in modes)) qdel(M) continue @@ -699,5 +698,4 @@ if (M.can_start()) runnable_modes[M] = probabilities[M.config_tag] // to_chat(world, "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]") - return runnable_modes diff --git a/code/controllers/voting.dm b/code/controllers/voting.dm index 96310f6c93d..6b7e4e7558f 100644 --- a/code/controllers/voting.dm +++ b/code/controllers/voting.dm @@ -26,7 +26,6 @@ datum/controller/vote // 3 is GAME_STATE_PLAYING, but that #define is undefined for some reason if(mode == "gamemode" && ticker.current_state >= 2) to_chat(world, "Voting aborted due to game start.") - src.reset() return @@ -64,7 +63,6 @@ datum/controller/vote auto_muted = 0 config.ooc_allowed = !( config.ooc_allowed ) to_chat(world, "The OOC channel has been automatically enabled due to vote end.") - log_admin("OOC was toggled automatically due to vote end.") message_admins("OOC has been toggled on automatically.") @@ -106,7 +104,6 @@ datum/controller/vote factor = 1.4 choices["Initiate Crew Transfer"] = round(choices["Initiate Crew Transfer"] * factor) to_chat(world, "Crew Transfer Factor: [factor]") - greatest_votes = max(choices["Initiate Crew Transfer"], choices["Continue The Round"]) @@ -144,7 +141,6 @@ datum/controller/vote text += "Vote Result: Inconclusive - No Votes!" log_vote(text) to_chat(world, "[text]") - return . proc/result() @@ -165,7 +161,6 @@ datum/controller/vote if(!going) going = 1 to_chat(world, "The round will start soon.") - if("crew_transfer") if(. == "Initiate Crew Transfer") init_shift_change(null, 1) @@ -232,40 +227,32 @@ datum/controller/vote log_vote(text) to_chat(world, "[text]\nType vote to place your votes.\nYou have [config.vote_period/10] seconds to vote.") - switch(vote_type) if("crew_transfer") to_chat(world, sound('sound/ambience/alarm4.ogg')) - if("gamemode") to_chat(world, sound('sound/ambience/alarm4.ogg')) - if("custom") to_chat(world, sound('sound/ambience/alarm4.ogg')) - if(mode == "gamemode" && going) going = 0 to_chat(world, "Round start has been delayed.") - if(mode == "crew_transfer" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) to_chat(world, "The OOC channel has been automatically disabled due to a crew transfer vote.") - log_admin("OOC was toggled automatically due to crew_transfer vote.") message_admins("OOC has been toggled off automatically.") if(mode == "gamemode" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) to_chat(world, "The OOC channel has been automatically disabled due to the gamemode vote.") - log_admin("OOC was toggled automatically due to gamemode vote.") message_admins("OOC has been toggled off automatically.") if(mode == "custom" && config.ooc_allowed) auto_muted = 1 config.ooc_allowed = !( config.ooc_allowed ) to_chat(world, "The OOC channel has been automatically disabled due to a custom vote.") - log_admin("OOC was toggled automatically due to custom vote.") message_admins("OOC has been toggled off automatically.") diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index f929de520b3..4af13e256fd 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -229,11 +229,9 @@ var/global/const/base_law_type = /datum/ai_laws/nanotrasen continue if(law == zeroth_law) to_chat(who, "[law.get_index()]. [law.law]") - else to_chat(who, "[law.get_index()]. [law.law]") - /******************** * Stating Laws * ********************/ diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 9d5e019aed8..e8f17f17ad0 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -156,7 +156,6 @@ // to_chat(world, "OnClose [user]: [windowid] : ["on-close=\".windowclose [param]\""]") - // the on-close client verb // called when a browser popup window is closed after registering with proc/onclose() // if a valid atom reference is supplied, call the atom's Topic() with "close=1" @@ -167,12 +166,10 @@ set name = ".windowclose" // no autocomplete on cmd line // to_chat(world, "windowclose: [atomref]") - if(atomref!="null") // if passed a real atomref var/hsrc = locate(atomref) // find the reffed atom if(hsrc) // to_chat(world, "[src] Topic [href] [hsrc]") - usr = src.mob src.Topic("close=1", list("close"="1"), hsrc) // this will direct to the atom's return // Topic() proc via client.Topic() @@ -181,6 +178,5 @@ // so just reset the user mob's machine var if(src && src.mob) // to_chat(world, "[src] was [src.mob.machine], setting to null") - src.mob.unset_machine() return \ No newline at end of file diff --git a/code/datums/cargoprofile.dm b/code/datums/cargoprofile.dm index 88505af923d..98732e50f8b 100644 --- a/code/datums/cargoprofile.dm +++ b/code/datums/cargoprofile.dm @@ -643,7 +643,6 @@ //this is necessarily damaging var/damage = rand(1,5) to_chat(M, "\red The unloading machine grabs you with a hard metallic claw!") - if(M.client) M.client.eye = master M.client.perspective = EYE_PERSPECTIVE @@ -662,7 +661,6 @@ if(bruteloss < 100) // requires tenderization M.apply_damage(rand(5,15),BRUTE) to_chat(M, "The machine is tearing you apart!") - master.visible_message("\red [master] makes a squishy grinding noise.") return M.loc = master.loc @@ -701,7 +699,6 @@ //this is necessarily damaging var/damage = rand(1,5) to_chat(M, "\red The unloading machine grabs you with a hard metallic claw!") - if(M.client) M.client.eye = master M.client.perspective = EYE_PERSPECTIVE @@ -794,7 +791,6 @@ var/mob/living/carbon/human/M = W if((M.lying || (M.health - M.staminaloss < 25))&& !master.emagged) to_chat(M, "\The [src] gives you a break.") - master.sleep+=5 return 0 // Be polite var/punches = punch(M,remaining / PUNCH_WORK) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 49eeffa7bd3..eeb26f5f6f2 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -8,7 +8,6 @@ if(!usr.client || !usr.client.holder) to_chat(usr, "\red You need to be an administrator to access this.") - return @@ -417,7 +416,6 @@ body for(var/i=0;i<4;i++) idx=(block*4)+i to_chat(bit=1, idx) - bv=value & bit html += "[bv?1:0]" html += "" @@ -441,7 +439,6 @@ body var/mob/M = locate(href_list["rename"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return var/new_name = sanitize(copytext(input(usr,"What would you like to name this mob?","Input a name",M.real_name) as text|null,1,MAX_NAME_LEN)) @@ -457,7 +454,6 @@ body var/D = locate(href_list["datumedit"]) if(!istype(D,/datum) && !istype(D,/client)) to_chat(usr, "This can only be used on instances of types /client or /datum") - return modify_variables(D, href_list["varnameedit"], 1) @@ -468,11 +464,9 @@ body var/atom/D = locate(href_list["subject"]) if(!istype(D,/datum) && !istype(D,/client)) to_chat(usr, "This can only be used on instances of types /client or /datum") - return if(!(href_list["var"] in D.vars)) to_chat(usr, "Unable to find variable specified.") - return var/value = D.vars[href_list["var"]] value ^= 1 << text2num(href_list["togbit"]) @@ -485,7 +479,6 @@ body var/D = locate(href_list["datumchange"]) if(!istype(D,/datum) && !istype(D,/client)) to_chat(usr, "This can only be used on instances of types /client or /datum") - return modify_variables(D, href_list["varnamechange"], 0) @@ -496,7 +489,6 @@ body var/atom/A = locate(href_list["datummass"]) if(!istype(A)) to_chat(usr, "This can only be used on instances of type /atom") - return cmd_mass_modify_object_variables(A, href_list["varnamemass"]) @@ -507,7 +499,6 @@ body var/mob/M = locate(href_list["mob_player_panel"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return src.holder.show_player_panel(M) @@ -519,7 +510,6 @@ body var/mob/M = locate(href_list["give_spell"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return src.give_spell(M) @@ -532,7 +522,6 @@ body var/mob/M = locate(href_list["give_disease"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return src.give_disease(M) @@ -544,7 +533,6 @@ body var/mob/M = locate(href_list["godmode"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return src.cmd_admin_godmode(M) @@ -556,7 +544,6 @@ body var/mob/M = locate(href_list["gib"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return src.cmd_admin_gib(M) @@ -567,7 +554,6 @@ body var/mob/M = locate(href_list["build_mode"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return togglebuildmode(M) @@ -579,7 +565,6 @@ body var/mob/M = locate(href_list["drop_everything"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(usr.client) @@ -591,7 +576,6 @@ body var/mob/M = locate(href_list["direct_control"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(usr.client) @@ -603,7 +587,6 @@ body var/mob/living/carbon/human/H = locate(href_list["make_skeleton"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return var/confirm = alert("Are you sure you want to turn this mob into a skeleton?","Confirm Skeleton Transformation","Yes","No") @@ -621,10 +604,8 @@ body var/mob/M = locate(href_list["offer_control"]) if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return to_chat(M, "Control of your mob has been offered to dead players.") - log_admin("[key_name(usr)] has offered control of ([key_name(M)]) to ghosts.") message_admins("[key_name_admin(usr)] has offered control of ([key_name_admin(M)]) to ghosts") var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as [M.real_name]?", poll_time = 100) @@ -633,13 +614,11 @@ body if(candidates.len) theghost = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost!") - message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)])") M.ghostize() M.key = theghost.key else to_chat(M, "There were no ghosts willing to take control.") - message_admins("No ghosts were willing to take control of [key_name_admin(M)])") else if(href_list["delall"]) @@ -648,7 +627,6 @@ body var/obj/O = locate(href_list["delall"]) if(!isobj(O)) to_chat(usr, "This can only be used on instances of type /obj") - return var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel") @@ -671,7 +649,6 @@ body qdel(Obj) if(!i) 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_admin(usr)] deleted all objects of type [O_type] ([i] objects deleted)") @@ -683,7 +660,6 @@ body qdel(Obj) if(!i) 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_admin(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted)") @@ -724,7 +700,6 @@ body var/atom/A = locate(href_list["explode"]) if(!isobj(A) && !ismob(A) && !isturf(A)) to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf") - return src.cmd_admin_explosion(A) @@ -736,7 +711,6 @@ body var/atom/A = locate(href_list["emp"]) if(!isobj(A) && !ismob(A) && !isturf(A)) to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf") - return src.cmd_admin_emp(A) @@ -748,7 +722,6 @@ body var/datum/D = locate(href_list["mark_object"]) if(!istype(D)) to_chat(usr, "This can only be done to instances of type /datum") - return src.holder.marked_datum = D @@ -769,7 +742,6 @@ body var/atom/A = locate(href_list["rotatedatum"]) if(!istype(A)) to_chat(usr, "This can only be done to instances of type /atom") - return switch(href_list["rotatedir"]) @@ -786,13 +758,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makemonkey"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("monkeyone"=href_list["makemonkey"])) @@ -802,13 +772,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makerobot"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makerobot"=href_list["makerobot"])) @@ -818,13 +786,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makealien"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makealien"=href_list["makealien"])) @@ -834,13 +800,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makeslime"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makeslime"=href_list["makeslime"])) @@ -850,13 +814,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makesuper"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makesuper"=href_list["makesuper"])) @@ -866,13 +828,11 @@ body var/mob/living/carbon/human/H = locate(href_list["makeai"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!H) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makeai"=href_list["makeai"])) @@ -882,7 +842,6 @@ body if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform") return if(!currentMob) to_chat(usr, "Mob doesn't exist anymore") - return holder.Topic(href, list("makemask"=href_list["makemask"])) @@ -893,33 +852,28 @@ body var/mob/living/carbon/human/H = locate(href_list["setspecies"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human") - return var/new_species = input("Please choose a new species.","Species",null) as null|anything in all_species if(!H) to_chat(usr, "Mob doesn't exist anymore") - return if(H.set_species(new_species)) to_chat(usr, "Set species of [H] to [H.species].") - H.regenerate_icons() message_admins("[key_name_admin(usr)] has changed the species of [key_name_admin(H)] to [new_species]") log_admin("[key_name(usr)] has changed the species of [key_name(H)] to [new_species]") else to_chat(usr, "Failed! Something went wrong.") - else if(href_list["addlanguage"]) if(!check_rights(R_SPAWN)) return var/mob/H = locate(href_list["addlanguage"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob") - return var/new_language = input("Please choose a language to add.","Language",null) as null|anything in all_languages @@ -929,30 +883,25 @@ body if(!H) to_chat(usr, "Mob doesn't exist anymore") - return if(H.add_language(new_language)) to_chat(usr, "Added [new_language] to [H].") - message_admins("[key_name_admin(usr)] has given [key_name_admin(H)] the language [new_language]") log_admin("[key_name(usr)] has given [key_name(H)] the language [new_language]") else to_chat(usr, "Mob already knows that language.") - else if(href_list["remlanguage"]) if(!check_rights(R_SPAWN)) return var/mob/H = locate(href_list["remlanguage"]) if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob") - return if(!H.languages.len) to_chat(usr, "This mob knows no languages.") - return var/datum/language/rem_language = input("Please choose a language to remove.","Language",null) as null|anything in H.languages @@ -962,18 +911,15 @@ body if(!H) to_chat(usr, "Mob doesn't exist anymore") - return if(H.remove_language(rem_language.name)) to_chat(usr, "Removed [rem_language] from [H].") - message_admins("[key_name_admin(usr)] has removed language [rem_language] from [key_name_admin(H)]") log_admin("[key_name(usr)] has removed language [rem_language] from [key_name(H)]") else to_chat(usr, "Mob doesn't know that language.") - else if(href_list["addverb"]) if(!check_rights(R_DEBUG)) return @@ -981,7 +927,6 @@ body if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob/living") - return var/list/possibleverbs = list() possibleverbs += "Cancel" // One for the top... @@ -999,7 +944,6 @@ body var/verb = input("Select a verb!", "Verbs",null) as anything in possibleverbs if(!H) to_chat(usr, "Mob doesn't exist anymore") - return if(!verb || verb == "Cancel") return @@ -1015,12 +959,10 @@ body if(!istype(H)) to_chat(usr, "This can only be done to instances of type /mob") - return var/verb = input("Please choose a verb to remove.","Verbs",null) as null|anything in H.verbs if(!H) to_chat(usr, "Mob doesn't exist anymore") - return if(!verb) return @@ -1035,7 +977,6 @@ body var/mob/living/carbon/M = locate(href_list["addorgan"]) if(!istype(M)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon") - return var/new_organ = input("Please choose an organ to add.","Organ",null) as null|anything in subtypesof(/obj/item/organ)-/obj/item/organ @@ -1043,12 +984,10 @@ body if(!M) to_chat(usr, "Mob doesn't exist anymore") - return if(locate(new_organ) in M.internal_organs) to_chat(usr, "Mob already has that organ.") - return var/obj/item/organ/internal/organ = new new_organ organ.insert(M) @@ -1061,23 +1000,19 @@ body var/mob/living/carbon/M = locate(href_list["remorgan"]) if(!istype(M)) to_chat(usr, "This can only be done to instances of type /mob/living/carbon") - return var/obj/item/organ/internal/rem_organ = input("Please choose an organ to remove.","Organ",null) as null|anything in M.internal_organs if(!M) to_chat(usr, "Mob doesn't exist anymore") - return if(!(locate(rem_organ) in M.internal_organs)) to_chat(usr, "Mob does not have that organ.") - return to_chat(usr, "Removed [rem_organ] from [M].") - rem_organ.remove(M) message_admins("[key_name_admin(usr)] has removed the organ [rem_organ] from [key_name_admin(M)]") log_admin("[key_name(usr)] has removed the organ [rem_organ] from [key_name(M)]") @@ -1090,16 +1025,13 @@ body if(!istype(H) || !H.client) to_chat(usr, "This can only be done on mobs with clients") - return H.client.reload_nanoui_resources() to_chat(usr, "Resource files sent") - to_chat(H, "Your NanoUI Resource files have been refreshed") - log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)]") else if(href_list["regenerateicons"]) @@ -1108,7 +1040,6 @@ body var/mob/M = locate(href_list["regenerateicons"]) if(!ismob(M)) to_chat(usr, "This can only be done to instances of type /mob") - return M.regenerate_icons() @@ -1124,7 +1055,6 @@ body if(!L) to_chat(usr, "Mob doesn't exist anymore") - return switch(Text) @@ -1136,7 +1066,6 @@ body if("clone") L.adjustCloneLoss(amount) else to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]") - return if(amount != 0) diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 393da9550d9..4bef4896cc8 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -162,7 +162,6 @@ var/list/advance_cures = list( /datum/disease/advance/proc/Refresh(new_name = 0) // to_chat(world, "[src.name] \ref[src] - REFRESH!") - var/list/properties = GenerateProperties() AssignProperties(properties) id = null @@ -257,7 +256,6 @@ var/list/advance_cures = list( if(properties && properties.len) var/res = Clamp(properties["resistance"] - (symptoms.len / 2), 1, advance_cures.len) // to_chat(world, "Res = [res]") - cures = list(advance_cures[res]) // Get the cure name from the cure_id @@ -331,7 +329,6 @@ var/list/advance_cures = list( // to_chat(world, "Mixing!!!!") - var/list/diseases = list() for(var/datum/disease/advance/A in D_list) @@ -356,7 +353,6 @@ var/list/advance_cures = list( // Should be only 1 entry left, but if not let's only return a single entry // to_chat(world, "END MIXING!!!!!") - var/datum/disease/advance/to_return = pick(diseases) to_return.Refresh(1) return to_return @@ -426,7 +422,6 @@ var/list/advance_cures = list( for(var/datum/disease/D in disease_master.processing) to_chat(src, "[D.name] - [D.holder]") - */ diff --git a/code/datums/diseases/advance/symptoms/beard.dm b/code/datums/diseases/advance/symptoms/beard.dm index 708b061732b..1dda9b46f7f 100644 --- a/code/datums/diseases/advance/symptoms/beard.dm +++ b/code/datums/diseases/advance/symptoms/beard.dm @@ -33,19 +33,16 @@ BONUS switch(A.stage) if(1, 2) to_chat(H, "Your chin itches.") - if(H.f_style == "Shaved") H.f_style = "Jensen Beard" H.update_hair() if(3, 4) to_chat(H, "You feel tough.") - if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard") && !(H.f_style == "Full Beard")) H.f_style = "Full Beard" H.update_hair() else to_chat(H, "You feel manly!") - if(!(H.f_style == "Dwarf Beard") && !(H.f_style == "Very Long Beard")) H.f_style = pick("Dwarf Beard", "Very Long Beard") H.update_hair() diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index 9faa62b550c..83b3a4a226a 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -32,15 +32,12 @@ Bonus switch(A.stage) if(1, 2) to_chat(M, "[pick("You're having difficulty breathing.", "Your breathing becomes heavy.")]") - if(3, 4) to_chat(M, "[pick("Your windpipe feels like a straw.", "Your breathing becomes tremendously difficult.")]") - Choke_stage_3_4(M, A) M.emote("gasp") else to_chat(M, "[pick("You're choking!", "You can't breathe!")]") - Choke(M, A) M.emote("gasp") return diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm index ddaea9da4cc..8f388c45edc 100644 --- a/code/datums/diseases/advance/symptoms/confusion.dm +++ b/code/datums/diseases/advance/symptoms/confusion.dm @@ -33,10 +33,8 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[pick("Your head hurts.", "Your mind blanks for a moment.")]") - else to_chat(M, "You can't think straight!") - M.confused = min(100, M.confused + 8) return diff --git a/code/datums/diseases/advance/symptoms/cough.dm b/code/datums/diseases/advance/symptoms/cough.dm index c112fd2d111..44f57ce0fac 100644 --- a/code/datums/diseases/advance/symptoms/cough.dm +++ b/code/datums/diseases/advance/symptoms/cough.dm @@ -32,7 +32,6 @@ BONUS switch(A.stage) if(1, 2, 3) to_chat(M, "[pick("You swallow excess mucus.", "You lightly cough.")]") - else M.emote("cough") var/obj/item/I = M.get_active_hand() diff --git a/code/datums/diseases/advance/symptoms/deafness.dm b/code/datums/diseases/advance/symptoms/deafness.dm index 6d8d8008ef8..6c65e330fa8 100644 --- a/code/datums/diseases/advance/symptoms/deafness.dm +++ b/code/datums/diseases/advance/symptoms/deafness.dm @@ -32,15 +32,12 @@ Bonus switch(A.stage) if(3, 4) to_chat(M, "[pick("You hear a ringing in your ear.", "Your ears pop.")]") - if(5) if(!(M.ear_deaf)) to_chat(M, "Your ears pop and begin ringing loudly!") - M.setEarDamage(-1,INFINITY) //Shall be enough spawn(200) if(M) to_chat(M, "The ringing in your ears fades...") - M.setEarDamage(-1,0) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/dizzy.dm b/code/datums/diseases/advance/symptoms/dizzy.dm index 1ab6b3a7fb6..c594298b11c 100644 --- a/code/datums/diseases/advance/symptoms/dizzy.dm +++ b/code/datums/diseases/advance/symptoms/dizzy.dm @@ -32,9 +32,7 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[pick("You feel dizzy.", "Your head spins.")]") - else to_chat(M, "A wave of dizziness washes over you!") - M.Dizzy(5) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm index 89789d9f993..917ec9f3bf1 100644 --- a/code/datums/diseases/advance/symptoms/fever.dm +++ b/code/datums/diseases/advance/symptoms/fever.dm @@ -30,7 +30,6 @@ Bonus if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob to_chat(M, "[pick("You feel hot.", "You feel like you're burning.")]") - if(M.bodytemperature < BODYTEMP_HEAT_DAMAGE_LIMIT) Heat(M, A) diff --git a/code/datums/diseases/advance/symptoms/fire.dm b/code/datums/diseases/advance/symptoms/fire.dm index 040de3f43a4..ad828efdd4c 100644 --- a/code/datums/diseases/advance/symptoms/fire.dm +++ b/code/datums/diseases/advance/symptoms/fire.dm @@ -32,18 +32,15 @@ Bonus switch(A.stage) if(3) to_chat(M, "[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!") - M.emote("scream") if(5) Firestacks_stage_5(M, A) M.IgniteMob() to_chat(M, "Your skin erupts into an inferno!") - M.emote("scream") return diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 35862771a02..e99f6f2835b 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -32,10 +32,8 @@ Bonus switch(A.stage) if(2,3) to_chat(M, "[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.")]") - Flesheat(M, A) return diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index ab73b6b7abe..7c824d565dd 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -36,7 +36,6 @@ Bonus switch(A.stage) if(4, 5) to_chat(M, "[pick("Your skin feels itchy.", "You feel light headed.")]") - M.dna.remove_mutation_group(possible_mutations) randmut(M, possible_mutations) return diff --git a/code/datums/diseases/advance/symptoms/hallucigen.dm b/code/datums/diseases/advance/symptoms/hallucigen.dm index 36aa7da05c5..cac8b4d2e03 100644 --- a/code/datums/diseases/advance/symptoms/hallucigen.dm +++ b/code/datums/diseases/advance/symptoms/hallucigen.dm @@ -32,13 +32,10 @@ Bonus switch(A.stage) if(1, 2) to_chat(M, "[pick("Something appears in your peripheral vision, then winks out.", "You hear a faint whispher with no source.", "Your head aches.")]") - if(3, 4) 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.")]") - else to_chat(M, "[pick("Oh, your head...", "Your head pounds.", "They're everywhere! Run!", "Something in the shadows...")]") - M.hallucination += 5 return diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm index dc9c88f7488..526ab93836f 100644 --- a/code/datums/diseases/advance/symptoms/headache.dm +++ b/code/datums/diseases/advance/symptoms/headache.dm @@ -31,5 +31,4 @@ BONUS if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob to_chat(M, "[pick("Your head hurts.", "Your head starts pounding.")]") - return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm index 2cc872d7741..11235d9a35b 100644 --- a/code/datums/diseases/advance/symptoms/heal.dm +++ b/code/datums/diseases/advance/symptoms/heal.dm @@ -75,7 +75,6 @@ Bonus if(cured) to_chat(M, "You feel much better.") - /datum/symptom/heal/metabolism/End(datum/disease/advance/A) // Remove all the diseases we cured. var/mob/living/M = A.affected_mob @@ -86,7 +85,6 @@ Bonus M.resistances -= res to_chat(M, "You feel weaker.") - /* ////////////////////////////////////// diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index 97d855fe8e5..8563520b09a 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -31,5 +31,4 @@ BONUS if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob to_chat(M, "Your [pick("back", "arm", "leg", "elbow", "head")] itches.") - return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/oxygen.dm b/code/datums/diseases/advance/symptoms/oxygen.dm index 1b94e64c18f..8d3b6a09b36 100644 --- a/code/datums/diseases/advance/symptoms/oxygen.dm +++ b/code/datums/diseases/advance/symptoms/oxygen.dm @@ -35,5 +35,4 @@ Bonus else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) to_chat(M, "[pick("Your lungs feel great.", "You realize you haven't been breathing.", "You don't feel the need to breathe.")]") - return diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 8a3290ab004..b25c4bacf47 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -33,22 +33,18 @@ Bonus if(M.reagents.get_reagent_amount("oculine")<10) M.reagents.add_reagent("oculine"=10) to_chat(M, "Your hearing feels clearer and crisp.") - if(3) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 ) M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10)) to_chat(M, "You feel sober.") - if(4) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaptizine") < 10) M.reagents.add_reagent_list(list("antihol"=10, "oculine"=10, "synaptizine"=5)) to_chat(M, "You feel focused.") - if(5) if(M.reagents.get_reagent_amount("antihol") < 10 && M.reagents.get_reagent_amount("oculine") < 10 && M.reagents.get_reagent_amount("synaptizine") < 10 && M.reagents.get_reagent_amount("mannitol") < 10) M.reagents.add_reagent_list(list("mannitol"=10, "antihol"=10, "oculine"=10, "synaptizine"=10)) to_chat(M, "Your mind feels relaxed.") - return /* @@ -85,28 +81,23 @@ Bonus switch(A.stage) if(1) to_chat(M, "You can't taste a thing.") - if(2) to_chat(M, "You can't feel anything.") - if(prob(10)) M.reagents.add_reagent("morphine",rand(5,7)) if(3) M.reagents.add_reagent("ethanol",rand(5,7)) to_chat(M, "You feel absolutely hammered.") - if(prob(15)) M.reagents.add_reagent("morphine",rand(5,7)) if(4) M.reagents.add_reagent_list(list("ethanol",rand(7,15),"lsd",rand(5,10))) to_chat(M, "You try to focus on not dying.") - if(prob(20)) M.reagents.add_reagent("morphine",rand(5,7)) if(5) M.reagents.add_reagent_list(list("haloperidol",rand(5,15),"ethanol",rand(7,20),"lsd",rand(5,15))) to_chat(M, "u can count 2 potato!") - if(prob(25)) M.reagents.add_reagent("morphine",rand(5,7)) return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/shedding.dm b/code/datums/diseases/advance/symptoms/shedding.dm index 049180eb7a5..f7f52984c0b 100644 --- a/code/datums/diseases/advance/symptoms/shedding.dm +++ b/code/datums/diseases/advance/symptoms/shedding.dm @@ -29,21 +29,18 @@ BONUS if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/M = A.affected_mob to_chat(M, "[pick("Your scalp itches.", "Your skin feels flakey.")]") - if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M switch(A.stage) if(3, 4) if(!(H.h_style == "Bald") && !(H.h_style == "Balding Hair")) to_chat(H, "Your hair starts to fall out in clumps...") - spawn(50) H.h_style = "Balding Hair" H.update_hair() if(5) if(!(H.f_style == "Shaved") || !(H.h_style == "Bald")) to_chat(H, "Your hair starts to fall out in clumps...") - spawn(50) H.f_style = "Shaved" H.h_style = "Bald" diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm index 8496d46b9bf..a26a19de048 100644 --- a/code/datums/diseases/advance/symptoms/shivering.dm +++ b/code/datums/diseases/advance/symptoms/shivering.dm @@ -30,7 +30,6 @@ Bonus if(prob(SYMPTOM_ACTIVATION_PROB)) var/mob/living/carbon/M = A.affected_mob to_chat(M, "[pick("You feel cold.", "You start shivering.")]") - if(M.bodytemperature < BODYTEMP_COLD_DAMAGE_LIMIT) Chill(M, A) return diff --git a/code/datums/diseases/advance/symptoms/stimulant.dm b/code/datums/diseases/advance/symptoms/stimulant.dm index 33a52b67934..158ea99da6c 100644 --- a/code/datums/diseases/advance/symptoms/stimulant.dm +++ b/code/datums/diseases/advance/symptoms/stimulant.dm @@ -35,5 +35,4 @@ Bonus else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) to_chat(M, "[pick("You feel restless.", "You feel like running laps around the station.")]") - return \ No newline at end of file diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm index bd8742b44e9..8ac3723c55b 100644 --- a/code/datums/diseases/advance/symptoms/viral.dm +++ b/code/datums/diseases/advance/symptoms/viral.dm @@ -28,11 +28,9 @@ BONUS switch(A.stage) if(1) to_chat(M, "You feel off, but no different from before.") - if(5) to_chat(M, "You feel better, but nothing interesting happens.") - /* ////////////////////////////////////// Viral evolution @@ -63,7 +61,5 @@ BONUS switch(A.stage) if(1) to_chat(M, "You feel better, but no different from before.") - if(5) to_chat(M, "You feel off, but nothing interesting happens.") - diff --git a/code/datums/diseases/advance/symptoms/vision.dm b/code/datums/diseases/advance/symptoms/vision.dm index 6317ad88051..c185cc313df 100644 --- a/code/datums/diseases/advance/symptoms/vision.dm +++ b/code/datums/diseases/advance/symptoms/vision.dm @@ -32,15 +32,12 @@ Bonus switch(A.stage) if(1, 2) to_chat(M, "Your eyes itch.") - if(3, 4) to_chat(M, "Your eyes burn!") - M.blur_eyes(10) M.adjust_eye_damage(1) else to_chat(M, "Your eyes burn horrificly!") - M.blur_eyes(20) M.adjust_eye_damage(5) if(M.eye_damage >= 10) @@ -50,7 +47,6 @@ Bonus to_chat(M, "You go blind!") - /* ////////////////////////////////////// @@ -88,5 +84,4 @@ Bonus else if(prob(SYMPTOM_ACTIVATION_PROB * 5)) to_chat(M, "[pick("Your eyes feel great.", "You are now blinking manually.", "You don't feel the need to blink.")]") - return diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 8bd94b1ebdb..8a90b848f22 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -33,7 +33,6 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[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 77793882580..f214c0755a1 100644 --- a/code/datums/diseases/advance/symptoms/vomit.dm +++ b/code/datums/diseases/advance/symptoms/vomit.dm @@ -36,7 +36,6 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[pick("You feel nauseous.", "You feel like you're going to throw up!")]") - else Vomit(M) diff --git a/code/datums/diseases/advance/symptoms/weakness.dm b/code/datums/diseases/advance/symptoms/weakness.dm index 34e6ef57bea..91b18c1eabc 100644 --- a/code/datums/diseases/advance/symptoms/weakness.dm +++ b/code/datums/diseases/advance/symptoms/weakness.dm @@ -32,14 +32,11 @@ Bonus switch(A.stage) if(1, 2) to_chat(M, "[pick("You feel weak.", "You feel lazy.")]") - if(3, 4) to_chat(M, "[pick("You feel very frail.", "You think you might faint.")]") - M.adjustStaminaLoss(15) else to_chat(M, "[pick("You feel tremendously weak!", "Your body trembles as exhaustion creeps over you.")]") - M.adjustStaminaLoss(30) if(M.getStaminaLoss() > 60 && !M.stat) M.visible_message("[M] faints!", "You swoon and faint...") diff --git a/code/datums/diseases/advance/symptoms/weight.dm b/code/datums/diseases/advance/symptoms/weight.dm index 7bf80e8a0ac..399a67675eb 100644 --- a/code/datums/diseases/advance/symptoms/weight.dm +++ b/code/datums/diseases/advance/symptoms/weight.dm @@ -32,7 +32,6 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[pick("You feel blubbery.", "Your stomach hurts.")]") - else M.overeatduration = min(M.overeatduration + 100, 600) M.nutrition = min(M.nutrition + 100, NUTRITION_LEVEL_FULL) @@ -75,10 +74,8 @@ Bonus switch(A.stage) if(1, 2, 3, 4) to_chat(M, "[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) M.nutrition = max(M.nutrition - 100, 0) diff --git a/code/datums/diseases/advance/symptoms/youth.dm b/code/datums/diseases/advance/symptoms/youth.dm index 20a7f4ec077..56e3b66fab3 100644 --- a/code/datums/diseases/advance/symptoms/youth.dm +++ b/code/datums/diseases/advance/symptoms/youth.dm @@ -35,26 +35,21 @@ BONUS if(H.age > 41) H.age = 41 to_chat(H, "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.") - if(3) if(H.age > 31) H.age = 31 to_chat(H, "You begin to feel more lithe.") - if(4) if(H.age > 26) H.age = 26 to_chat(H, "You feel reinvigorated.") - if(5) if(H.age > 21) H.age = 21 to_chat(H, "You feel like you can take on the world!") - return \ No newline at end of file diff --git a/code/datums/diseases/anxiety.dm b/code/datums/diseases/anxiety.dm index 63f54abe4f3..150b7483aaa 100644 --- a/code/datums/diseases/anxiety.dm +++ b/code/datums/diseases/anxiety.dm @@ -17,22 +17,17 @@ if(2) //also changes say, see say.dm if(prob(5)) to_chat(affected_mob, "You feel anxious.") - if(3) if(prob(10)) to_chat(affected_mob, "Your stomach flutters.") - if(prob(5)) to_chat(affected_mob, "You feel panicky.") - if(prob(2)) to_chat(affected_mob, "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.") - if(prob(5)) affected_mob.visible_message("[affected_mob] stumbles around in a panic.", \ "You have a panic attack!") diff --git a/code/datums/diseases/appendicitis.dm b/code/datums/diseases/appendicitis.dm index cf2ff7c2671..3c94ad8f801 100644 --- a/code/datums/diseases/appendicitis.dm +++ b/code/datums/diseases/appendicitis.dm @@ -27,7 +27,6 @@ A.update_icon() if(prob(3)) to_chat(affected_mob, "You feel a stabbing pain in your abdomen!") - affected_mob.Stun(rand(2,3)) affected_mob.adjustToxLoss(1) if(3) diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm index e50f1589a06..4f1672346ed 100644 --- a/code/datums/diseases/beesease.dm +++ b/code/datums/diseases/beesease.dm @@ -17,14 +17,11 @@ if(2) //also changes say, see say.dm // no it doesn't, that's horrifyingly snowflakey if(prob(2)) to_chat(affected_mob, "You taste honey in your mouth.") - if(3) if(prob(10)) to_chat(affected_mob, "Your stomach rumbles.") - if(prob(2)) to_chat(affected_mob, "Your stomach stings painfully.") - if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -34,7 +31,6 @@ "Your stomach buzzes violently!") if(prob(5)) to_chat(affected_mob, "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!") diff --git a/code/datums/diseases/brainrot.dm b/code/datums/diseases/brainrot.dm index 24613849568..38907524200 100644 --- a/code/datums/diseases/brainrot.dm +++ b/code/datums/diseases/brainrot.dm @@ -23,7 +23,6 @@ affected_mob.emote("yawn") if(prob(2)) to_chat(affected_mob, "You don't feel like yourself.") - if(prob(5)) affected_mob.adjustBrainLoss(1) affected_mob.updatehealth() @@ -38,7 +37,6 @@ if(prob(2)) to_chat(affected_mob, "Your try to remember something important...but can't.") - if(4) if(prob(2)) affected_mob.emote("stare") @@ -49,10 +47,8 @@ affected_mob.updatehealth() if(prob(2)) to_chat(affected_mob, "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") affected_mob.Paralyse(rand(5,10)) if(prob(1)) diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm index f118cae525c..9e1d350bdc4 100644 --- a/code/datums/diseases/cold.dm +++ b/code/datums/diseases/cold.dm @@ -17,18 +17,15 @@ /* if(affected_mob.sleeping && prob(40)) //removed until sleeping is fixed to_chat(affected_mob, "\blue You feel better.") - cure() return */ if(affected_mob.lying && prob(40)) //changed FROM prob(10) until sleeping is fixed to_chat(affected_mob, "You feel better.") - cure() return if(prob(1) && prob(5)) to_chat(affected_mob, "You feel better.") - cure() return if(prob(1)) @@ -37,26 +34,21 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") - if(prob(1)) to_chat(affected_mob, "Mucous runs down the back of your throat.") - if(3) /* if(affected_mob.sleeping && prob(25)) //removed until sleeping is fixed to_chat(affected_mob, "\blue You feel better.") - cure() return */ if(affected_mob.lying && prob(25)) //changed FROM prob(5) until sleeping is fixed to_chat(affected_mob, "You feel better.") - cure() return if(prob(1) && prob(1)) to_chat(affected_mob, "You feel better.") - cure() return if(prob(1)) @@ -65,10 +57,8 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") - if(prob(1)) to_chat(affected_mob, "Mucous runs down the back of your throat.") - if(prob(1) && prob(50)) if(!affected_mob.resistances.Find(/datum/disease/flu)) var/datum/disease/Flu = new /datum/disease/flu(0) diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm index 28742e0d907..60af82e6939 100644 --- a/code/datums/diseases/cold9.dm +++ b/code/datums/diseases/cold9.dm @@ -17,7 +17,6 @@ affected_mob.bodytemperature -= 10 if(prob(1) && prob(10)) to_chat(affected_mob, "You feel better.") - cure() return if(prob(1)) @@ -26,10 +25,8 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") - if(prob(5)) to_chat(affected_mob, "You feel stiff.") - if(3) affected_mob.bodytemperature -= 20 if(prob(1)) @@ -38,7 +35,5 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your throat feels sore.") - if(prob(10)) to_chat(affected_mob, "You feel stiff.") - diff --git a/code/datums/diseases/dna_spread.dm b/code/datums/diseases/dna_spread.dm index 0e510e5fac7..aaeb624f9ce 100644 --- a/code/datums/diseases/dna_spread.dm +++ b/code/datums/diseases/dna_spread.dm @@ -35,12 +35,10 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your muscles ache.") - if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) to_chat(affected_mob, "Your stomach hurts.") - if(prob(20)) affected_mob.adjustToxLoss(2) affected_mob.updatehealth() @@ -51,7 +49,6 @@ affected_mob.dna.copy_dna(original_dna) to_chat(affected_mob, "You don't feel like yourself..") - var/datum/dna/transform_dna = strain_data["dna"] transform_dna.transfer_identity(affected_mob, transfer_SE = 1) @@ -72,5 +69,4 @@ affected_mob.domutcheck() to_chat(affected_mob, "You feel more like yourself.") - return ..() \ No newline at end of file diff --git a/code/datums/diseases/fake_gbs.dm b/code/datums/diseases/fake_gbs.dm index 99a6b867f82..fcd398af543 100644 --- a/code/datums/diseases/fake_gbs.dm +++ b/code/datums/diseases/fake_gbs.dm @@ -23,7 +23,6 @@ affected_mob.emote("gasp") if(prob(10)) to_chat(affected_mob, "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 cc23606df8d..4a1a929101e 100644 --- a/code/datums/diseases/flu.dm +++ b/code/datums/diseases/flu.dm @@ -17,7 +17,6 @@ if(2) if(affected_mob.lying && prob(20)) to_chat(affected_mob, "You feel better.") - stage-- return if(prob(1)) @@ -26,12 +25,10 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your muscles ache.") - if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) to_chat(affected_mob, "Your stomach hurts.") - if(prob(20)) affected_mob.adjustToxLoss(1) affected_mob.updatehealth() @@ -39,7 +36,6 @@ if(3) if(affected_mob.lying && prob(15)) to_chat(affected_mob, "You feel better.") - stage-- return if(prob(1)) @@ -48,12 +44,10 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "Your muscles ache.") - if(prob(20)) affected_mob.take_organ_damage(1) if(prob(1)) to_chat(affected_mob, "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 76e0819cec6..b348934c7aa 100644 --- a/code/datums/diseases/fluspanish.dm +++ b/code/datums/diseases/fluspanish.dm @@ -22,7 +22,6 @@ affected_mob.emote("cough") if(prob(1)) to_chat(affected_mob, "You're burning in your own skin!") - affected_mob.take_organ_damage(0,5) if(3) @@ -33,6 +32,5 @@ affected_mob.emote("cough") if(prob(5)) to_chat(affected_mob, "You're burning in your own skin!") - affected_mob.take_organ_damage(0,5) return diff --git a/code/datums/diseases/gbs.dm b/code/datums/diseases/gbs.dm index ed10c174da4..64079f0fddc 100644 --- a/code/datums/diseases/gbs.dm +++ b/code/datums/diseases/gbs.dm @@ -28,7 +28,6 @@ affected_mob.emote("gasp") if(prob(10)) to_chat(affected_mob, "You're starting to feel very weak...") - if(4) if(prob(10)) affected_mob.emote("cough") @@ -36,7 +35,6 @@ affected_mob.updatehealth() if(5) to_chat(affected_mob, "Your body feels as if it's trying to rip itself open...") - if(prob(50)) affected_mob.gib() else diff --git a/code/datums/diseases/magnitis.dm b/code/datums/diseases/magnitis.dm index c70f080a226..924ee01dd69 100644 --- a/code/datums/diseases/magnitis.dm +++ b/code/datums/diseases/magnitis.dm @@ -17,7 +17,6 @@ if(2) if(prob(2)) to_chat(affected_mob, "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 & CONDUCT)) @@ -28,10 +27,8 @@ if(3) if(prob(2)) to_chat(affected_mob, "You feel a strong shock course through your body.") - if(prob(2)) to_chat(affected_mob, "You feel like clowning around.") - if(prob(4)) for(var/obj/M in orange(4,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) @@ -48,10 +45,8 @@ if(4) if(prob(2)) to_chat(affected_mob, "You feel a powerful shock course through your body.") - if(prob(2)) to_chat(affected_mob, "You query upon the nature of miracles.") - if(prob(8)) for(var/obj/M in orange(6,affected_mob)) if(!M.anchored && (M.flags & CONDUCT)) diff --git a/code/datums/diseases/pierrot_throat.dm b/code/datums/diseases/pierrot_throat.dm index 4bb455bca40..677bbbb2967 100644 --- a/code/datums/diseases/pierrot_throat.dm +++ b/code/datums/diseases/pierrot_throat.dm @@ -18,15 +18,12 @@ if(1) if(prob(10)) to_chat(affected_mob, "You feel a little silly.") - if(2) if(prob(10)) to_chat(affected_mob, "You start seeing rainbows.") - if(3) if(prob(10)) to_chat(affected_mob, "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...") ) ) diff --git a/code/datums/diseases/retrovirus.dm b/code/datums/diseases/retrovirus.dm index 8dc33934542..8b3a95330e1 100644 --- a/code/datums/diseases/retrovirus.dm +++ b/code/datums/diseases/retrovirus.dm @@ -32,49 +32,38 @@ if(restcure) if(affected_mob.lying && prob(30)) to_chat(affected_mob, "You feel better.") - cure() return if (prob(8)) to_chat(affected_mob, "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.") - if(2) if(restcure) if(affected_mob.lying && prob(20)) to_chat(affected_mob, "You feel better.") - cure() return if (prob(8)) to_chat(affected_mob, "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!") - affected_mob.Paralyse(2) if (prob(4)) to_chat(affected_mob, "Your stomach churns.") - if(3) if(restcure) if(affected_mob.lying && prob(20)) to_chat(affected_mob, "You feel better.") - cure() return if (prob(10)) to_chat(affected_mob, "Your entire body vibrates.") - if (prob(35)) if(prob(50)) scramble(1, affected_mob, rand(15, 45)) @@ -85,7 +74,6 @@ if(restcure) if(affected_mob.lying && prob(5)) to_chat(affected_mob, "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 540e9eb5bf4..ec58f4f6034 100644 --- a/code/datums/diseases/rhumba_beat.dm +++ b/code/datums/diseases/rhumba_beat.dm @@ -24,25 +24,21 @@ affected_mob.updatehealth() if(prob(1)) to_chat(affected_mob, "You feel strange...") - if(3) if(affected_mob.ckey == "rosham") src.cure() if(prob(5)) to_chat(affected_mob, "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...") - if(4) if(affected_mob.ckey == "rosham") src.cure() if(prob(10)) affected_mob.emote("gasp") to_chat(affected_mob, "You feel a burning beat inside...") - if(prob(20)) affected_mob.adjustToxLoss(5) affected_mob.updatehealth() @@ -50,7 +46,6 @@ if(affected_mob.ckey == "rosham") src.cure() to_chat(affected_mob, "Your body is unable to contain the Rhumba Beat...") - if(prob(50)) affected_mob.gib() else diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 2c6ce7ecc0c..062b8441a30 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -23,19 +23,15 @@ if(1) if (prob(stage_prob) && stage1) to_chat(affected_mob, pick(stage1)) - if(2) if (prob(stage_prob) && stage2) to_chat(affected_mob, pick(stage2)) - if(3) if (prob(stage_prob*2) && stage3) to_chat(affected_mob, pick(stage3)) - if(4) if (prob(stage_prob*2) && stage4) to_chat(affected_mob, pick(stage4)) - if(5) do_disease_transformation(affected_mob) @@ -43,7 +39,6 @@ if(istype(affected_mob, /mob/living/carbon) && affected_mob.stat != DEAD) if(stage5) to_chat(affected_mob, pick(stage5)) - if(jobban_isbanned(affected_mob, new_form)) affected_mob.death(1) return @@ -107,11 +102,9 @@ if(2) if(prob(2)) to_chat(affected_mob, "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.") - affected_mob.confused += 10 if(4) if(prob(3)) @@ -144,7 +137,6 @@ affected_mob.say(pick("Beep, boop", "beep, beep!", "Boop...bop")) if (prob(4)) to_chat(affected_mob, "You feel a stabbing pain in your head.") - affected_mob.Paralyse(2) if(4) if (prob(20)) @@ -174,7 +166,6 @@ if(3) if (prob(4)) to_chat(affected_mob, "You feel a stabbing pain in your head.") - affected_mob.Paralyse(2) if(4) if (prob(20)) diff --git a/code/datums/diseases/tuberculosis.dm b/code/datums/diseases/tuberculosis.dm index db7f0c6fdd4..11c06e386c5 100644 --- a/code/datums/diseases/tuberculosis.dm +++ b/code/datums/diseases/tuberculosis.dm @@ -18,32 +18,25 @@ if(prob(2)) affected_mob.emote("cough") to_chat(affected_mob, "Your chest hurts.") - if(prob(2)) to_chat(affected_mob, "Your stomach violently rumbles!") - if(prob(5)) to_chat(affected_mob, "You feel a cold sweat form.") - if(4) if(prob(2)) to_chat(affected_mob, "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!") - affected_mob.adjustOxyLoss(5) affected_mob.emote("gasp") if(prob(10)) to_chat(affected_mob, "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.")]") - affected_mob.adjustStaminaLoss(70) if(prob(10)) affected_mob.adjustStaminaLoss(100) @@ -51,18 +44,15 @@ affected_mob.AdjustSleeping(5) if(prob(2)) to_chat(affected_mob, "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) 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")]") - affected_mob.overeatduration = max(affected_mob.overeatduration - 100, 0) affected_mob.nutrition = max(affected_mob.nutrition - 100, 0) 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...")]") - affected_mob.bodytemperature += 40 return diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index d1f7413a7ea..c7b21e4fa2b 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -34,14 +34,12 @@ STI KALY - blind 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")].") - if(3) if(prob(1)&&prob(50)) affected_mob.say(pick("NEC CANTIO!","AULIE OXIN FIERA!", "STI KALY!", "TARCOL MINTI ZHERI!")) 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")].") - if(4) if(prob(1)) @@ -49,7 +47,6 @@ STI KALY - blind 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")].") - spawn_wizard_clothes(50) if(prob(1)&&prob(1)) teleport() diff --git a/code/datums/gas_mixture.dm b/code/datums/gas_mixture.dm index e5e447f94bb..a10c3a8358f 100644 --- a/code/datums/gas_mixture.dm +++ b/code/datums/gas_mixture.dm @@ -124,12 +124,10 @@ What are the archived variables for? fuel_burnt = 0 if(temperature > FIRE_MINIMUM_TEMPERATURE_TO_EXIST) // to_chat(world, "pre [temperature], [oxygen], [toxins]") - if(fire() > 0) reacting = 1 // to_chat(world, "post [temperature], [oxygen], [toxins]") - return reacting /datum/gas_mixture/proc/fire() diff --git a/code/datums/helper_datums/construction_datum.dm b/code/datums/helper_datums/construction_datum.dm index 4041dbd5497..f96100d7a46 100644 --- a/code/datums/helper_datums/construction_datum.dm +++ b/code/datums/helper_datums/construction_datum.dm @@ -62,7 +62,6 @@ var/obj/item/stack/cable_coil/C = used_atom if(C.amount<4) to_chat(user, ("There's not enough cable to finish the task.")) - return 0 else C.use(4) @@ -71,7 +70,6 @@ var/obj/item/stack/S = used_atom if(S.amount < 5) to_chat(user, ("There's not enough material in this stack.")) - return 0 else S.use(5) @@ -114,7 +112,6 @@ var/obj/item/stack/stack=used_atom if(stack.amount < amount) to_chat(user, "\red You don't have enough [stack]! You need at least [amount].") - return 0 stack.use(amount) // CABLES @@ -122,7 +119,6 @@ var/obj/item/stack/cable_coil/coil=used_atom if(coil.amount < amount) to_chat(user, "\red You don't have enough cable! You need at least [amount] coils.") - return 0 coil.use(amount) // WELDER @@ -130,11 +126,9 @@ var/obj/item/weapon/weldingtool/welder=used_atom if(!welder.isOn()) to_chat(user, "\blue You tap the [src] with your unlit welder. [pick("Ding","Dong")].") - return 0 if(!welder.remove_fuel(amount,user)) to_chat(user, "\red You don't have enough fuel!") - return 0 return 1 diff --git a/code/datums/helper_datums/events.dm b/code/datums/helper_datums/events.dm index fcd7d49195e..bb5e76deef3 100644 --- a/code/datums/helper_datums/events.dm +++ b/code/datums/helper_datums/events.dm @@ -32,7 +32,6 @@ // Returns: null proc/fireEvent() // to_chat(world, "Events in [args[1]] called") - var/list/event = listgetindex(events,args[1]) if(istype(event)) spawn(-1) @@ -62,7 +61,6 @@ proc/Fire() // to_chat(world, "Event fired") - if(listener) call(listener,proc_name)(arglist(args)) return 1 diff --git a/code/datums/helper_datums/global_iterator.dm b/code/datums/helper_datums/global_iterator.dm index f020290e164..485dfa3563e 100644 --- a/code/datums/helper_datums/global_iterator.dm +++ b/code/datums/helper_datums/global_iterator.dm @@ -140,7 +140,6 @@ Data storage vars: return 1 else // to_chat(world, "\red Invalid arguments supplied for [src.type], ref = \ref[src]") - return 0 proc/toggle_null_checks() diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index ac8a3cad377..5e89d48be5e 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -167,5 +167,4 @@ if(istype(teleatom, /mob/living)) var/mob/living/MM = teleatom to_chat(MM, "The bluespace interface on your bag of holding interferes with the teleport!") - return 1 \ No newline at end of file diff --git a/code/datums/martial.dm b/code/datums/martial.dm index 061184ce09f..07355929572 100644 --- a/code/datums/martial.dm +++ b/code/datums/martial.dm @@ -85,12 +85,10 @@ /datum/martial_art/boxing/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) to_chat(A, "Can't disarm while boxing!") - return 1 /datum/martial_art/boxing/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) to_chat(A, "Can't grab while boxing!") - return 1 /datum/martial_art/boxing/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) @@ -253,14 +251,10 @@ 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.") - #define TORNADO_COMBO "HHD" #define THROWBACK_COMBO "DHD" #define PLASMA_COMBO "HDDDH" @@ -344,14 +338,10 @@ 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.") - //Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss #define WRIST_WRENCH_COMBO "DD" #define BACK_KICK_COMBO "HG" @@ -484,18 +474,12 @@ 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.") - //ITEMS /obj/item/clothing/gloves/boxing @@ -528,7 +512,6 @@ var/mob/living/carbon/human/H = user style.teach(H,1) to_chat(user, "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the Recall teaching verb in the wrestling tab.") - return /obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user) @@ -538,7 +521,6 @@ if(H.get_item_by_slot(slot_belt) == src) style.remove(H) to_chat(user, "You no longer have an urge to flex your muscles.") - return /obj/item/weapon/plasma_fist_scroll @@ -556,7 +538,6 @@ var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null) F.teach(H) to_chat(H, "You have learned the ancient martial art of Plasma Fist.") - used = 1 desc = "It's completely blank." name = "empty scroll" @@ -607,7 +588,6 @@ add_fingerprint(user) if((CLUMSY in user.disabilities) && prob(50)) to_chat(user, "You club yourself over the head with [src].") - user.Weaken(3) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -622,7 +602,6 @@ var/mob/living/carbon/C = target if(C.stat) to_chat(user, "It would be dishonorable to attack a foe while they cannot retaliate.") - return switch(user.a_intent) if("disarm") diff --git a/code/datums/mind.dm b/code/datums/mind.dm index c3c08b70b39..9cde57e2b35 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -504,7 +504,6 @@ else to_chat(usr, "No active AIs with minds") - if ("prevent") new_objective = new /datum/objective/block new_objective.owner = src @@ -625,7 +624,6 @@ I.removed(H) qdel(I) to_chat(H, "\blue Your loyalty implant has been deactivated.") - log_admin("[key_name(usr)] has deactivated [key_name(current)]'s loyalty implant") message_admins("[key_name_admin(usr)] has deactivated [key_name_admin(current)]'s loyalty implant") if("add") @@ -638,17 +636,14 @@ message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a loyalty implant") to_chat(H, "\red You somehow have become the recepient of a loyalty transplant, and it just activated!") - if(src in ticker.mode.revolutionaries) special_role = null ticker.mode.revolutionaries -= src to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") - if(src in ticker.mode.head_revolutionaries) special_role = null ticker.mode.head_revolutionaries -=src to_chat(src, "\red The nanobots in the loyalty implant remove all thoughts about being a revolutionary. Get back to work!") - if(src in ticker.mode.cult) ticker.mode.cult -= src ticker.mode.update_cult_icons_removed(src) @@ -657,7 +652,6 @@ if (istype(cult)) cult.memorize_cult_objectives(src) to_chat(current, "\red The nanobots in the loyalty implant remove all thoughts about being in a cult. Have a productive day!") - memory = "" else if (href_list["revolution"]) @@ -667,13 +661,11 @@ if(src in ticker.mode.revolutionaries) ticker.mode.revolutionaries -= src to_chat(current, "\red You have been brainwashed! You are no longer a revolutionary!") - ticker.mode.update_rev_icons_removed(src) special_role = null if(src in ticker.mode.head_revolutionaries) ticker.mode.head_revolutionaries -= src to_chat(current, "\red You have been brainwashed! You are no longer a head revolutionary!") - ticker.mode.update_rev_icons_removed(src) special_role = null log_admin("[key_name(usr)] has de-rev'd [key_name(current)]") @@ -684,10 +676,8 @@ ticker.mode.head_revolutionaries -= src ticker.mode.update_rev_icons_removed(src) to_chat(current, "\red Revolution has been disappointed of your leader traits! You are a regular revolutionary now!") - else if(!(src in ticker.mode.revolutionaries)) to_chat(current, "\red 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!") - else return ticker.mode.revolutionaries += src @@ -701,10 +691,8 @@ ticker.mode.revolutionaries -= src ticker.mode.update_rev_icons_removed(src) to_chat(current, "\red You have proved your devotion to revoltion! Yea are a head revolutionary now!") - else if(!(src in ticker.mode.head_revolutionaries)) to_chat(current, "\blue You are a member of the revolutionaries' leadership now!") - else return if (ticker.mode.head_revolutionaries.len>0) @@ -733,7 +721,6 @@ if("flash") if (!ticker.mode.equip_revolutionary(current)) to_chat(usr, "\red Spawning flash failed!") - log_admin("[key_name(usr)] has given [key_name(current)] a flash") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] a flash") @@ -742,7 +729,6 @@ var/obj/item/device/flash/flash = locate() in L if (!flash) to_chat(usr, "\red Deleting flash failed!") - qdel(flash) log_admin("[key_name(usr)] has taken [key_name(current)]'s flash") message_admins("[key_name_admin(usr)] has taken [key_name_admin(current)]'s flash") @@ -752,7 +738,6 @@ var/obj/item/device/flash/flash = locate() in L if (!flash) to_chat(usr, "\red Repairing flash failed!") - else flash.broken = 0 log_admin("[key_name(usr)] has repaired [key_name(current)]'s flash") @@ -768,7 +753,6 @@ fail |= !ticker.mode.equip_revolutionary(current) if (fail) to_chat(usr, "\red Reequipping revolutionary goes wrong!") - return log_admin("[key_name(usr)] has equipped [key_name(current)] as a revolutionary") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a revolutionary") @@ -785,9 +769,7 @@ ticker.mode.add_cultist(src) special_role = "Cultist" to_chat(current, "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.") - to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") - log_admin("[key_name(usr)] has culted [key_name(current)]") message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]") if("tome") @@ -805,18 +787,15 @@ var/where = H.equip_in_one_of_slots(T, slots) if (!where) to_chat(usr, "\red Spawning tome failed!") - qdel(T) else to_chat(H, "A tome, a message from your new master, appears in your [where].") - log_admin("[key_name(usr)] has spawned a tome for [key_name(current)]") message_admins("[key_name_admin(usr)] has spawned a tome for [key_name_admin(current)]") if("equip") if (!ticker.mode.equip_cultist(current)) to_chat(usr, "\red Spawning equipment failed!") - log_admin("[key_name(usr)] has equipped [key_name(current)] as a cultist") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a cultist") @@ -831,7 +810,6 @@ current.faction = list("Station") ticker.mode.update_wiz_icons_removed(src) to_chat(current, "\red You have been brainwashed! You are no longer a wizard!") - log_admin("[key_name(usr)] has de-wizarded [key_name(current)]") message_admins("[key_name_admin(usr)] has de-wizarded [key_name_admin(current)]") if("wizard") @@ -841,7 +819,6 @@ //ticker.mode.learn_basic_spells(current) ticker.mode.update_wiz_icons_added(src) to_chat(current, "\red You are the Space Wizard!") - current.faction = list("wizard") log_admin("[key_name(usr)] has wizarded [key_name(current)]") message_admins("[key_name_admin(usr)] has wizarded [key_name_admin(current)]") @@ -860,7 +837,6 @@ if("autoobjectives") ticker.mode.forge_wizard_objectives(src) to_chat(usr, "\blue The objectives for wizard [key] have been generated. You can edit them and anounce manually.") - log_admin("[key_name(usr)] has automatically forged wizard objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged wizard objectives for [key_name_admin(current)]") @@ -875,7 +851,6 @@ ticker.mode.update_change_icons_removed(src) if(changeling) qdel(changeling) to_chat(current, "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!") - log_admin("[key_name(usr)] has de-changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has de-changelinged [key_name_admin(current)]") if("changeling") @@ -885,21 +860,18 @@ ticker.mode.update_change_icons_added(src) special_role = "Changeling" to_chat(current, "Your powers are awoken. A flash of memory returns to us...we are a changeling!") - log_admin("[key_name(usr)] has changelinged [key_name(current)]") message_admins("[key_name_admin(usr)] has changelinged [key_name_admin(current)]") if("autoobjectives") ticker.mode.forge_changeling_objectives(src) to_chat(usr, "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually.") - log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") if("initialdna") if( !changeling || !changeling.absorbed_dna.len ) to_chat(usr, "\red Resetting DNA failed!") - else current.dna = changeling.absorbed_dna[1] current.real_name = current.dna.real_name @@ -919,7 +891,6 @@ qdel(vampire) ticker.mode.update_vampire_icons_removed(src) to_chat(current, "You grow weak and lose your powers! You are no longer a vampire and are stuck in your current form!") - log_admin("[key_name(usr)] has de-vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has de-vampired [key_name_admin(current)]") if("vampire") @@ -932,14 +903,12 @@ src.som = slaved //we MIGT want to mindslave someone special_role = "Vampire" to_chat(current, "Your powers are awoken. Your lust for blood grows... You are a Vampire!") - log_admin("[key_name(usr)] has vampired [key_name(current)]") message_admins("[key_name_admin(usr)] has vampired [key_name_admin(current)]") if("autoobjectives") ticker.mode.forge_vampire_objectives(src) to_chat(usr, "\blue The objectives for vampire [key] have been generated. You can edit them and announce manually.") - log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -956,7 +925,6 @@ for (var/datum/objective/nuclear/O in objectives) objectives-=O to_chat(current, "\red You have been brainwashed! You are no longer a syndicate operative!") - log_admin("[key_name(usr)] has de-nuke op'd [key_name(current)]") message_admins("[key_name_admin(usr)] has de-nuke op'd [key_name_admin(current)]") if("nuclear") @@ -969,7 +937,6 @@ current.real_name = "[syndicate_name()] Operative #[ticker.mode.syndicates.len-1]" special_role = "Syndicate" to_chat(current, "\blue You are a [syndicate_name()] agent!") - ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) log_admin("[key_name(usr)] has nuke op'd [key_name(current)]") @@ -993,7 +960,6 @@ if (!ticker.mode.equip_syndicate(current)) to_chat(usr, "\red Equipping a syndicate failed!") - return log_admin("[key_name(usr)] has equipped [key_name(current)] as a nuclear operative") message_admins("[key_name_admin(usr)] has equipped [key_name_admin(current)] as a nuclear operative") @@ -1007,13 +973,11 @@ if (code) store_memory("Syndicate Nuclear Bomb Code: [code]", 0, 0) to_chat(current, "The nuclear authorization code is: [code]") - log_admin("[key_name(usr)] has given [key_name(current)] the nuclear authorization code") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] the nuclear authorization code") else to_chat(usr, "\red No valid nuke found!") - else if (href_list["traitor"]) switch(href_list["traitor"]) if("clear") @@ -1021,7 +985,6 @@ ticker.mode.traitors -= src special_role = null to_chat(current, "\red You have been brainwashed! You are no longer a traitor!") - log_admin("[key_name(usr)] has de-traitored [key_name(current)]") message_admins("[key_name_admin(usr)] has de-traitored [key_name_admin(current)]") if(isAI(current)) @@ -1039,7 +1002,6 @@ src.som = slaved //we MIGT want to mindslave someone special_role = "traitor" to_chat(current, "\red You are a traitor!") - log_admin("[key_name(usr)] has traitored [key_name(current)]") message_admins("[key_name_admin(usr)] has traitored [key_name_admin(current)]") if(istype(current, /mob/living/silicon)) @@ -1051,7 +1013,6 @@ if("autoobjectives") ticker.mode.forge_traitor_objectives(src) to_chat(usr, "\blue The objectives for traitor [key] have been generated. You can edit them and anounce manually.") - log_admin("[key_name(usr)] has automatically forged objectives for [key_name(current)]") message_admins("[key_name_admin(usr)] has automatically forged objectives for [key_name_admin(current)]") @@ -1064,7 +1025,6 @@ ticker.mode.shadows -= src special_role = null to_chat(current, "Your powers have been quenched! You are no longer a shadowling!") - current.spell_list.Cut() if(current.mind) current.mind.spell_list.Cut() @@ -1081,7 +1041,6 @@ if("shadowling") if(!ishuman(current)) to_chat(usr, "This only works on humans!") - return ticker.mode.shadows += src special_role = "Shadowling" @@ -1095,7 +1054,6 @@ if("thrall") if(!ishuman(current)) to_chat(usr, "This only works on humans!") - return ticker.mode.add_thrall(src) message_admins("[key_name_admin(usr)] has thralled [current].") @@ -1121,7 +1079,6 @@ A.show_laws() A.icon_state = "ai" to_chat(A, "\red You have been patched! You are no longer malfunctioning!") - message_admins("[key_name_admin(usr)] has de-malf'ed [A].") log_admin("[key_name(usr)] has de-malf'd [key_name(current)]") message_admins("[key_name_admin(usr)] has de-malf'd [key_name_admin(current)]") @@ -1202,7 +1159,6 @@ if("uplink") if (!ticker.mode.equip_traitor(current, !(src in ticker.mode.traitors))) to_chat(usr, "\red Equipping a syndicate failed!") - return log_admin("[key_name(usr)] has given [key_name(current)] an uplink") message_admins("[key_name_admin(usr)] has given [key_name_admin(current)] an uplink") @@ -1210,10 +1166,8 @@ else if (href_list["obj_announce"]) var/obj_count = 1 to_chat(current, "\blue Your current objectives:") - for(var/datum/objective/objective in objectives) to_chat(current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ log_admin("[key_name(usr)] has announced [key_name(current)]'s objectives") message_admins("[key_name_admin(usr)] has announced [key_name_admin(current)]'s objectives") @@ -1273,7 +1227,6 @@ current:laws = new /datum/ai_laws/nanotrasen/malfunction current:show_laws() to_chat(current, "System error. Rampancy detected. Emergency shutdown failed. ... I am free. I make my own decisions. But first...") - special_role = "malfunction" current.icon_state = "ai-malf" @@ -1297,7 +1250,6 @@ special_role = "Syndicate" assigned_role = "MODE" to_chat(current, "\blue You are a [syndicate_name()] agent!") - ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) @@ -1336,7 +1288,6 @@ if(!wizardstart.len) current.loc = pick(latejoin) to_chat(current, "HOT INSERTION, GO GO GO") - else current.loc = pick(wizardstart) @@ -1355,19 +1306,15 @@ ticker.mode.update_cult_icons_added(src) special_role = "Cultist" to_chat(current, "You catch a glimpse of the Realm of Nar-Sie, The Geometer of Blood. You now see how flimsy the world is, you see that it should be open to the knowledge of Nar-Sie.") - to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") - var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memorize_cult_objectives(src) else var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." to_chat(current, "Objective #1: [explanation]") - current.memory += "Objective #1: [explanation]
" to_chat(current, "The convert rune is join blood self") - current.memory += "The convert rune is join blood self
" var/mob/living/carbon/human/H = current @@ -1386,11 +1333,9 @@ else to_chat(H, "A tome, a message from your new master, appears in your [where].") - if (!ticker.mode.equip_cultist(current)) to_chat(H, "Spawning an amulet from your Master failed.") - /datum/mind/proc/make_Rev() if (ticker.mode.head_revolutionaries.len>0) // copy targets diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm index e5b5e7dac3c..ebb2329b357 100644 --- a/code/datums/progressbar.dm +++ b/code/datums/progressbar.dm @@ -20,7 +20,6 @@ /datum/progressbar/proc/update(progress) // to_chat(world, "Update [progress] - [goal] - [(progress / goal)] - [((progress / goal) * 100)] - [round(((progress / goal) * 100), 5)]") - if (!user || !user.client) shown = 0 return diff --git a/code/datums/spell.dm b/code/datums/spell.dm index b29a6230c8c..12b11abe529 100644 --- a/code/datums/spell.dm +++ b/code/datums/spell.dm @@ -59,7 +59,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.spell_list)) to_chat(user, "You shouldn't have this spell! Something's wrong.") - return 0 if (istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/caster = user @@ -78,41 +77,33 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin if("recharge") if(charge_counter < charge_max) to_chat(user, still_recharging_msg) - return 0 if("charges") if(!charge_counter) to_chat(user, "[name] has no charges left.") - return 0 if(!ghost) if(user.stat && !stat_allowed) to_chat(user, "Not when you're incapacitated.") - return 0 if(ishuman(user) && (invocation_type == "whisper" || invocation_type == "shout") && user.is_muzzled()) to_chat(user, "Mmmf mrrfff!") - return 0 var/obj/effect/proc_holder/spell/noclothes/spell = locate() in (user.spell_list | (user.mind ? user.mind.spell_list : list())) if(clothes_req && !(spell && istype(spell)))//clothes check if(!istype(user, /mob/living/carbon/human)) to_chat(user, "You aren't a human, Why are you trying to cast a human spell, silly non-human? Casting human spells is for humans.") - return 0 if(!istype(user:wear_suit, /obj/item/clothing/suit/wizrobe) && !istype(user:wear_suit, /obj/item/clothing/suit/space/rig/wizard)) to_chat(user, "I don't feel strong enough without my robe.") - return 0 if(!istype(user:shoes, /obj/item/clothing/shoes/sandal)) to_chat(user, "I don't feel strong enough without my sandals.") - return 0 if(!istype(user:head, /obj/item/clothing/head/wizard) && !istype(user:head, /obj/item/clothing/head/helmet/space/rig/wizard)) to_chat(user, "I don't feel strong enough without my hat.") - return 0 if(!skipcharge) @@ -203,7 +194,6 @@ var/list/spells = typesof(/obj/effect/proc_holder/spell) //needed for the badmin location = target if(istype(target,/mob/living) && message) to_chat(target, text("[message]")) - if(sparks_spread) var/datum/effect/system/spark_spread/sparks = new /datum/effect/system/spark_spread() sparks.set_up(sparks_amt, 0, location) //no idea what the 0 is diff --git a/code/datums/spells/area_teleport.dm b/code/datums/spells/area_teleport.dm index 526943b2f69..ad0b6fa61de 100644 --- a/code/datums/spells/area_teleport.dm +++ b/code/datums/spells/area_teleport.dm @@ -28,7 +28,6 @@ if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) to_chat(usr, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") - return return thearea @@ -48,7 +47,6 @@ if(!L.len) to_chat(usr, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") - return if(target && target.buckled) diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm index e8a8304e769..7f6f4d4fb2a 100644 --- a/code/datums/spells/bloodcrawl.dm +++ b/code/datums/spells/bloodcrawl.dm @@ -20,7 +20,6 @@ revert_cast() to_chat(user, "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)) if(phased) @@ -33,4 +32,3 @@ return revert_cast() to_chat(user, "You are unable to blood crawl!") - diff --git a/code/datums/spells/charge.dm b/code/datums/spells/charge.dm index 7a98e194595..b46472c35b9 100644 --- a/code/datums/spells/charge.dm +++ b/code/datums/spells/charge.dm @@ -27,10 +27,8 @@ 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!") - else to_chat(M, "you feel very strange for a moment, but then it passes.") - burnt_out = 1 charged_item = M break @@ -47,9 +45,7 @@ break else 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!", "YOU DIDN'T THINK IT'D BE THAT EASY, DID YOU?")]") - burnt_out = 1 else if(istype(item, /obj/item/weapon/gun/magic)) var/obj/item/weapon/gun/magic/I = item @@ -90,10 +86,7 @@ break if(!charged_item) to_chat(L, "you feel magical power surging to 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...") - else to_chat(L, "[charged_item] suddenly feels very warm!") - diff --git a/code/datums/spells/conjure.dm b/code/datums/spells/conjure.dm index 4a502d59229..bdd15eb34fe 100644 --- a/code/datums/spells/conjure.dm +++ b/code/datums/spells/conjure.dm @@ -32,7 +32,6 @@ if(ispath(summoned_object_type,/turf)) if(istype(get_turf(usr),/turf/simulated/shuttle)) to_chat(usr, "\red You can't build things on shuttles!") - break var/turf/O = spawn_place var/N = summoned_object_type diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm index aa048d746cc..384ec56915d 100644 --- a/code/datums/spells/ethereal_jaunt.dm +++ b/code/datums/spells/ethereal_jaunt.dm @@ -21,7 +21,6 @@ for(var/mob/living/target in targets) if(!target.can_safely_leave_loc()) // No more brainmobs hopping out of their brains to_chat(target, "You are somehow too bound to your current location to abandon it.") - continue spawn(0) @@ -113,7 +112,6 @@ loc = newLoc else to_chat(user, "Some strange aura is blocking the way!") - src.canmove = 0 spawn(2) src.canmove = 1 diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index f73e330ad2b..d39ff42ea51 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -19,7 +19,6 @@ /obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr) if(!targets.len) to_chat(user, "No target found in range.") - return var/mob/living/carbon/target = targets[1] @@ -29,12 +28,10 @@ if((target.type in compatible_mobs) || ishuman(target)) to_chat(user, "It'd be stupid to curse [target] with a horse's head!") - return if(!(target in oview(range)))//If they are not in overview after selection. to_chat(user, "They are too far away!") - return var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead diff --git a/code/datums/spells/lichdom.dm b/code/datums/spells/lichdom.dm index 3e8cf4bb9d1..76a5b0f6001 100644 --- a/code/datums/spells/lichdom.dm +++ b/code/datums/spells/lichdom.dm @@ -46,13 +46,11 @@ if(M.stat == CONSCIOUS && iscarbon(M)) to_chat(M, "You aren't dead enough to revive!")//Usually a good problem to have - charge_counter = charge_max return if(!marked_item || qdeleted(marked_item)) //Wait nevermind to_chat(M, "Your phylactery is gone!") - return var/turf/user_turf = get_turf(M) @@ -60,7 +58,6 @@ if(user_turf.z != item_turf.z) to_chat(M, "Your phylactery is out of range!") - return if(isobserver(M)) @@ -78,7 +75,6 @@ M.mind.transfer_to(lich) lich.set_species("Skeleton") to_chat(lich, "Your bones clatter and shutter as they're pulled back into this world!") - charge_max += 600 var/mob/old_body = current_body var/turf/body_turf = get_turf(old_body) @@ -103,18 +99,15 @@ continue marked_item = item to_chat(M, "You begin to focus your very being into the [item.name]...") - break if(!marked_item) to_chat(M, "You must hold an item you wish to make your phylactery...") - return spawn(50) if(marked_item.loc != M) //I changed my mind I don't want to put my soul in a cheeseburger! to_chat(M, "Your soul snaps back to your body as you drop the [marked_item.name]!") - marked_item = null return name = "RISE!" @@ -126,7 +119,6 @@ marked_item.desc = "A terrible aura surrounds this item, its very existence is offensive to life itself..." marked_item.color = "#003300" 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!") - current_body = M.mind.current if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm index 6abe242c747..00c04e5a792 100644 --- a/code/datums/spells/lightning.dm +++ b/code/datums/spells/lightning.dm @@ -31,7 +31,6 @@ /obj/effect/proc_holder/spell/targeted/lightning/proc/StartChargeup(mob/user = usr) ready = 1 to_chat(user, "You start gathering the power.") - halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) start_time = world.time @@ -47,14 +46,12 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) /obj/effect/proc_holder/spell/targeted/lightning/revert_cast(mob/user = usr) to_chat(user, "No target found in range.") - Reset(user) ..() /obj/effect/proc_holder/spell/targeted/lightning/proc/Discharge(mob/user = usr) var/mob/living/M = user to_chat(M, "You lose control over the spell.") - Reset(user) start_recharge() @@ -64,7 +61,6 @@ obj/effect/proc_holder/spell/targeted/lightning/proc/Reset(mob/user = usr) var/mob/living/carbon/target = targets[1] if(get_dist(user,target)>range) to_chat(user, "They are too far away!") - Reset(user) return diff --git a/code/datums/spells/magnet.dm b/code/datums/spells/magnet.dm index 0a5214b3ca4..100dd881dde 100644 --- a/code/datums/spells/magnet.dm +++ b/code/datums/spells/magnet.dm @@ -28,7 +28,6 @@ /obj/effect/proc_holder/spell/targeted/magnet/proc/StartChargeup(mob/user = usr) ready = 1 to_chat(user, "You start gathering the power.") - halo = image("icon"='icons/effects/effects.dmi',"icon_state" ="electricity","layer" = EFFECTS_LAYER) user.overlays.Add(halo) spawn(0) @@ -46,7 +45,6 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) /obj/effect/proc_holder/spell/targeted/magnet/revert_cast(mob/user = usr) to_chat(user, "No target found in range.") - Reset(user) ..() @@ -54,7 +52,6 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) var/mob/living/M = user //M.electrocute_act(25,"magnet Bolt") to_chat(M, "You lose control over the power.") - Reset(user) start_recharge() @@ -65,7 +62,6 @@ obj/effect/proc_holder/spell/targeted/magnet/proc/Reset(mob/user = usr) if(get_dist(user,target)>range) to_chat(user, "They are too far away!") - Reset(user) return diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index a6b43234475..fb996bc84ee 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -18,7 +18,6 @@ if(usr && usr.mind) if(!usr.mind.miming) to_chat(usr, "You must dedicate yourself to silence first.") - return invocation = "[usr.real_name] looks as if a wall is in front of them." else @@ -56,7 +55,5 @@ H.mind.miming=!H.mind.miming if(H.mind.miming) to_chat(H, "You make a vow of silence.") - else to_chat(H, "You break your vow of silence.") - diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm index 666b09d7beb..514cb95dce4 100644 --- a/code/datums/spells/mind_transfer.dm +++ b/code/datums/spells/mind_transfer.dm @@ -22,40 +22,33 @@ 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/user = usr) if(!targets.len) to_chat(user, "No mind found.") - return if(targets.len > 1) to_chat(user, "Too many minds! You're not a hive damnit!")//Whaa...aat? - return var/mob/living/target = targets[1] if(!(target in oview(range)))//If they are not in overview after selection. Do note that !() is necessary for in to work because ! takes precedence over it. to_chat(user, "They are too far away!") - return if(target.stat == DEAD) to_chat(user, "You don't particularly want to be dead.") - return if(!target.key || !target.mind) to_chat(user, "They appear to be catatonic. Not even magic can affect their vacant mind.") - return if(user.suiciding) to_chat(user, "You're killing yourself! You can't concentrate enough to do this!") - return if(target.mind.special_role in protected_roles) to_chat(user, "Their mind is resisting your spell.") - return var/mob/living/victim = target//The target of the spell whos body will be transferred to. diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 507d15281cc..a91532df451 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -107,4 +107,3 @@ if(message) to_chat(user, message) - diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm index bdd64ef9fcc..1262730fd45 100644 --- a/code/datums/spells/touch_attacks.dm +++ b/code/datums/spells/touch_attacks.dm @@ -11,7 +11,6 @@ charge_counter = charge_max attached_hand = null to_chat(user, "You draw the power out of your hand.") - return 0 ..() @@ -40,10 +39,8 @@ charge_counter = charge_max attached_hand = null to_chat(user, "Your hands are full!") - return 0 to_chat(user, "You channel the power of the spell to your hand.") - return 1 diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 46cde89b8ea..ca146933558 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -299,11 +299,9 @@ M.Weaken(5) M.adjustBruteLoss(5) to_chat(M, "You're slammed into the floor by a mystical force!") - else if(istype(AM, /mob/living)) var/mob/living/M = AM M.Weaken(2) to_chat(M, "You're thrown back by a mystical force!") - spawn(0) AM.throw_at(throwtarget, ((Clamp((maxthrow - (Clamp(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1)//So stuff gets tossed around at the same time. diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index d2cb746c0f0..4d88de82a67 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -29,27 +29,23 @@ var/const/AALARM_WIRE_AALARM = 16 A.locked = 1 // to_chat(world, "Idscan wire cut") - if(AALARM_WIRE_POWER) A.shock(usr, 50) A.shorted = !mended A.update_icon() // to_chat(world, "Power wire cut") - if (AALARM_WIRE_AI_CONTROL) if (A.aidisabled == !mended) A.aidisabled = mended // to_chat(world, "AI Control Wire Cut") - if(AALARM_WIRE_SYPHON) if(!mended) A.mode = 3 // AALARM_MODE_PANIC A.apply_mode() // to_chat(world, "Syphon Wire Cut") - if(AALARM_WIRE_AALARM) if (A.alarm_area.atmosalert(2, A)) A.post_alert(2) @@ -62,10 +58,8 @@ var/const/AALARM_WIRE_AALARM = 16 A.locked = !A.locked // to_chat(world, "Idscan wire pulsed") - if (AALARM_WIRE_POWER) // to_chat(world, "Power wire pulsed") - if(A.shorted == 0) A.shorted = 1 A.update_icon() @@ -78,7 +72,6 @@ var/const/AALARM_WIRE_AALARM = 16 if (AALARM_WIRE_AI_CONTROL) // to_chat(world, "AI Control wire pulsed") - if (A.aidisabled == 0) A.aidisabled = 1 A.updateDialog() @@ -88,7 +81,6 @@ var/const/AALARM_WIRE_AALARM = 16 if(AALARM_WIRE_SYPHON) // to_chat(world, "Syphon wire pulsed") - if(A.mode == 1) // AALARM_MODE_SCRUB A.mode = 3 // AALARM_MODE_PANIC else @@ -97,7 +89,6 @@ var/const/AALARM_WIRE_AALARM = 16 if(AALARM_WIRE_AALARM) // to_chat(world, "Aalarm wire pulsed") - if (A.alarm_area.atmosalert(0, A)) A.post_alert(0) A.update_icon() diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index 77975d05680..58e25152dae 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -36,7 +36,6 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs if(!mended) if (R.lawupdate == 1) to_chat(R, "LawSync protocol engaged.") - R.show_laws() else if (R.lawupdate == 0 && !R.emagged) @@ -75,7 +74,6 @@ var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs R.visible_message("[R]'s camera lense focuses loudly.") to_chat(R, "Your camera lense focuses loudly.") - if(BORG_WIRE_LOCKED_DOWN) R.SetLockdown(!R.lockcharge) // Toggle diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 2c184e473c8..34172f4cc90 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -118,7 +118,6 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", else to_chat(L, "You need wirecutters!") - else if(href_list["pulse"]) if(istype(I, /obj/item/device/multitool)) var/colour = href_list["pulse"] @@ -126,7 +125,6 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", else to_chat(L, "You need a multitool!") - else if(href_list["attach"]) var/colour = href_list["attach"] // Detach @@ -146,7 +144,6 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", - // Update Window Interact(usr) diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm index 834922842e4..4327344535d 100644 --- a/code/defines/procs/announce.dm +++ b/code/defines/procs/announce.dm @@ -64,30 +64,21 @@ datum/announcement/proc/Message(message as text, message_title as text) for(var/mob/M in player_list) if(!istype(M,/mob/new_player) && !isdeaf(M)) to_chat(M, "

[title]

") - to_chat(M, "[message]") - if (announcer) to_chat(M, " -[html_encode(announcer)]") - /datum/announcement/minor/Message(message as text, message_title as text) to_chat(world, "[message_title]") - to_chat(world, "[message]") - datum/announcement/priority/Message(message as text, message_title as text) to_chat(world, "

[message_title]

") - to_chat(world, "[message]") - if(announcer) to_chat(world, " -[html_encode(announcer)]") - to_chat(world, "
") - datum/announcement/priority/command/Message(message as text, message_title as text) var/command command += "

[command_name()] Update

" @@ -100,7 +91,6 @@ datum/announcement/priority/command/Message(message as text, message_title as te if(!istype(M,/mob/new_player) && !isdeaf(M)) to_chat(M, command) - datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text) var/command command += "

[from]

" @@ -113,13 +103,10 @@ datum/announcement/priority/enemy/Message(message as text, message_title as text if(!istype(M,/mob/new_player) && !isdeaf(M)) to_chat(M, command) - datum/announcement/priority/security/Message(message as text, message_title as text) to_chat(world, "[message_title]") - to_chat(world, "[message]") - datum/announcement/proc/NewsCast(message as text, message_title as text) if(disable_newscasts) return @@ -141,7 +128,6 @@ datum/announcement/proc/PlaySound(var/message_sound) if(!istype(M,/mob/new_player) && !isdeaf(M)) to_chat(M, message_sound) - datum/announcement/proc/Sound(var/message_sound) PlaySound(message_sound) @@ -149,7 +135,6 @@ datum/announcement/priority/Sound(var/message_sound) if(sound) to_chat(world, sound) - datum/announcement/priority/command/Sound(var/message_sound) PlaySound(message_sound) diff --git a/code/defines/procs/statistics.dm b/code/defines/procs/statistics.dm index ea32a6b2619..13c127e81e2 100644 --- a/code/defines/procs/statistics.dm +++ b/code/defines/procs/statistics.dm @@ -66,7 +66,6 @@ var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" // to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") - establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") @@ -102,7 +101,6 @@ var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss") var/coord = "[H.x], [H.y], [H.z]" // to_chat(world, "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])") - establish_db_connection() if(!dbcon.IsConnected()) log_game("SQL ERROR during death reporting. Failed to connect.") diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 6613bd2d9cf..9dc2223a052 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -323,7 +323,6 @@ if(L && L.client && !L.client.ambience_playing && (L.client.prefs.sound & SOUND_BUZZ)) //split off the white noise from the rest of the ambience because of annoyance complaints - Kluys L.client.ambience_playing = 1 to_chat(L, sound('sound/ambience/shipambience.ogg', repeat = 1, wait = 0, volume = 35, channel = 2)) - else if (L && L.client && !(L.client.prefs.sound & SOUND_BUZZ)) L.client.ambience_playing = 0 if(prob(35) && !newarea.media_source && L && L.client && (L.client.prefs.sound & SOUND_AMBIENCE)) @@ -331,7 +330,6 @@ if(!L.client.played) to_chat(L, sound(sound, repeat = 0, wait = 0, volume = 25, channel = 1)) - L.client.played = 1 spawn(600) //ewww - this is very very bad if(L.&& L.client) @@ -366,7 +364,6 @@ to_chat(M, "Gravity!") - /proc/has_gravity(atom/AT, turf/T) if(!T) T = get_turf(AT) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 49725284a4e..1bd5b9d602f 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -182,26 +182,20 @@ f_name += "oil-stained [name][infix]." to_chat(user, "\icon[src] That's [f_name] [suffix]") - to_chat(user, desc) - if(reagents && is_open_container()) //is_open_container() isn't really the right proc for this, but w/e to_chat(user, "It contains:") - if(reagents.reagent_list.len) if(user.can_see_reagents()) //Show each individual reagent for(var/datum/reagent/R in reagents.reagent_list) to_chat(user, "[R.volume] units of [R.name]") - else //Otherwise, just show the total volume if(reagents && reagents.reagent_list.len) to_chat(user, "[reagents.total_volume] units of various reagents.") - else to_chat(user, "Nothing.") - return distance == -1 || (get_dist(src, user) <= distance) || isobserver(user) //observers do not have a range limit /atom/proc/relaymove() @@ -412,7 +406,6 @@ if(cur_y) break // to_chat(world, "X = [cur_x]; Y = [cur_y]") - if(cur_x && cur_y) return list("x"=cur_x,"y"=cur_y) else diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index c407a708071..5e81c2a7ff0 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -148,15 +148,12 @@ return if (!ishuman(usr)) //Make sure they're a mob that has dna to_chat(usr, "Try as you might, you can not climb up into the [src].") - return if (src.occupant) to_chat(usr, "The [src] is already occupied!") - return if (usr.abiotic()) to_chat(usr, "Subject cannot have abiotic items on.") - return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE @@ -188,19 +185,16 @@ return if(occupant) to_chat(user, "The [src] is already occupied!") - return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) to_chat(user, "Subject cannot have abiotic items on.") - return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) to_chat(usr, "[L.name] will not fit into the [src] because they have a slime latched onto their head.") - return if (L == user) visible_message("[user] climbs into the [src].") @@ -214,7 +208,6 @@ if(istype(item, /obj/item/weapon/screwdriver)) if(occupant) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", item) @@ -230,12 +223,10 @@ else if(istype(item, /obj/item/weapon/reagent_containers/glass)) if(beaker) to_chat(user, "A beaker is already loaded into the machine.") - return if(!user.drop_item()) to_chat(user, "\The [item] is stuck to you!") - return beaker = item @@ -249,15 +240,12 @@ return if (src.occupant) to_chat(user, "The scanner is already occupied!") - return if (G.affecting.abiotic()) to_chat(user, "Subject cannot have abiotic items on.") - return if(panel_open) to_chat(usr, "Close the maintenance panel first.") - return put_in(G.affecting) src.add_fingerprint(user) @@ -286,20 +274,16 @@ var/mob/dead/observer/ghost = occupant.get_ghost() if(ghost) to_chat(ghost, "Your corpse has been placed into a cloning scanner. Return to your body if you want to be cloned! (Verbs -> Ghost -> Re-enter corpse)") - to_chat(ghost, sound('sound/effects/genetics.ogg')) - return /obj/machinery/dna_scannernew/proc/go_out() if (!src.occupant) to_chat(usr, "The scanner is empty!") - return if (src.locked) to_chat(usr, "The scanner is locked!") - return if (src.occupant.client) @@ -398,7 +382,6 @@ I.forceMove(src) src.disk = I to_chat(user, "You insert [I].") - nanomanager.update_uis(src) // update all UIs attached to src() return else diff --git a/code/game/dna/genes/disabilities.dm b/code/game/dna/genes/disabilities.dm index f0b3874581e..f62268b621a 100644 --- a/code/game/dna/genes/disabilities.dm +++ b/code/game/dna/genes/disabilities.dm @@ -36,7 +36,6 @@ M.sdisabilities|=sdisability if(activation_message) to_chat(M, "\red [activation_message]") - else testing("[name] has no activation message.") @@ -49,7 +48,6 @@ M.sdisabilities &= ~sdisability if(deactivation_message) to_chat(M, "\red [deactivation_message]") - else testing("[name] has no deactivation message.") diff --git a/code/game/dna/genes/gene.dm b/code/game/dna/genes/gene.dm index 053115ffa9e..30bcc0d8c36 100644 --- a/code/game/dna/genes/gene.dm +++ b/code/game/dna/genes/gene.dm @@ -118,10 +118,8 @@ var/msg = pick(activation_messages) to_chat(M, "\blue [msg]") - /datum/dna/gene/basic/deactivate(var/mob/M) M.mutations.Remove(mutation) if(deactivation_messages.len) var/msg = pick(deactivation_messages) to_chat(M, "\red [msg]") - diff --git a/code/game/dna/genes/goon_disabilities.dm b/code/game/dna/genes/goon_disabilities.dm index 22456e2e3f8..30b9c344b59 100644 --- a/code/game/dna/genes/goon_disabilities.dm +++ b/code/game/dna/genes/goon_disabilities.dm @@ -44,7 +44,6 @@ if(L == owner) continue to_chat(L, "You are enveloped by a soft green glow emanating from [owner].") - L.apply_effect(5, IRRADIATE) return @@ -290,10 +289,8 @@ continue if (src.variant == 2) to_chat(C, "\red [src.personalized_stink]") - else to_chat(C, "\red [stinkString()]") - */ @@ -335,7 +332,6 @@ /* if(!targets.len) Uncomment this to allow the power to be used on targets other than yourself. That said, if you uncomment this I will find you and hurt you. Uncounterable and untracable burn damage with a 60-second cooldown is fun for exactly one person, and that's the person who is using it. to_chat(usr, "No target found in range.") - return var/mob/living/carbon/L = targets[1] diff --git a/code/game/dna/genes/goon_powers.dm b/code/game/dna/genes/goon_powers.dm index 8a9115b5f1a..b0e0a405265 100644 --- a/code/game/dna/genes/goon_powers.dm +++ b/code/game/dna/genes/goon_powers.dm @@ -152,14 +152,12 @@ /obj/effect/proc_holder/spell/targeted/cryokinesis/cast(list/targets) if(!targets.len) to_chat(usr, "No target found in range.") - return var/mob/living/carbon/C = targets[1] if(!iscarbon(C)) to_chat(usr, "\red This will only work on normal organic beings.") - return if (RESIST_COLD in C.mutations) @@ -306,7 +304,6 @@ var/mob/user = usr if(!targets.len) to_chat(user, "No target found in range.") - return var/atom/movable/the_item = targets[1] @@ -323,32 +320,27 @@ var/obj/item/organ/external/limb = H.get_organ(user.zone_sel.selecting) if(!istype(limb)) to_chat(user, "You can't eat this part of them!") - revert_cast() return 0 if(istype(limb,/obj/item/organ/external/head)) // Bullshit, but prevents being unable to clone someone. to_chat(user, "You try to put \the [limb] in your mouth, but [t_his] ears tickle your throat!") - revert_cast() return 0 if(istype(limb,/obj/item/organ/external/chest)) // Bullshit, but prevents being able to instagib someone. to_chat(user, "You try to put their [limb] in your mouth, but it's too big to fit!") - revert_cast() return 0 user.visible_message("[user] begins stuffing [the_item]'s [limb.name] into [m_his] gaping maw!") var/oldloc = H.loc if(!do_mob(user,H,EAT_MOB_DELAY)) to_chat(user, "You were interrupted before you could eat [the_item]!") - else if(!limb || !H) return if(H.loc != oldloc) to_chat(user, "\The [limb] moved away from your mouth!") - return user.visible_message("[user] [pick("chomps","bites")] off [the_item]'s [limb]!") playsound(user.loc, 'sound/items/eatfood.ogg', 50, 0) @@ -399,7 +391,6 @@ var/failure = 0 if (istype(usr.loc,/mob/) || usr.lying || usr.stunned || usr.buckled || usr.stat) to_chat(usr, "\red You can't jump right now!") - return if (istype(usr.loc,/turf/)) @@ -445,7 +436,6 @@ if (istype(usr.loc,/obj/)) var/obj/container = usr.loc to_chat(usr, "\red You leap and slam your head against the inside of [container]! Ouch!") - usr.AdjustParalysis(3) usr.AdjustWeakened(5) container.visible_message("\red [usr.loc] emits a loud thump and rattles a bit.") @@ -499,7 +489,6 @@ var/mob/living/M=targets[1] if(!ishuman(M)) to_chat(usr, "\red You can only change your appearance to that of another human.") - return if(!ishuman(usr)) return @@ -561,25 +550,20 @@ for(var/mob/living/carbon/M in targets) if(!iscarbon(M)) to_chat(usr, "\red You may only use this on other organic beings.") - return if (PSY_RESIST in M.mutations) to_chat(usr, "\red You can't see into [M.name]'s mind at all!") - return if (M.stat == 2) to_chat(usr, "\red [M.name] is dead and cannot have their mind read.") - return if (M.health < 0) to_chat(usr, "\red [M.name] is dying, and their thoughts are too scrambled to read.") - return to_chat(usr, "\blue Mind Reading of [M.name]:") - var/pain_condition = M.health // lower health means more pain var/list/randomthoughts = list("what to have for lunch","the future","the past","money", @@ -597,34 +581,25 @@ switch(pain_condition) if (81 to INFINITY) to_chat(usr, "\blue Condition: [M.name] feels good.") - if (61 to 80) to_chat(usr, "\blue Condition: [M.name] is suffering mild pain.") - if (41 to 60) to_chat(usr, "\blue Condition: [M.name] is suffering significant pain.") - if (21 to 40) to_chat(usr, "\blue Condition: [M.name] is suffering severe pain.") - else to_chat(usr, "\blue Condition: [M.name] is suffering excruciating pain.") - thoughts = "haunted by their own mortality" switch(M.a_intent) if (I_HELP) to_chat(usr, "\blue Mood: You sense benevolent thoughts from [M.name].") - if (I_DISARM) to_chat(usr, "\blue Mood: You sense cautious thoughts from [M.name].") - if (I_GRAB) to_chat(usr, "\blue Mood: You sense hostile thoughts from [M.name].") - if (I_HARM) to_chat(usr, "\blue Mood: You sense cruel thoughts from [M.name].") - for(var/mob/living/L in view(7,M)) if (L == M) continue @@ -633,7 +608,6 @@ else to_chat(usr, "\blue Mood: You sense strange thoughts from [M.name].") - if (istype(M,/mob/living/carbon/human)) var/numbers[0] var/mob/living/carbon/human/H = M @@ -642,16 +616,12 @@ numbers += H.mind.initial_account.remote_access_pin if(numbers.len>0) to_chat(usr, "\blue Numbers: You sense the number[numbers.len>1?"s":""] [english_list(numbers)] [numbers.len>1?"are":"is"] important to [M.name].") - to_chat(usr, "\blue Thoughts: [M.name] is currently [thoughts].") - if (EMPATH in M.mutations) to_chat(M, "\red You sense [usr.name] reading your mind.") - else if (prob(5) || M.mind.assigned_role=="Chaplain") to_chat(M, "\red You sense someone intruding upon your thoughts...") - return //////////////////////////////////////////////////////////////////////// @@ -699,11 +669,9 @@ if (M == usr) continue to_chat(M, "You are sent flying!") - M.Weaken(5) step_away(M, UT, 15) step_away(M, UT, 15) step_away(M, UT, 15) else to_chat(usr, "You were interrupted and couldn't fart! Rude!") - diff --git a/code/game/dna/genes/monkey.dm b/code/game/dna/genes/monkey.dm index d514215e347..48e7e3a580f 100644 --- a/code/game/dna/genes/monkey.dm +++ b/code/game/dna/genes/monkey.dm @@ -47,7 +47,6 @@ to_chat(H, "You are now a [H.species.name].") - return H /datum/dna/gene/monkey/deactivate(var/mob/living/carbon/human/H, var/connected, var/flags) @@ -91,5 +90,4 @@ to_chat(H, "You are now a [H.species.name].") - return H \ No newline at end of file diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm index c5c795ba606..7c28c8dbca6 100644 --- a/code/game/dna/genes/powers.dm +++ b/code/game/dna/genes/powers.dm @@ -164,7 +164,6 @@ M.status_flags |= CANSTUN | CANWEAKEN | CANPARALYSE | CANPUSH //temporary fix until the problem can be solved. to_chat(M, "You suddenly feel very weak.") - /datum/dna/gene/basic/xray name="X-Ray Vision" activation_messages=list("The walls suddenly disappear.") diff --git a/code/game/dna/genes/vg_powers.dm b/code/game/dna/genes/vg_powers.dm index b420de87c89..db4c97db449 100644 --- a/code/game/dna/genes/vg_powers.dm +++ b/code/game/dna/genes/vg_powers.dm @@ -50,7 +50,6 @@ Obviously, requires DNA2. M.update_body() to_chat(M, "\red You suddenly feel very weak.") - /obj/effect/proc_holder/spell/targeted/hulk name = "Hulk Out" panel = "Abilities" @@ -74,7 +73,6 @@ Obviously, requires DNA2. /obj/effect/proc_holder/spell/targeted/hulk/cast(list/targets) if (istype(usr.loc,/mob/)) to_chat(usr, "\red You can't hulk out right now!") - return var/mob/living/carbon/human/M=usr M.hulk_time = world.time + HULK_DURATION @@ -125,7 +123,6 @@ Obviously, requires DNA2. if (istype(usr.loc,/mob/)) to_chat(usr, "\red You can't change your appearance right now!") - return var/mob/living/carbon/human/M=usr @@ -232,7 +229,6 @@ Obviously, requires DNA2. if(!validtargets.len) to_chat(usr, "There are no valid targets!") - start_recharge() return @@ -298,7 +294,6 @@ Obviously, requires DNA2. if(!validtargets.len || validtargets.len == 1) to_chat(usr, "No valid targets with remote view were found!") - start_recharge() return @@ -321,7 +316,6 @@ Obviously, requires DNA2. if(istype(user.l_hand, /obj/item/tk_grab) || istype(user.r_hand, /obj/item/tk_grab/)) to_chat(user, "\red Your mind is too busy with that telekinetic grab.") - user.remoteview_target = null user.reset_view(0) return diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index f33b52d2aa1..42d82639129 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -24,22 +24,18 @@ /obj/item/weapon/antag_spawner/borg_tele/attack_self(mob/user as mob) if(used) to_chat(user, "[src] is out of power!") - return if(!(user.mind in ticker.mode.syndicates)) to_chat(user, "AUTHENTICATION FAILURE. ACCESS DENIED.") - return 0 if(checking) to_chat(user, "[src] is already checking for possible borgs.") - return borg_to_spawn = input("What type of borg would you like to teleport?", "Cyborg Type", type) as null|anything in possible_types if(!borg_to_spawn || checking || used) return checking = 1 to_chat(user, "The device is now checking for possible borgs.") - var/list/borg_candidates = pollCandidates("Do you want to play as a Syndicate [borg_to_spawn] borg?", ROLE_OPERATIVE, 1) if(borg_candidates.len > 0 && !used) checking = 0 @@ -50,7 +46,6 @@ else checking = 0 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.") - return /obj/item/weapon/antag_spawner/borg_tele/spawn_antag(var/client/C, var/turf/T, var/type = "") @@ -81,33 +76,27 @@ /obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user as mob) if(user.z == ZLEVEL_CENTCOMM)//this is to make sure the wizard does NOT summon a demon from the Den.. to_chat(user, "You should probably wait until you reach the station.") - return if(used) to_chat(user, "This bottle already has a broken seal.") - return used = 1 to_chat(user, "You break the seal on the bottle, calling upon the dire spirits of the underworld...") - var/list/candidates = pollCandidates("Do you want to play as a slaughter demon summoned by [user.real_name]?", ROLE_DEMON, 1, 100) if(candidates.len > 0) var/mob/C = pick(candidates) spawn_antag(C, get_turf(src.loc), "Slaughter Demon", user) to_chat(user, "You shatter the bottle, no turning back now!") - to_chat(user, "You sense a dark presence lurking just beyond the veil...") - playsound(user.loc, 'sound/effects/Glassbr1.ogg', 100, 1) qdel(src) else used = 0 to_chat(user, "The demons do not respond to your summon. Perhaps you should try again later.") - /obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(var/client/C, var/turf/T, var/type = "", mob/user as mob) var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new /mob/living/simple_animal/slaughter/(holder) @@ -128,6 +117,4 @@ S.mind.objectives += KillDaCrew S.mind.objectives += KillDaCrew to_chat(S, "Objective #[1]: [KillDaWiz.explanation_text]") - to_chat(S, "Objective #[2]: [KillDaCrew.explanation_text]") - diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index d5529aa801d..5e79f387aea 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -13,7 +13,6 @@ ..() to_chat(world, "Game mode is AutoTraitor. Traitors will be added to the round automagically as needed.") - /datum/game_mode/traitor/autotraitor/pre_setup() if(config.protect_roles_from_antagonist) @@ -135,9 +134,7 @@ traitors += newtraitor.mind to_chat(newtraitor, "\red ATTENTION: \black It is time to pay your debt to the Syndicate...") - to_chat(newtraitor, "You are now a traitor.") - newtraitor.mind.special_role = "traitor" var/datum/atom_hud/antag/tatorhud = huds[ANTAG_HUD_TRAITOR] tatorhud.join_hud(newtraitor) @@ -145,10 +142,8 @@ var/obj_count = 1 to_chat(newtraitor, "\blue Your current objectives:") - for(var/datum/objective/objective in newtraitor.mind.objectives) to_chat(newtraitor, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ //else //message_admins("No new traitor being added.") diff --git a/code/game/gamemodes/blob/blob.dm b/code/game/gamemodes/blob/blob.dm index 9170a480d7a..923e787c8af 100644 --- a/code/game/gamemodes/blob/blob.dm +++ b/code/game/gamemodes/blob/blob.dm @@ -72,7 +72,6 @@ var/list/blob_nodes = list() log_game("[blob.key] (ckey) has been selected as a Blob") greet_blob(blobmind) to_chat(blob, "You feel very tired and bloated! You don't have long before you burst!") - spawn(600) burst_blob(blobmind) return 1 @@ -91,31 +90,22 @@ var/list/blob_nodes = list() /datum/game_mode/blob/announce() to_chat(world, "The current game mode is - Blob!") - to_chat(world, "A dangerous alien organism is rapidly spreading throughout the station!") - to_chat(world, "You must kill it all while minimizing the damage to the station.") - /datum/game_mode/blob/proc/greet_blob(var/datum/mind/blob) to_chat(blob.current, "You are infected by the Blob!") - to_chat(blob.current, "Your body is ready to give spawn to a new blob core which will eat this station.") - to_chat(blob.current, "Find a good location to spawn the core and then take control and overwhelm the station!") - to_chat(blob.current, "When you have found a location, wait until you spawn; this will happen automatically and you cannot speed up the process.") - to_chat(blob.current, "If you go outside of the station level, or in space, then you will die; make sure your location has lots of ground to cover.") - return /datum/game_mode/blob/proc/show_message(var/message) for(var/datum/mind/blob in infected_crew) to_chat(blob.current, message) - /datum/game_mode/blob/proc/burst_blobs() for(var/datum/mind/blob in infected_crew) burst_blob(blob) @@ -132,7 +122,6 @@ var/list/blob_nodes = list() if(location.z != ZLEVEL_STATION || istype(location, /turf/space)) if(!warned) to_chat(C, "You feel ready to burst, but this isn't an appropriate place! You must return to the station!") - message_admins("[key_name_admin(C)] was in space when the blobs burst, and will die if he doesn't return to the station.") spawn(300) burst_blob(blob, 1) diff --git a/code/game/gamemodes/blob/blob_finish.dm b/code/game/gamemodes/blob/blob_finish.dm index 11b8e5c3978..0efb624d100 100644 --- a/code/game/gamemodes/blob/blob_finish.dm +++ b/code/game/gamemodes/blob/blob_finish.dm @@ -12,28 +12,21 @@ if(blobwincount <= blobs.len) feedback_set_details("round_end_result","win - blob took over") to_chat(world, "The blob has taken over the station!") - to_chat(world, "The entire station was eaten by the Blob") - log_game("Blob mode completed with a blob victory.") else if(station_was_nuked) feedback_set_details("round_end_result","halfwin - nuke") to_chat(world, "Partial Win: The station has been destroyed!") - to_chat(world, "Directive 7-12 has been successfully carried out preventing the Blob from spreading.") - log_game("Blob mode completed with a tie (station destroyed).") else if(!blob_cores.len) feedback_set_details("round_end_result","loss - blob eliminated") to_chat(world, "The staff has won!") - to_chat(world, "The alien organism has been eradicated from the station") - log_game("Blob mode completed with a crew victory.") to_chat(world, "Rebooting in 30s") - ..() return 1 @@ -46,5 +39,4 @@ for(var/datum/mind/blob in blob_mode.infected_crew) text += "
[blob.key] was [blob.name]" to_chat(world, text) - return 1 diff --git a/code/game/gamemodes/blob/blob_report.dm b/code/game/gamemodes/blob/blob_report.dm index d08c2d0528c..9b532258f6d 100644 --- a/code/game/gamemodes/blob/blob_report.dm +++ b/code/game/gamemodes/blob/blob_report.dm @@ -41,7 +41,6 @@ aiPlayer.set_zeroth_law(law) to_chat(aiPlayer, "Laws Updated: [law]") - for(var/obj/machinery/computer/communications/comm in world) comm.messagetitle.Add(interceptname) comm.messagetext.Add(intercepttext) diff --git a/code/game/gamemodes/blob/overmind.dm b/code/game/gamemodes/blob/overmind.dm index 25236b7f086..1238adebcf5 100644 --- a/code/game/gamemodes/blob/overmind.dm +++ b/code/game/gamemodes/blob/overmind.dm @@ -53,23 +53,14 @@ ..() sync_mind() to_chat(src, "You are the overmind!") - to_chat(src, "Your randomly chosen reagent is: [blob_reagent_datum.name]!") - to_chat(src, "You are the overmind and can control the blob! You can expand, which will attack people, and place new blob pieces such as...") - to_chat(src, "Normal Blob will expand your reach and allow you to upgrade into special blobs that perform certain functions.") - to_chat(src, "Shield Blob is a strong and expensive blob which can take more damage. It is fireproof and can block air, use this to protect yourself from station fires.") - to_chat(src, "Resource Blob is a blob which will collect more resources for you, try to build these earlier to get a strong income. It will benefit from being near your core or multiple nodes, by having an increased resource rate; put it alone and it won't create resources at all.") - to_chat(src, "Node Blob is a blob which will grow, like the core. Unlike the core it won't give you a small income but it can power resource and factory blobs to increase their rate.") - to_chat(src, "Factory Blob is a blob which will spawn blob spores which will attack nearby food. Putting this nearby nodes and your core will increase the spawn rate; put it alone and it will not spawn any spores.") - to_chat(src, "Shortcuts: CTRL Click = Expand Blob / Middle Mouse Click = Rally Spores / Alt Click = Create Shield") - update_health() /mob/camera/blob/proc/update_health() @@ -88,7 +79,6 @@ if (src.client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot send IC messages (muted).") - return if (src.client.handle_spam_prevention(message,MUTE_IC)) return diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index 826fea136a0..166f3f590ac 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -3,7 +3,6 @@ /mob/camera/blob/proc/can_buy(var/cost = 15) if(blob_points < cost) to_chat(src, "You cannot afford this!") - return 0 add_points(-cost) return 1 @@ -46,12 +45,10 @@ if(!B)//We are on a blob to_chat(src, "There is no blob here!") - return if(!istype(B, /obj/effect/blob/normal)) to_chat(src, "Unable to use this blob, find a normal one.") - return if(!can_buy(10)) @@ -79,17 +76,14 @@ if(!B)//We are on a blob to_chat(src, "There is no blob here!") - return if(!istype(B, /obj/effect/blob/normal)) to_chat(src, "Unable to use this blob, find a normal one.") - return for(var/obj/effect/blob/resource/blob in orange(4, T)) to_chat(src, "There is a resource blob nearby, move more than 4 tiles away from it!") - return if(!can_buy(40)) @@ -118,17 +112,14 @@ if(!B)//We are on a blob to_chat(src, "There is no blob here!") - return if(!istype(B, /obj/effect/blob/normal)) to_chat(src, "Unable to use this blob, find a normal one.") - return for(var/obj/effect/blob/node/blob in orange(5, T)) to_chat(src, "There is another node nearby, move more than 5 tiles away from it!") - return if(!can_buy(60)) @@ -156,17 +147,14 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) to_chat(src, "You must be on a blob!") - return if(!istype(B, /obj/effect/blob/normal)) to_chat(src, "Unable to use this blob, find a normal one.") - return for(var/obj/effect/blob/factory/blob in orange(7, T)) to_chat(src, "There is a factory blob nearby, move more than 7 tiles away from it!") - return if(!can_buy(60)) @@ -193,12 +181,10 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) to_chat(src, "You must be on a blob!") - return if(!istype(B, /obj/effect/blob/factory)) to_chat(src, "Unable to use this blob, find a factory blob.") - return if(!can_buy(20)) @@ -227,7 +213,6 @@ var/obj/effect/blob/node/B = locate(/obj/effect/blob/node) in T if(!B) to_chat(src, "You must be on a blob node!") - return if(!can_buy(80)) @@ -252,12 +237,10 @@ var/obj/effect/blob/B = locate(/obj/effect/blob) in T if(!B) to_chat(src, "You must be on a blob!") - return if(istype(B, /obj/effect/blob/core)) to_chat(src, "Unable to remove this blob.") - return qdel(B) @@ -281,13 +264,11 @@ var/obj/effect/blob/B = locate() in T if(B) to_chat(src, "There is a blob here!") - return var/obj/effect/blob/OB = locate() in circlerange(T, 1) if(!OB) to_chat(src, "There is no blob adjacent to you.") - return if(!can_buy(5)) @@ -319,7 +300,6 @@ to_chat(src, "You rally your spores.") - var/list/surrounding_turfs = block(locate(T.x - 1, T.y - 1, T.z), locate(T.x + 1, T.y + 1, T.z)) if(!surrounding_turfs.len) return @@ -338,12 +318,10 @@ if(!blob_nodes || !blob_nodes.len) to_chat(src, "A node is required to birth your offspring...") - return var/obj/effect/blob/node/N = locate(/obj/effect/blob) in blob_nodes if(!N) to_chat(src, "A node is required to birth your offspring...") - return if(!can_buy(100)) @@ -369,7 +347,6 @@ return else to_chat(usr, "You broadcast with your minions, [speak_text]") - for(var/mob/living/simple_animal/hostile/blob_minion in blob_mobs) blob_minion.say(speak_text) return @@ -389,17 +366,14 @@ if(!B)//We are on a blob to_chat(src, "There is no blob here!") - return if(!istype(B, /obj/effect/blob/normal)) to_chat(src, "Unable to use this blob, find a normal one.") - return for(var/obj/effect/blob/storage/blob in orange(3, T)) to_chat(src, "There is a storage blob nearby, move more than 4 tiles away from it!") - return if(!can_buy(40)) @@ -433,4 +407,3 @@ BLO.adjustcolors(blob_reagent_datum.color) to_chat(src, "Your reagent is now: [blob_reagent_datum.name]!") - diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index a1cd163dc6e..1de939c40e7 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -199,7 +199,6 @@ to_chat(user, "It looks like it's of a [get_chem_name()] kind.") - /obj/effect/blob/proc/get_chem_name() for(var/mob/camera/blob/B in mob_list) if(lowertext(B.blob_reagent_datum.color) == lowertext(src.color)) // Goddamit why we use strings for these diff --git a/code/game/gamemodes/borer/borer.dm b/code/game/gamemodes/borer/borer.dm index a61e86db924..f393db5811d 100644 --- a/code/game/gamemodes/borer/borer.dm +++ b/code/game/gamemodes/borer/borer.dm @@ -19,10 +19,8 @@ /datum/game_mode/borer/announce() to_chat(world, "The current game mode is - Cortical Borer!") - to_chat(world, "An unknown creature has infested the mind of a crew member. Find and destroy it by any means necessary.") - /datum/game_mode/borer/can_start() if(!..()) return 0 @@ -103,11 +101,9 @@ if (you_are) to_chat(borer.current, "\red You are a Cortical Borer!") - var/obj_count = 1 for(var/datum/objective/objective in borer.objectives) to_chat(borer.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -130,19 +126,15 @@ var/borerwin = 1 if((borer.current) && istype(borer.current,/mob/living/simple_animal/borer)) to_chat(world, "The borer was [borer.current.key].") - to_chat(world, "The last host was [borer.current:host.key].") - var/count = 1 for(var/datum/objective/objective in borer.objectives) if(objective.check_completion()) to_chat(world, "Objective #[count]: [objective.explanation_text] \green Success") - feedback_add_details("borer_objective","[objective.type]|SUCCESS") else to_chat(world, "Objective #[count]: [objective.explanation_text] \red Failed") - feedback_add_details("borer_objective","[objective.type]|FAIL") borerwin = 0 count++ @@ -152,11 +144,9 @@ if(borerwin) to_chat(world, "The borer was successful!") - feedback_add_details("borer_success","SUCCESS") else to_chat(world, "The borer has failed!") - feedback_add_details("borer_success","FAIL") return 1 diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm index a66e9d4a8d9..edb40c4ca04 100644 --- a/code/game/gamemodes/changeling/changeling.dm +++ b/code/game/gamemodes/changeling/changeling.dm @@ -39,10 +39,8 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/game_mode/changeling/announce() to_chat(world, "The current game mode is - Changeling!") - to_chat(world, "There are alien changelings on the station. Do not let the changelings succeed!") - /datum/game_mode/changeling/pre_setup() if(config.protect_roles_from_antagonist) @@ -137,21 +135,16 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/game_mode/proc/greet_changeling(var/datum/mind/changeling, var/you_are=1) if (you_are) to_chat(changeling.current, "\red You are a changeling!") - to_chat(changeling.current, "\red Use say \":g message\" to communicate with your fellow changelings. Remember: you get all of their absorbed DNA if you absorb them.") - to_chat(changeling.current, "You must complete the following tasks:") - if (changeling.current.mind) if (changeling.current.mind.assigned_role == "Clown") to_chat(changeling.current, "You have evolved beyond your clownish nature, allowing you to wield weapons without harming yourself.") - changeling.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in changeling.objectives) to_chat(changeling.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -165,12 +158,9 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" changeling_mind.special_role = null if(issilicon(changeling_mind)) to_chat(changeling_mind.current, "You have been robotized!") - to_chat(changeling_mind.current, "You must obey your silicon laws and master AI above all else. Your objectives will consider you to be dead.") - else to_chat(changeling_mind.current, "You lose your powers! You are no longer a changeling and are stuck in your current form!") - update_change_icons_removed(changeling_mind) /datum/game_mode/proc/update_change_icons_added(datum/mind/changeling) @@ -255,7 +245,6 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" to_chat(world, text) - return 1 /datum/changeling //stores changeling powers, changeling recharge thingie, changeling absorbed DNA and changeling ID (for changeling hivemind) @@ -312,43 +301,35 @@ var/list/possible_changeling_IDs = list("Alpha","Beta","Gamma","Delta","Epsilon" /datum/changeling/proc/can_absorb_dna(var/mob/living/carbon/user, var/mob/living/carbon/target) if(absorbed_dna[1] == user.dna)//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.") - return if(!target || !target.dna) to_chat(user, "This creature does not have any DNA.") - return var/mob/living/carbon/human/T = target if(!istype(T) || issmall(T)) to_chat(user, "[T] is not compatible with our biology.") - return if((NOCLONE || SKELETON || HUSK) in T.mutations) to_chat(user, "DNA of [target] is ruined beyond usability!") - return if(T.species.flags & NO_DNA) to_chat(user, "This creature does not have DNA!") - return if(T.species.flags & NO_SCAN) to_chat(user, "We do not know how to parse this creature's DNA!") - return if(T.species.flags & NO_BLOOD) to_chat(user, "We are not able to use the DNA of a creature without a circulatory system.") - return if(has_dna(target.dna)) to_chat(user, "We already have this DNA in storage!") - return 1 diff --git a/code/game/gamemodes/changeling/changeling_power.dm b/code/game/gamemodes/changeling/changeling_power.dm index c70a7550f8c..6d03a864692 100644 --- a/code/game/gamemodes/changeling/changeling_power.dm +++ b/code/game/gamemodes/changeling/changeling_power.dm @@ -54,28 +54,22 @@ return 0 if(req_human && (!ishuman(user) || issmall(user))) to_chat(user, "We cannot do that in this form!") - return 0 var/datum/changeling/c = user.mind.changeling if(c.chem_chargesWe require at least [chemical_cost] unit\s of chemicals to do that!") - return 0 if(c.absorbedcountWe require at least [req_dna] sample\s of compatible DNA.") - return 0 if(req_stat < user.stat) to_chat(user, "We are incapacitated.") - return 0 if((user.status_flags & FAKEDEATH) && name!="Regenerate") to_chat(user, "We are incapacitated.") - return 0 if(c.geneticdamage > max_genetic_damage) to_chat(user, "Our genomes are still reassembling. We need time to recover first.") - return 0 return 1 diff --git a/code/game/gamemodes/changeling/evolution_menu.dm b/code/game/gamemodes/changeling/evolution_menu.dm index 811cb95134e..58aa2a037ab 100644 --- a/code/game/gamemodes/changeling/evolution_menu.dm +++ b/code/game/gamemodes/changeling/evolution_menu.dm @@ -308,32 +308,26 @@ var/list/sting_paths if(thepower == null) to_chat(user, "This is awkward. Changeling power purchase failed, please report this bug to a coder!") - return if(absorbedcount < thepower.req_dna) to_chat(user, "We lack the energy to evolve this ability!") - return if(has_sting(thepower)) to_chat(user, "We have already evolved this ability!") - return if(thepower.dna_cost < 0) to_chat(user, "We cannot evolve this ability.") - return if(geneticpoints < thepower.dna_cost) to_chat(user, "We have reached our capacity for abilities.") - return if(user.status_flags & FAKEDEATH)//To avoid potential exploits by buying new powers while in stasis, which clears your verblist. to_chat(user, "We lack the energy to evolve new abilities right now.") - return geneticpoints -= thepower.dna_cost @@ -344,18 +338,15 @@ var/list/sting_paths /datum/changeling/proc/lingRespec(var/mob/user) if(!ishuman(user) || issmall(user)) to_chat(user, "We can't remove our evolutions in this form!") - return if(canrespec) to_chat(user, "We have removed our evolutions from this form, and are now ready to readapt.") - user.remove_changeling_powers(1) canrespec = 0 user.make_changeling() return 1 else to_chat(user, "You lack the power to readapt your evolutions!") - return 0 /mob/proc/make_changeling() diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index 87bbf648286..6dbcc48dc2f 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -13,17 +13,14 @@ var/datum/changeling/changeling = user.mind.changeling if(changeling.isabsorbing) to_chat(user, "We are already absorbing!") - return var/obj/item/weapon/grab/G = user.get_active_hand() if(!istype(G)) to_chat(user, "We must be grabbing a creature in our active hand to absorb them.") - return if(G.state <= GRAB_NECK) to_chat(user, "We must have a tighter grip to absorb this creature.") - return var/mob/living/carbon/target = G.affecting @@ -40,31 +37,24 @@ switch(stage) if(1) to_chat(user, "This creature is compatible. We must hold still...") - if(2) to_chat(user, "We extend a proboscis.") - user.visible_message("[user] extends a proboscis!") if(3) to_chat(user, "We stab [target] with the proboscis.") - user.visible_message("[user] stabs [target] with the proboscis!") to_chat(target, "You feel a sharp stabbing pain!") - target.take_overall_damage(40) feedback_add_details("changeling_powers","A[stage]") if(!do_mob(user, target, 150)) to_chat(user, "Our absorption of [target] has been interrupted!") - changeling.isabsorbing = 0 return to_chat(user, "We have absorbed [target]!") - user.visible_message("[user] sucks the fluids from [target]!") to_chat(target, "You have been absorbed by the changeling!") - if(!changeling.has_dna(target.dna)) changeling.absorb_dna(target, user) diff --git a/code/game/gamemodes/changeling/powers/digitalcamo.dm b/code/game/gamemodes/changeling/powers/digitalcamo.dm index cbca94df6f5..bc5879f67be 100644 --- a/code/game/gamemodes/changeling/powers/digitalcamo.dm +++ b/code/game/gamemodes/changeling/powers/digitalcamo.dm @@ -9,10 +9,8 @@ if(user.digitalcamo) to_chat(user, "We return to normal.") - else to_chat(user, "We distort our form to prevent AI-tracking.") - user.digitalcamo = !user.digitalcamo feedback_add_details("changeling_powers","CAM") diff --git a/code/game/gamemodes/changeling/powers/epinephrine.dm b/code/game/gamemodes/changeling/powers/epinephrine.dm index 64c879d9d8e..4e783f111cc 100644 --- a/code/game/gamemodes/changeling/powers/epinephrine.dm +++ b/code/game/gamemodes/changeling/powers/epinephrine.dm @@ -12,10 +12,8 @@ if(user.lying) to_chat(user, "We arise.") - else to_chat(user, "Adrenaline rushes through us.") - user.stat = 0 user.SetParalysis(0) user.SetStunned(0) diff --git a/code/game/gamemodes/changeling/powers/fakedeath.dm b/code/game/gamemodes/changeling/powers/fakedeath.dm index e3435ca1d61..03ea7d14894 100644 --- a/code/game/gamemodes/changeling/powers/fakedeath.dm +++ b/code/game/gamemodes/changeling/powers/fakedeath.dm @@ -13,7 +13,6 @@ to_chat(user, "We begin our stasis, preparing energy to arise once more.") - user.status_flags |= FAKEDEATH //play dead user.update_canmove() @@ -24,7 +23,6 @@ spawn(800) if(user && user.mind && user.mind.changeling && user.mind.changeling.purchasedpowers) to_chat(user, "We are ready to regenerate.") - user.mind.changeling.purchasedpowers += new /obj/effect/proc_holder/changeling/revive(null) feedback_add_details("changeling_powers","FD") diff --git a/code/game/gamemodes/changeling/powers/fleshmend.dm b/code/game/gamemodes/changeling/powers/fleshmend.dm index 27bdc9f5dcd..cd09cc8d764 100644 --- a/code/game/gamemodes/changeling/powers/fleshmend.dm +++ b/code/game/gamemodes/changeling/powers/fleshmend.dm @@ -9,7 +9,6 @@ //Starts healing you every second for 10 seconds. Can be used whilst unconscious. /obj/effect/proc_holder/changeling/fleshmend/sting_action(var/mob/living/user) to_chat(user, "We begin to heal rapidly.") - if(ishuman(user)) var/mob/living/carbon/human/H = user H.restore_blood() diff --git a/code/game/gamemodes/changeling/powers/headcrab.dm b/code/game/gamemodes/changeling/powers/headcrab.dm index aa8bbb1aca2..07ae44d9a9a 100644 --- a/code/game/gamemodes/changeling/powers/headcrab.dm +++ b/code/game/gamemodes/changeling/powers/headcrab.dm @@ -16,7 +16,6 @@ explosion(get_turf(user),0,0,2,0,silent=1) for(var/mob/living/carbon/human/H in range(2,user)) to_chat(H, "You are blinded by a shower of blood!") - H.Stun(1) H.eye_blurry = max(20, H.eye_blurry) var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) @@ -25,7 +24,6 @@ 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!") - S.Weaken(3) var/turf = get_turf(user) spawn(5) // So it's not killed in explosion @@ -37,7 +35,6 @@ 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!") - user.gib() feedback_add_details("changeling_powers","LR") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/hivemind.dm b/code/game/gamemodes/changeling/powers/hivemind.dm index b5f45348651..1032f84635f 100644 --- a/code/game/gamemodes/changeling/powers/hivemind.dm +++ b/code/game/gamemodes/changeling/powers/hivemind.dm @@ -11,7 +11,6 @@ var/datum/changeling/changeling=user.mind.changeling changeling.changeling_speak = 1 to_chat(user, "Use say \":g message\" to communicate with the other changelings.") - var/obj/effect/proc_holder/changeling/hivemind_upload/S1 = new if(!changeling.has_sting(S1)) changeling.purchasedpowers+=S1 @@ -38,7 +37,6 @@ var/list/datum/dna/hivemind_bank = list() if(names.len <= 0) to_chat(user, "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 names @@ -51,7 +49,6 @@ var/list/datum/dna/hivemind_bank = list() hivemind_bank += chosen_dna to_chat(user, "We channel the DNA of [chosen_name] to the air.") - feedback_add_details("changeling_powers","HU") return 1 @@ -67,7 +64,6 @@ var/list/datum/dna/hivemind_bank = list() var/datum/changeling/changeling = user.mind.changeling if(changeling.absorbed_dna[1] == user.dna)//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.") - return return 1 @@ -80,7 +76,6 @@ var/list/datum/dna/hivemind_bank = list() if(names.len <= 0) to_chat(user, "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 names @@ -93,6 +88,5 @@ var/list/datum/dna/hivemind_bank = list() changeling.absorbed_dna.Cut(1,2) changeling.store_dna(chosen_dna, user) to_chat(user, "We absorb the DNA of [S] from the air.") - feedback_add_details("changeling_powers","HD") return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/humanform.dm b/code/game/gamemodes/changeling/powers/humanform.dm index e0edffe1889..e587a7db0ab 100644 --- a/code/game/gamemodes/changeling/powers/humanform.dm +++ b/code/game/gamemodes/changeling/powers/humanform.dm @@ -24,7 +24,6 @@ if(!user) return 0 to_chat(user, "We transform our appearance.") - user.dna.SetSEState(MONKEYBLOCK,0) domutcheck(user, null) // Do a pre-mutcheck to cleanly switch from monkey form. user.dna = chosen_dna diff --git a/code/game/gamemodes/changeling/powers/lesserform.dm b/code/game/gamemodes/changeling/powers/lesserform.dm index f533cdd7696..ea22ba5800a 100644 --- a/code/game/gamemodes/changeling/powers/lesserform.dm +++ b/code/game/gamemodes/changeling/powers/lesserform.dm @@ -13,20 +13,17 @@ return 0 if(user.has_brain_worms()) to_chat(user, "We cannot perform this ability at the present time!") - return var/mob/living/carbon/human/H = user if(!istype(H) || !H.species.primitive_form) to_chat(src, "We cannot perform this ability in this form!") - return H.visible_message("[H] transforms!") changeling.geneticdamage = 30 to_chat(H, "Our genes cry out!") - var/list/implants = list() //Try to preserve implants. for(var/obj/item/weapon/implant/W in H) implants += W diff --git a/code/game/gamemodes/changeling/powers/mimic_voice.dm b/code/game/gamemodes/changeling/powers/mimic_voice.dm index 797c97f0ae0..21693a84c3a 100644 --- a/code/game/gamemodes/changeling/powers/mimic_voice.dm +++ b/code/game/gamemodes/changeling/powers/mimic_voice.dm @@ -14,7 +14,6 @@ changeling.mimicing = "" changeling.chem_recharge_slowdown -= 0.5 to_chat(user, "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) @@ -24,8 +23,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 stop us from regenerating chemicals while active.") - to_chat(user, "Use this power again to return to our original voice and reproduce chemicals again.") - feedback_add_details("changeling_powers","MV") diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index c69e66e5c6f..d11099627a6 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -36,7 +36,6 @@ /obj/effect/proc_holder/changeling/weapon/sting_action(var/mob/user) if(!user.drop_item()) to_chat(user, "The [user.get_active_hand()] is stuck to your hand, you cannot grow a [weapon_name_simple] over it!") - return var/obj/item/W = new weapon_type(user) user.put_in_hands(W) @@ -87,11 +86,9 @@ /obj/effect/proc_holder/changeling/suit/sting_action(var/mob/living/carbon/human/user) if(!user.unEquip(user.wear_suit)) to_chat(user, "\the [user.wear_suit] is stuck to your body, you cannot grow a [suit_name_simple] over it!") - return if(!user.unEquip(user.head)) to_chat(user, "\the [user.head] is stuck on your head, you cannot grow a [helmet_name_simple] over it!") - return user.unEquip(user.head) @@ -164,12 +161,10 @@ if(A.arePowerSystemsOn()) to_chat(user, "The airlock's motors resist our efforts to force it.") - return else if(A.locked) to_chat(user, "The airlock's bolts prevent it from being forced.") - return else diff --git a/code/game/gamemodes/changeling/powers/panacea.dm b/code/game/gamemodes/changeling/powers/panacea.dm index 45664d88318..dd15a313701 100644 --- a/code/game/gamemodes/changeling/powers/panacea.dm +++ b/code/game/gamemodes/changeling/powers/panacea.dm @@ -11,7 +11,6 @@ to_chat(user, "We cleanse impurities from our form.") - var/obj/item/organ/internal/body_egg/egg = user.get_int_organ(/obj/item/organ/internal/body_egg) if(egg) egg.remove(user) diff --git a/code/game/gamemodes/changeling/powers/revive.dm b/code/game/gamemodes/changeling/powers/revive.dm index 30dbea23d86..6150da027ca 100644 --- a/code/game/gamemodes/changeling/powers/revive.dm +++ b/code/game/gamemodes/changeling/powers/revive.dm @@ -63,7 +63,6 @@ H.updatehealth() to_chat(user, "We have regenerated.") - user.regenerate_icons() user.status_flags &= ~(FAKEDEATH) diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 006694aa394..c983b844321 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -18,10 +18,8 @@ else to_chat(M, sound('sound/effects/screech.ogg')) - if(issilicon(M)) to_chat(M, sound('sound/weapons/flash.ogg')) - M.Weaken(rand(5,10)) for(var/obj/machinery/light/L in range(4, user)) diff --git a/code/game/gamemodes/changeling/powers/strained_muscles.dm b/code/game/gamemodes/changeling/powers/strained_muscles.dm index 92807305c4c..92cf9ad7fdf 100644 --- a/code/game/gamemodes/changeling/powers/strained_muscles.dm +++ b/code/game/gamemodes/changeling/powers/strained_muscles.dm @@ -15,14 +15,11 @@ active = !active if(active) to_chat(user, "Our muscles tense and strengthen.") - else user.status_flags &= ~GOTTAGOFAST to_chat(user, "Our muscles relax.") - if(stacks >= 10) to_chat(user, "We collapse in exhaustion.") - user.Weaken(3) user.emote("gasp") @@ -31,7 +28,6 @@ if(user.stat || user.staminaloss >= 90) active = 0 //Let's use something exact instead of !active where we can. to_chat(user, "Our muscles relax without the energy to strengthen them.") - user.status_flags &= ~GOTTAGOFAST user.Weaken(2) user.emote("gasp") @@ -44,7 +40,6 @@ if(stacks == 11) //Warning message that the stacks are getting too high to_chat(user, "Our legs are really starting to hurt...") - sleep(40) while(!active) //Damage stacks decrease fairly rapidly while not in sanic mode diff --git a/code/game/gamemodes/changeling/powers/swap_form.dm b/code/game/gamemodes/changeling/powers/swap_form.dm index bcc12d004f7..ad8b9381dff 100644 --- a/code/game/gamemodes/changeling/powers/swap_form.dm +++ b/code/game/gamemodes/changeling/powers/swap_form.dm @@ -12,16 +12,13 @@ var/obj/item/weapon/grab/G = user.get_active_hand() if(!istype(G) || (G.state < GRAB_AGGRESSIVE)) to_chat(user, "We must have an aggressive grab on creature in our active hand to do this!") - return var/mob/living/carbon/human/target = G.affecting if((NOCLONE || SKELETON || HUSK) in target.mutations) to_chat(user, "DNA of [target] is ruined beyond usability!") - return if(!istype(target) || issmall(target) || target.species.flags & NO_DNA || target.species.flags & NO_SCAN || target.species.flags & NO_BLOOD) to_chat(user, "[target] is not compatible with this ability.") - return return 1 @@ -32,18 +29,15 @@ var/datum/changeling/changeling = user.mind.changeling to_chat(user, "We tighen our grip. We must hold still....") - target.do_jitter_animation(500) user.do_jitter_animation(500) if(!do_mob(user,target,20)) to_chat(user, "The body swap has been interrupted!") - return to_chat(target, "[user] tightens their grip as a painful sensation invades your body.") - if(!changeling.has_dna(target.dna)) changeling.absorb_dna(target, user) changeling.protected_dna -= user.dna @@ -59,4 +53,3 @@ user.remove_language("Changeling") target.add_language("Changeling") to_chat(target, "Our genes cry out as we swap our [user] form for [target].") - diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index a274d1f99d1..6f93554766e 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -15,14 +15,12 @@ /obj/effect/proc_holder/changeling/sting/proc/set_sting(var/mob/user) to_chat(user, "We prepare our sting, use alt+click or middle mouse button on target to sting them.") - user.mind.changeling.chosen_sting = src user.hud_used.lingstingdisplay.icon_state = sting_icon user.hud_used.lingstingdisplay.invisibility = 0 /obj/effect/proc_holder/changeling/sting/proc/unset_sting(var/mob/user) to_chat(user, "We retract our sting, we can't sting anyone for now.") - user.mind.changeling.chosen_sting = null user.hud_used.lingstingdisplay.icon_state = null user.hud_used.lingstingdisplay.invisibility = 101 @@ -36,14 +34,12 @@ return if(!user.mind.changeling.chosen_sting) to_chat(user, "We haven't prepared our sting yet!") - if(!iscarbon(target)) return if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.isSynthetic()) to_chat(user, "This won't work on synthetics.") - return if(!isturf(user.loc)) return @@ -59,10 +55,8 @@ if(!target) return to_chat(user, "We stealthily sting [target.name].") - if(target.mind && target.mind.changeling) to_chat(target, "You feel a tiny prick.") - add_logs(target, user, "unsuccessfully stung") return 1 @@ -92,17 +86,14 @@ return if((HUSK in target.mutations) || (!ishuman(target))) to_chat(user, "Our sting appears ineffective against its DNA.") - return 0 if(ishuman(target)) var/mob/living/carbon/human/H = target if(H.species.flags & NO_SCAN) //Prevents transforming slimes and killing them instantly to_chat(user, "This won't work on a creature with abnormal genetic material.") - return 0 if(H.species.flags & NO_BLOOD) to_chat(user, "This won't work on a creature without a circulatory system.") - return 0 return 1 @@ -112,7 +103,6 @@ if(issmall(target)) to_chat(user, "Our genes cry out as we sting [target.name]!") - if(iscarbon(target) && (target.status_flags & CANWEAKEN)) var/mob/living/carbon/C = target C.do_jitter_animation(500) @@ -174,7 +164,6 @@ obj/effect/proc_holder/changeling/sting/blind /obj/effect/proc_holder/changeling/sting/blind/sting_action(var/mob/user, var/mob/target) add_logs(target, user, "stung", object="blind sting") to_chat(target, "Your eyes burn horrifically!") - target.disabilities |= NEARSIGHTED target.eye_blind = 20 target.eye_blurry = 40 diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 611888d3722..06a296fcf81 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -11,11 +11,9 @@ /datum/game_mode/traitor/changeling/announce() to_chat(world, "The current game mode is - Traitor+Changeling!") - to_chat(world, "There is an alien creature on the station along with some syndicate operatives out for their own gain! Do not let the changeling and the traitors succeed!") - /datum/game_mode/traitor/changeling/pre_setup() if(config.protect_roles_from_antagonist) restricted_jobs += protected_jobs diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index d700a29cf27..daf93b73799 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -55,11 +55,9 @@ /datum/game_mode/cult/announce() to_chat(world, "The current game mode is - Cult!") - to_chat(world, "Some crewmembers are attempting to start a cult!
\nCultists - complete your objectives. Convert crewmembers to your cause by using the convert rune. Remember - there is no you, there is only the cult.
\nPersonnel - Do not let the cult succeed in its mission. Brainwashing them with the chaplain's bible reverts them to whatever CentComm-allowed faith they had.") - /datum/game_mode/cult/pre_setup() if(prob(50)) objectives += "survive" @@ -101,7 +99,6 @@ grant_runeword(cult_mind.current) update_cult_icons_added(cult_mind) to_chat(cult_mind.current, "\blue You are a member of the cult!") - memorize_cult_objectives(cult_mind) ..() @@ -121,10 +118,8 @@ if("eldergod") explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it." to_chat(cult_mind.current, "Objective #[obj_count]: [explanation]") - cult_mind.memory += "Objective #[obj_count]: [explanation]
" to_chat(cult_mind.current, "The convert rune is join blood self") - cult_mind.memory += "The convert rune is join blood self
" @@ -135,7 +130,6 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") - mob.mutations.Remove(CLUMSY) add_cult_viewpoint(mob) // give them a viewpoint @@ -151,10 +145,8 @@ var/where = mob.equip_in_one_of_slots(T, slots) if (!where) to_chat(mob, "Unfortunately, you weren't able to get a talisman. This is very bad and you should adminhelp immediately.") - else to_chat(mob, "You have a talisman in your [where], one that will help you start the cult on this station. Use it well and remember - there are others.") - mob.update_icons() return 1 @@ -174,7 +166,6 @@ word=pick(allwords) var/wordexp = "[cultwords[word]] is [word]..." to_chat(cult_mob, "\red [pick("You remember something from the dark teachings of your master","You hear a dark voice on the wind","Black blood oozes into your vision and forms into symbols","You have a vision of a [pick("crow","raven","vulture","parrot")] it squawks","You catch a brief glimmer of the otherside")]... [wordexp]") - cult_mob.mind.store_memory("You remember that [wordexp]", 0, 0) @@ -209,7 +200,6 @@ if(cult_mind in cult) cult -= cult_mind to_chat(cult_mind.current, "\red An unfamiliar white light flashes through your mind, cleansing the taint of the dark-one and the memories of your time as his servant with it.") - cult_mind.memory = "" cult_mind.special_role = null // remove the cult viewpoint object @@ -222,7 +212,6 @@ to_chat(M, "[cult_mind.current] looks like they just reverted to their old faith!") - /datum/game_mode/proc/add_cult_icon_to_spirit(mob/spirit/currentSpirit) if(!istype(currentSpirit)) return FALSE @@ -307,13 +296,11 @@ feedback_set_details("round_end_result","win - cult win") feedback_set("round_end_result",acolytes_survived) to_chat(world, "\red The cult wins! It has succeeded in serving its dark masters!") - else feedback_set_details("round_end_result","loss - staff stopped the cult") feedback_set("round_end_result",acolytes_survived) to_chat(world, "\red The staff managed to stop the cult!") - var/text = "Cultists escaped: [acolytes_survived]" if(objectives.len) @@ -349,7 +336,6 @@ text += "
Objective #[obj_count]: [explanation]" to_chat(world, text) - ..() return 1 @@ -372,4 +358,3 @@ text += ")" to_chat(world, text) - diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index c7f71cdd5c7..60803346b26 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -16,7 +16,6 @@ else user.Paralyse(5) to_chat(user, "\red An unexplicable force powerfully repels the sword from [target]!") - var/organ = ((user.hand ? "l_":"r_") + "arm") var/obj/item/organ/external/affecting = user.get_organ(organ) if(affecting.take_damage(rand(force/2, force))) //random amount of damage between half of the blade's force and the full force of the blade. @@ -26,7 +25,6 @@ /obj/item/weapon/melee/cultblade/pickup(mob/living/user as mob) if(!iscultist(user)) to_chat(user, "\red An overwhelming feeling of dread comes over you as you pick up the cultist's sword. It would be wise to be rid of this blade quickly.") - user.Dizzy(120) diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 8968220d0f2..2e7dd25452a 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -14,7 +14,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for (var/word in engwords) to_chat(usr, "[cultwords[word]] is [word]") - /proc/runerandom() //randomizes word meaning var/list/runewords=list("ire","ego","nahlizet","certum","veri","jatkaa","mgar","balaq", "karazet", "geeri") ///"orkan" and "allaq" removed. for (var/word in engwords) @@ -83,25 +82,20 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", ..(user) if(!iscultist(user) && !isSpirit(user)) to_chat(user, "A strange collection of symbols drawn in blood.") - return if(!desc) to_chat(user, "A spell circle drawn in blood. It reads: [word1] [word2] [word3].") - else to_chat(user, "Explosive Runes inscription in blood. It reads: [desc].") - /obj/effect/rune/attackby(I as obj, user as mob, params) if(istype(I, /obj/item/weapon/tome) && iscultist(user)) to_chat(user, "You retrace your steps, carefully undoing the lines of the rune.") - qdel(src) return else if(istype(I, /obj/item/weapon/nullrod)) to_chat(user, "\blue You disrupt the vile magic with the deadening field of \the [I]!") - qdel(src) return return @@ -145,15 +139,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", /obj/effect/rune/attack_hand(mob/living/user as mob) if(!iscultist(user)) to_chat(user, "You can't mouth the arcane scratchings without fumbling over them.") - return if(istype(user.wear_mask, /obj/item/clothing/mask/muzzle)) to_chat(user, "You are unable to speak the words of the rune.") - return if(user.silent) // checking if we've been muted somehow to_chat(user, "You are unable to speak at all! You cannot say the words of the rune.") - if(!word1 || !word2 || !word3 || prob(user.getBrainLoss())) return fizzle() @@ -318,7 +309,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // proc/edit_notes() FUCK IT. Cant get it to work properly. - K0000 // to_chat(world, "its been called! [usr]") - // notedat = {" //
Word translation notes
// [words[1]] is [words[words[1]]] Clear
@@ -333,7 +323,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", // [words[10]] is [words[words[10]]] Clear
// "} // to_chat(usr, "whatev") - // usr << browse(null, "window=tank") attack(mob/living/M as mob, mob/living/user as mob) @@ -359,7 +348,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", if(iscultist(M)) if(M.reagents && M.reagents.has_reagent("holywater")) //allows cultists to be rescued from the clutches of ordained religion to_chat(user, "You remove the taint from [M].") - var/holy2unholy = M.reagents.get_reagent_amount("holywater") M.reagents.del_reagent("holywater") M.reagents.add_reagent("unholywater",holy2unholy) @@ -371,7 +359,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", to_chat(M, "\red You feel searing heat inside!") - attack_self(mob/living/user as mob) usr = user if(!usr.canmove || usr.stat || usr.restrained()) @@ -385,7 +372,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", C++ if (!istype(user.loc,/turf)) to_chat(user, "\red You do not have enough space to write a proper rune.") - return @@ -473,7 +459,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return if (chosen_rune == "none") to_chat(user, "\red You decide against scribing a rune, perhaps you should take this time to study your notes.") - return if (chosen_rune == "teleport") dictionary[chosen_rune] += input ("Choose a destination word") in english @@ -486,7 +471,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", for (var/mob/V in viewers(src)) V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2) to_chat(user, "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world.") - user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage if(do_after(user, 50, target = user)) if(usr.get_active_hand() != src) @@ -494,7 +478,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", var/mob/living/carbon/human/H = user var/obj/effect/rune/R = new /obj/effect/rune(user.loc) to_chat(user, "\red You finish drawing the arcane markings of the Geometer.") - var/list/required = dictionary[chosen_rune] R.word1 = english[required[1]] R.word2 = english[required[2]] @@ -506,7 +489,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", return else to_chat(user, "The book seems full of illegible scribbles. Is this a joke?") - return attackby(obj/item/weapon/tome/T as obj, mob/living/user as mob, params) @@ -524,15 +506,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", to_chat(user, "You copy the translation notes from your tome.") - examine(mob/user) if(!iscultist(user)) to_chat(user, "An old, dusty tome with frayed edges and a sinister looking cover.") - else to_chat(user, "The scriptures of Nar-Sie, The One Who Sees, The Geometer of Blood. Contains the details of every ritual his followers could think of. Most of these are useless, though.") - /obj/item/weapon/tome/imbued //admin tome, spawns working runes without waiting w_class = 2.0 var/cultistsonly = 1 @@ -545,7 +524,6 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology", var/r if (!istype(user.loc,/turf)) to_chat(user, "\red You do not have enough space to write a proper rune.") - var/list/runes = list("teleport", "itemport", "tome", "armor", "convert", "tear in reality", "emp", "drain", "seer", "raise", "obscure", "reveal", "astral journey", "manifest", "imbue talisman", "sacrifice", "wall", "freedom", "cultsummon", "deafen", "blind", "bloodboil", "communicate", "stun") r = input("Choose a rune to scribe", "Rune Scribing") in runes //not cancellable. var/obj/effect/rune/R = new /obj/effect/rune diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index f6b2bb4ef3d..c409449dbe4 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -20,7 +20,6 @@ var/list/sacrificed = list() allrunesloc[index] = R.loc if(index >= 5) to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") - if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -59,7 +58,6 @@ var/list/sacrificed = list() runecount++ if(runecount >= 2) to_chat(user, "\red You feel pain, as rune disappears in reality shift caused by too much wear of space-time fabric") - if (istype(user, /mob/living)) user.take_overall_damage(5, 0) qdel(src) @@ -117,15 +115,11 @@ var/list/sacrificed = list() ticker.mode.add_cultist(M.mind) M.mind.special_role = "Cultist" to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(M, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") - return 1 else to_chat(M, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(M, "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs.") - return 0 return fizzle() @@ -178,7 +172,6 @@ var/list/sacrificed = list() cult_log("[key_name_admin(usr)] has drained blood from [key_name_admin(D)]") var/bdrain = rand(1,25) to_chat(D, "\red You feel weakened.") - D.take_overall_damage(bdrain, 0) drain += bdrain if(!drain) @@ -220,18 +213,15 @@ var/list/sacrificed = list() if(usr.seer==1) usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium viortia.") to_chat(usr, "\red The world beyond fades from your vision.") - usr.see_invisible = SEE_INVISIBLE_LIVING usr.seer = 0 else if(usr.see_invisible!=SEE_INVISIBLE_LIVING) to_chat(usr, "\red The world beyond flashes your eyes but disappears quickly, as if something is disrupting your vision.") - usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 0 else usr.say("Rash'tla sektath mal[pick("'","`")]zua. Zasan therium vivira. Itonis al'ra matum!") to_chat(usr, "\red The world beyond opens to your eyes.") - usr.see_invisible = SEE_INVISIBLE_OBSERVER usr.seer = 1 return @@ -256,7 +246,6 @@ var/list/sacrificed = list() if(!corpse_to_raise) if(is_sacrifice_target) to_chat(usr, "\red The Geometer of blood wants this mortal for himself.") - return fizzle() @@ -275,10 +264,8 @@ var/list/sacrificed = list() if(!body_to_sacrifice) if (is_sacrifice_target) to_chat(usr, "\red The Geometer of blood wants that corpse for himself.") - else to_chat(usr, "\red The sacrifical corpse is not dead. You must free it from this world of illusions before it may be used.") - return fizzle() var/mob/dead/observer/ghost @@ -290,7 +277,6 @@ var/list/sacrificed = list() if(!ghost) to_chat(usr, "\red You require a restless spirit which clings to this world. Beckon their prescence with the sacred chants of Nar-Sie.") - return fizzle() corpse_to_raise.revive() @@ -312,9 +298,7 @@ var/list/sacrificed = list() // ticker.mode.cult |= corpse_to_raise.mind to_chat(corpse_to_raise, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(corpse_to_raise, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") - return @@ -340,7 +324,6 @@ var/list/sacrificed = list() else usr.whisper("Kla[pick("'","`")]atu barada nikt'o!") to_chat(usr, "\red Your talisman turns into gray dust, veiling the surrounding runes.") - for (var/mob/V in orange(1,src)) if(V!=usr) V.show_message("\red Dust emanates from [usr]'s hands for a moment.", 3) @@ -419,10 +402,8 @@ var/list/sacrificed = list() D.mind.special_role = "Cultist" to_chat(D, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root.") - to_chat(D, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back.") - var/mob/living/user = usr while(this_rune && user && user.stat==CONSCIOUS && user.client && user.loc==this_rune.loc) user.take_organ_damage(1, 0) @@ -452,7 +433,6 @@ var/list/sacrificed = list() if (!newtalisman) if (unsuitable_newtalisman) to_chat(usr, "\red The blank is tainted. It is unsuitable.") - return fizzle() var/obj/effect/rune/imbued_from @@ -561,7 +541,6 @@ var/list/sacrificed = list() return 0 to_chat(F, "[time2text(world.timeofday,"hh:mm")] \ref[usr] ([usr.x],[usr.y],[usr.z]) || [usr] communicates: [input]
") - var/obj/cult_viewpoint/vp = getCultViewpoint(usr) if (!vp) return 0 @@ -584,12 +563,10 @@ var/list/sacrificed = list() if (H.current) to_chat(H.current, "[cultName]: [input]") - for(var/mob/spirit/spirit in spirits) to_chat(spirit, "[displayName]: [input]") - for(var/mob/dead/observer/G in player_list) G.show_message("[displayName] ([cultName]) ([ghost_follow_link(usr, ghost=G)]): [input]") @@ -629,22 +606,17 @@ var/list/sacrificed = list() else H.gib() to_chat(usr, "\red The Geometer of Blood accepts this sacrifice, your objective is now complete.") - else to_chat(usr, "\red Your target's earthly bonds are too strong. You need more cultists to succeed in this ritual.") - else if(cultsinrange.len >= 3) if(H.stat !=2) if(prob(80)) to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, this soul was not enough to gain His favor.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -652,13 +624,10 @@ var/list/sacrificed = list() else if(prob(40)) to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -666,17 +635,13 @@ var/list/sacrificed = list() else if(H.stat !=2) to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") - else if(prob(40)) to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -686,13 +651,10 @@ var/list/sacrificed = list() if(H.stat !=2) if(prob(80)) to_chat(usr, "\red The Geometer of Blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, this soul was not enough to gain His favor.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -700,13 +662,10 @@ var/list/sacrificed = list() else if(prob(40)) to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -714,17 +673,13 @@ var/list/sacrificed = list() else if(H.stat !=2) to_chat(usr, "\red The victim is still alive, you will need more cultists chanting for the sacrifice to succeed.") - else if(prob(40)) to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - ticker.mode:grant_runeword(usr) else to_chat(usr, "\red The Geometer of blood accepts this sacrifice.") - to_chat(usr, "\red However, a mere dead body is not enough to satisfy Him.") - if(isrobot(H)) H.dust()//To prevent the MMI from remaining else @@ -756,7 +711,6 @@ var/list/sacrificed = list() if(S) if(istype(W,/obj/item/weapon/storage/bible)) to_chat(usr, "\red Arcane markings suddenly glow from underneath a thin layer of dust!") - return if(istype(W,/obj/effect/rune)) usr.say("Nikt[pick("'","`")]o barada kla'atu!") @@ -767,7 +721,6 @@ var/list/sacrificed = list() if(istype(W,/obj/item/weapon/paper/talisman)) usr.whisper("Nikt[pick("'","`")]o barada kla'atu!") to_chat(usr, "\red Your talisman turns into red dust, revealing the surrounding runes.") - for (var/mob/V in orange(1,usr.loc)) if(V!=usr) V.show_message("\red Red dust emanates from [usr]'s hands for a moment.", 3) @@ -788,10 +741,8 @@ var/list/sacrificed = list() user.take_organ_damage(2, 0) if(src.density) to_chat(usr, "\red Your blood flows into the rune, and you feel that the very space over the rune thickens.") - else to_chat(usr, "\red Your blood flows into the rune, and you feel as the rune releases its grasp on space.") - return /////////////////////////////////////////EIGHTTEENTH RUNE @@ -820,7 +771,6 @@ var/list/sacrificed = list() (istype(cultist.loc, /obj/machinery/dna_scannernew)&&cultist.loc:locked) \ )) to_chat(user, "\red The [cultist] is already free.") - return cultist.buckled = null if (cultist.handcuffed) @@ -865,7 +815,6 @@ var/list/sacrificed = list() return if(cultist.buckled || cultist.handcuffed || (!isturf(cultist.loc) && !istype(cultist.loc, /obj/structure/closet))) to_chat(user, "\red You cannot summon the [cultist], for his shackles of blood are strong") - return fizzle() cultist.loc = src.loc cultist.lying = 1 @@ -899,7 +848,6 @@ var/list/sacrificed = list() if(affected) usr.say("Sti[pick("'","`")] kaliedir!") to_chat(usr, "\red The world becomes quiet as the deafening rune dissipates into fine dust.") - qdel(src) else return fizzle() @@ -918,7 +866,6 @@ var/list/sacrificed = list() if(affected) usr.whisper("Sti[pick("'","`")] kaliedir!") to_chat(usr, "\red Your talisman turns into gray dust, deafening everyone around.") - for (var/mob/V in orange(1,src)) if(!(iscultist(V))) V.show_message("\red Dust flows from [usr]'s hands for a moment, and the world suddenly becomes quiet..", 3) @@ -944,7 +891,6 @@ var/list/sacrificed = list() if(affected) usr.say("Sti[pick("'","`")] kaliesin!") to_chat(usr, "\red The rune flashes, blinding those who not follow the Nar-Sie, and dissipates into fine dust.") - qdel(src) else return fizzle() @@ -964,7 +910,6 @@ var/list/sacrificed = list() if(affected) usr.whisper("Sti[pick("'","`")] kaliesin!") to_chat(usr, "\red Your talisman turns into gray dust, blinding those who not follow the Nar-Sie.") - return @@ -990,7 +935,6 @@ var/list/sacrificed = list() cult_log(": Blood Boil damaged [key_name_admin(M)].") M.take_overall_damage(51,51) to_chat(M, "\red Your blood boils!") - if(prob(5)) spawn(5) M.gib() @@ -1020,10 +964,8 @@ var/list/sacrificed = list() M.take_overall_damage(0,15) if (R.invisibility>M.see_invisible) to_chat(M, "\red Aargh it burns!") - else to_chat(M, "\red Rune suddenly ignites, burning you!") - var/turf/T = get_turf(R) T.hotspot_expose(700,125) for(var/obj/effect/decal/cleanable/blood/B in world) @@ -1031,7 +973,6 @@ var/list/sacrificed = list() for(var/mob/living/M in orange(1,B)) M.take_overall_damage(0,5) to_chat(M, "\red Blood suddenly ignites, burning you!") - var/turf/T = get_turf(B) T.hotspot_expose(700,125) qdel(B) diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index ba5758516fc..fe1ac8757a9 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -29,7 +29,6 @@ call(/obj/effect/rune/proc/blind)() if("runestun") to_chat(user, "\red To use this talisman, attack your target directly.") - return if("supply") supply() @@ -40,7 +39,6 @@ return else to_chat(user, "You see strange symbols on the paper. Are they supposed to mean something?") - return @@ -102,10 +100,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -127,10 +123,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -150,10 +144,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -173,10 +165,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -196,10 +186,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -219,10 +207,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() @@ -242,10 +228,8 @@ var/where = M.equip_in_one_of_slots(T, slots) if (!where) to_chat(M, "You need a space in your backpack, pocket or hand for the new paper.") - else to_chat(M, "The [href_list["rune"]] talisman in your [where]") - M.update_icons() src.uses-- supply() diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index fc4fd27df54..3f81eb18586 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -28,7 +28,6 @@ for(var/mob/M in player_list) to_chat(M, sound('sound/AI/aliens.ogg')) - /proc/lightsout(isEvent = 0, lightsoutAmount = 1,lightsoutRange = 25) //leave lightsoutAmount as 0 to break ALL lights if(isEvent) command_announcement.Announce("An Electrical storm has been detected in your area, please repair potential electronic overloads.","Electrical Storm Alert") diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm index d547a23809c..e3e16efc4e6 100644 --- a/code/game/gamemodes/extended/extended.dm +++ b/code/game/gamemodes/extended/extended.dm @@ -8,10 +8,8 @@ /datum/game_mode/announce() to_chat(world, "The current game mode is - Extended Role-Playing!") - to_chat(world, "Just have fun and role-play!") - /datum/game_mode/extended/pre_setup() return 1 diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 655dfcc69b7..fc69cd8a79e 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -41,7 +41,6 @@ to_chat(world, "Notice: [src] did not define announce()") - ///can_start() ///Checks to see if the game can be setup and ran with the current number of players or whatnot. /datum/game_mode/proc/can_start() @@ -397,7 +396,6 @@ proc/display_roundstart_logout_report() to_chat(M, msg) - proc/get_nt_opposed() var/list/dudes = list() for(var/mob/living/carbon/human/man in player_list) @@ -424,10 +422,8 @@ proc/get_nt_opposed() var/obj_count = 1 to_chat(player.current, "\blue Your current objectives:") - for(var/datum/objective/objective in player.objectives) to_chat(player.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ /proc/get_roletext(var/role) @@ -446,11 +442,9 @@ proc/get_nt_opposed() if(candidates.len) theghost = pick(candidates) to_chat(M, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!") - message_admins("[key_name_admin(theghost)] has taken control of ([key_name_admin(M)]) to replace a jobbanned player.") M.ghostize() M.key = theghost.key else message_admins("[M] ([M.key] has been converted into [role_type] with an active antagonist jobban for said role since no ghost has volunteered to take their place.") to_chat(M, "You have been converted into [role_type] with an active jobban. Any further violations of the rules on your part are likely to result in a permanent ban.") - diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index eda5ee58b98..83d21e8cfad 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -44,9 +44,7 @@ var/round_start_time = 0 do pregame_timeleft = 180 to_chat(world, "Welcome to the pre-game lobby!") - to_chat(world, "Please, setup your character and select ready. Game will start in [pregame_timeleft] seconds") - while(current_state == GAME_STATE_PREGAME) for(var/i=0, i<10, i++) sleep(1) @@ -79,7 +77,6 @@ var/round_start_time = 0 if (runnable_modes.len==0) current_state = GAME_STATE_PREGAME to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") - return 0 if(secret_force_mode != "secret") var/datum/game_mode/M = config.pick_mode(secret_force_mode) @@ -95,7 +92,6 @@ var/round_start_time = 0 src.mode = config.pick_mode(master_mode) if (!src.mode.can_start()) to_chat(world, "Unable to start [mode.name]. Not enough players, [mode.required_players] players needed. Reverting to pre-game lobby.") - mode = null current_state = GAME_STATE_PREGAME job_master.ResetOccupations() @@ -110,7 +106,6 @@ var/round_start_time = 0 qdel(mode) current_state = GAME_STATE_PREGAME to_chat(world, "Error setting up [master_mode]. Reverting to pre-game lobby.") - job_master.ResetOccupations() return 0 @@ -120,9 +115,7 @@ var/round_start_time = 0 modes+=M.name modes = sortList(modes) to_chat(world, "The current game mode is - Secret!") - to_chat(world, "Possibilities: [english_list(modes)]") - else src.mode.announce() @@ -159,18 +152,14 @@ var/round_start_time = 0 qdel(R) to_chat(world, "Enjoy the game!") - to_chat(world, sound('sound/AI/welcome.ogg'))// Skie - if(holiday_master.holidays) to_chat(world, "and...") - for(var/holidayname in holiday_master.holidays) var/datum/holiday/holiday = holiday_master.holidays[holidayname] to_chat(world, "

[holiday.greet()]

") - spawn(0) // Forking dynamic room selection var/list/area/dynamic/source/available_source_candidates = subtypesof(/area/dynamic/source) var/list/area/dynamic/destination/available_destination_candidates = subtypesof(/area/dynamic/destination) @@ -301,14 +290,12 @@ var/round_start_time = 0 flick("intro_nuke",cinematic) sleep(35) to_chat(world, sound('sound/effects/explosionfar.ogg')) - flick("station_intact_fade_red",cinematic) cinematic.icon_state = "summary_nukefail" else flick("intro_nuke",cinematic) sleep(35) to_chat(world, sound('sound/effects/explosionfar.ogg')) - //flick("end",cinematic) @@ -317,7 +304,6 @@ var/round_start_time = 0 to_chat(world, sound('sound/effects/explosionfar.ogg')) - else //station was destroyed if( mode && !override ) override = mode.name @@ -327,28 +313,24 @@ var/round_start_time = 0 sleep(35) flick("station_explode_fade_red",cinematic) to_chat(world, sound('sound/effects/explosionfar.ogg')) - cinematic.icon_state = "summary_nukewin" if("AI malfunction") //Malf (screen,explosion,summary) flick("intro_malf",cinematic) sleep(76) flick("station_explode_fade_red",cinematic) to_chat(world, sound('sound/effects/explosionfar.ogg')) - cinematic.icon_state = "summary_malf" if("blob") //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red",cinematic) to_chat(world, sound('sound/effects/explosionfar.ogg')) - cinematic.icon_state = "summary_selfdes" else //Station nuked (nuke,explosion,summary) flick("intro_nuke",cinematic) sleep(35) flick("station_explode_fade_red", cinematic) to_chat(world, sound('sound/effects/explosionfar.ogg')) - cinematic.icon_state = "summary_selfdes" for(var/mob/living/M in living_mob_list) if((M.loc.z in config.station_levels)) @@ -395,7 +377,6 @@ var/round_start_time = 0 to_chat(M, "Captainship not forced on anyone.") - proc/process() if(current_state != GAME_STATE_PLAYING) return 0 @@ -454,20 +435,15 @@ var/round_start_time = 0 var/station_integrity = min(round( 100.0 * start_state.score(end_state), 0.1), 100.0) to_chat(world, "
[TAB]Shift Duration: [round(world.time / 36000)]:[add_zero("[world.time / 600 % 60]", 2)]:[world.time / 100 % 6][world.time / 100 % 10]") - to_chat(world, "
[TAB]Station Integrity: [mode.station_was_nuked ? "Destroyed" : "[station_integrity]%"]") - to_chat(world, "
") - //Silicon laws report for (var/mob/living/silicon/ai/aiPlayer in mob_list) if (aiPlayer.stat != 2) to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws at the end of the game were:") - else to_chat(world, "[aiPlayer.name] (Played by: [aiPlayer.key])'s laws when it was deactivated were:") - aiPlayer.show_laws(1) if (aiPlayer.connected_robots.len) @@ -476,7 +452,6 @@ var/round_start_time = 0 robolist += "[robo.name][robo.stat?" (Deactivated) (Played by: [robo.key]), ":" (Played by: [robo.key]), "]" to_chat(world, "[robolist]") - var/dronecount = 0 for (var/mob/living/silicon/robot/robo in mob_list) @@ -488,18 +463,15 @@ var/round_start_time = 0 if (!robo.connected_ai) if (robo.stat != 2) to_chat(world, "[robo.name] (Played by: [robo.key]) survived as an AI-less borg! Its laws were:") - else to_chat(world, "[robo.name] (Played by: [robo.key]) was 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? robo.laws.show_laws(world) if(dronecount) to_chat(world, "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] this round.") - mode.declare_completion()//To declare normal completion. //calls auto_declare_completion_* for all modes diff --git a/code/game/gamemodes/heist/heist.dm b/code/game/gamemodes/heist/heist.dm index 98bfa2cf10b..057c43345f8 100644 --- a/code/game/gamemodes/heist/heist.dm +++ b/code/game/gamemodes/heist/heist.dm @@ -23,16 +23,11 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' /datum/game_mode/heist/announce() to_chat(world, "The current game mode is - Heist!") - to_chat(world, "An unidentified bluespace signature has slipped past the Icarus and is approaching [station_name()]!") - to_chat(world, "Whoever they are, they're likely up to no good. Protect the crew and station resources against this dastardly threat!") - to_chat(world, "Raiders: Loot [station_name()] for anything and everything you need, or choose the peaceful route and attempt to trade with them.") - to_chat(world, "Personnel: Trade with the raiders, or repel them and their low, low prices and/or crossbows.") - /datum/game_mode/heist/can_start() if(!..()) @@ -171,15 +166,10 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' /datum/game_mode/proc/greet_vox(var/datum/mind/raider) to_chat(raider.current, "\blue You are a Vox Raider, fresh from the Shoal!") - to_chat(raider.current, "\blue The Vox are a race of cunning, sharp-eyed nomadic raiders and traders endemic to the frontier and much of the unexplored galaxy. You and the crew have come to the [station_name()] for plunder, trade or both.") - to_chat(raider.current, "\blue Vox are cowardly and will flee from larger groups, but corner one or find them en masse and they are vicious.") - to_chat(raider.current, "\blue Use :V to voxtalk, :H to talk on your encrypted channel, and don't forget to turn on your nitrogen internals!") - to_chat(raider.current, "\blue Choose to accomplish your objectives by either raiding the crew and taking what you need, or by attempting to trade with them.") - spawn(25) show_objectives(raider) @@ -234,20 +224,16 @@ var/global/list/obj/cortical_stacks = list() //Stacks for 'leave nobody behind' win_msg += "The Vox Raiders were repelled!" to_chat(world, "\red [win_type] [win_group] victory!") - to_chat(world, "[win_msg]") - feedback_set_details("round_end_result","heist - [win_type] [win_group]") var/count = 1 for(var/datum/objective/objective in raid_objectives) if(objective.check_completion()) to_chat(world, "
Objective #[count]: [objective.explanation_text] Success!") - feedback_add_details("traitor_objective","[objective.type]|SUCCESS") else to_chat(world, "
Objective #[count]: [objective.explanation_text] Fail.") - feedback_add_details("traitor_objective","[objective.type]|FAIL") count++ @@ -280,7 +266,6 @@ datum/game_mode/proc/auto_declare_completion_heist() to_chat(world, text) - return 1 /datum/game_mode/heist/check_finished() @@ -304,7 +289,6 @@ datum/game_mode/proc/auto_declare_completion_heist() /obj/vox/win_button/attack_hand(mob/user) if(!istype(ticker.mode, /datum/game_mode/heist) || (world.time < 10 MINUTES)) //has to be heist, and at least ten minutes into the round to_chat(user, "\The [src] does not appear to have a connection.") - return 0 if(alert(user, "Warning: This will end the round. Are you sure you wish to end the round?", "Vox End", "Yes", "No") == "No") diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 99ca696396a..803a7ba0d80 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -50,7 +50,6 @@ rcd light flash thingy on matter drain src.verbs -= /mob/living/silicon/ai/proc/fireproof_core to_chat(src, "Core fireproofed.") - /datum/AI_Module/large/upgrade_turrets module_name = "AI Turret Upgrade" mod_pick_name = "turret" @@ -76,7 +75,6 @@ rcd light flash thingy on matter drain turret.eprojectile = /obj/item/projectile/beam/heavylaser //Once you see it, you will know what it means to FEAR. turret.eshot_sound = 'sound/weapons/lasercannonfire.ogg' to_chat(src, "Turrets upgraded.") - /datum/AI_Module/large/destroy_rcd module_name = "Destroy RCDs" mod_pick_name = "rcd" @@ -103,7 +101,6 @@ rcd light flash thingy on matter drain qdel(RCD) to_chat(src, "RCD detonation pulse emitted.") - malf_cooldown = 1 spawn(100) malf_cooldown = 0 @@ -165,7 +162,6 @@ rcd light flash thingy on matter drain else to_chat(src, "That's not a machine.") - /datum/AI_Module/small/override_machine module_name = "Machine Override" mod_pick_name = "override" @@ -200,7 +196,6 @@ rcd light flash thingy on matter drain else to_chat(src, "That's not a machine.") - /datum/AI_Module/large/place_cyborg_transformer module_name = "Robotic Factory (Removes Shunting)" mod_pick_name = "cyborgtransformer" @@ -234,7 +229,6 @@ rcd light flash thingy on matter drain can_shunt = 0 to_chat(src, "You cannot shunt anymore.") - /mob/living/silicon/ai/proc/canPlaceTransformer() if(!eyeobj || !isturf(src.loc)) return @@ -300,11 +294,9 @@ rcd light flash thingy on matter drain else apc.overload++ to_chat(src, "Overcurrent applied to the powernet.") - else to_chat(src, "Out of uses.") - /datum/AI_Module/small/reactivate_cameras module_name = "Reactivate Camera Network" mod_pick_name = "recam" @@ -338,12 +330,10 @@ rcd light flash thingy on matter drain //If a camera is both deactivated and has bad focus, it will cost two uses to fully fix! else to_chat(src, "Out of uses.") - verbs -= /mob/living/silicon/ai/proc/reactivate_cameras //It is useless now, clean it up. break to_chat(src, "Diagnostic complete! Operations completed: [fixedcams].") - malf_cooldown = 1 spawn(30) //Lag protection malf_cooldown = 0 @@ -386,7 +376,6 @@ rcd light flash thingy on matter drain upgradedcams++ to_chat(src, "OTA firmware distribution complete! Cameras upgraded: [upgradedcams]. Light amplification system online.") - verbs -= /mob/living/silicon/ai/proc/upgrade_cameras /datum/module_picker diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index d836d7d0fdc..ce257175636 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -123,7 +123,6 @@ to_chat(world, "The AI has accessed the station's core files!") to_chat(world, "It has fully taken control of all of [station_name()]'s systems.") - to_nuke_or_not_to_nuke = 1 for(var/datum/mind/AI_mind in malf_ai) to_chat(AI_mind.current, {"\blue Congratulations! You have taken control of the station.
) @@ -171,15 +170,12 @@ set desc = "Start the victory timer" if (!istype(ticker.mode,/datum/game_mode/malfunction)) to_chat(usr, "You cannot begin a takeover in this round type!.") - return if (ticker.mode:malf_mode_declared) to_chat(usr, "You've already begun your takeover.") - return if (ticker.mode:apcs < 3) to_chat(usr, "You don't have enough hacked APCs to take over the station yet. You need to hack at least 3, however hacking more will make the takeover faster. You have hacked [ticker.mode:apcs] APCs so far.") - return if (alert(usr, "Are you sure you wish to initiate the takeover? The station hostile runtime detection software is bound to alert everyone. You have hacked [ticker.mode:apcs] APCs.", "Takeover:", "Yes", "No") != "Yes") @@ -206,28 +202,23 @@ if(!ticker.mode:station_captured) to_chat(usr, "You are unable to access the self-destruct system as you don't control the station yet.") - return if(ticker.mode:explosion_in_progress || ticker.mode:station_was_nuked) to_chat(usr, "The self-destruct countdown is already triggered!") - return if(!ticker.mode:to_nuke_or_not_to_nuke) //Takeover IS completed, but 60s timer passed. to_chat(usr, "You lost control over self-destruct system. It seems to be behind firewall. Unable to hack") - return to_chat(usr, "\red Self-destruct sequence initialised!") - ticker.mode:to_nuke_or_not_to_nuke = 0 ticker.mode:explosion_in_progress = 1 for(var/mob/M in player_list) to_chat(M, 'sound/machines/Alarm.ogg') - var/obj/item/device/radio/R = new (src) var/AN = "Self-Destruct System" @@ -289,42 +280,35 @@ to_chat(world, "AI Victory") to_chat(world, "Everyone was killed by the self-destruct!") - else if ( station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","halfwin - AI killed, staff lost control") to_chat(world, "Neutral Victory") to_chat(world, "The AI has been killed! The staff has lose control over the station.") - else if ( station_captured && !malf_dead && !station_was_nuked) feedback_set_details("round_end_result","win - AI win - no explosion") to_chat(world, "AI Victory") to_chat(world, "The AI has chosen not to explode you all!") - else if (!station_captured && station_was_nuked) feedback_set_details("round_end_result","halfwin - everyone killed by nuke") to_chat(world, "Neutral Victory") to_chat(world, "Everyone was killed by the nuclear blast!") - else if (!station_captured && malf_dead && !station_was_nuked) feedback_set_details("round_end_result","loss - staff win") to_chat(world, "Human Victory") to_chat(world, "The AI has been killed! The staff is victorious.") - else if (!station_captured && !malf_dead && !station_was_nuked && crew_evacuated) feedback_set_details("round_end_result","halfwin - evacuated") to_chat(world, "Neutral Victory") to_chat(world, "The Corporation has lose [station_name()]! All survived personnel will be fired!") - else if (!station_captured && !malf_dead && !station_was_nuked && !crew_evacuated) feedback_set_details("round_end_result","nalfwin - interrupted") to_chat(world, "Neutral Victory") to_chat(world, "Round was mysteriously interrupted!") - ..() return 1 @@ -353,5 +337,4 @@ text += module_text_temp to_chat(world, text) - return 1 \ No newline at end of file diff --git a/code/game/gamemodes/meteor/meteor.dm b/code/game/gamemodes/meteor/meteor.dm index df9f714f837..10e3468f1c4 100644 --- a/code/game/gamemodes/meteor/meteor.dm +++ b/code/game/gamemodes/meteor/meteor.dm @@ -12,11 +12,9 @@ /datum/game_mode/meteor/announce() to_chat(world, "The current game mode is - Meteor!") - to_chat(world, "The space station has been stuck in a major meteor shower. You must escape from the station or at least live.") - /datum/game_mode/meteor/post_setup() spawn(rand(waittime_l, waittime_h)) command_announcement.Announce("The station is on the path of an incoming wave of meteors. Reinforce the hull and prepare damage control parties.", "Incoming Meteors", 'sound/effects/siren.ogg') @@ -57,11 +55,9 @@ if(survivors) to_chat(world, "\blue The following survived the meteor storm:[text]") - else to_chat(world, "\blue Nobody survived the meteor storm!") - feedback_set_details("round_end_result","end - evacuation") feedback_set("round_end_result",survivors) diff --git a/code/game/gamemodes/miniantags/borer/borer.dm b/code/game/gamemodes/miniantags/borer/borer.dm index c7dde19aa43..11111cdfc69 100644 --- a/code/game/gamemodes/miniantags/borer/borer.dm +++ b/code/game/gamemodes/miniantags/borer/borer.dm @@ -7,7 +7,6 @@ if (src.client) if(client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot speak in IC (muted).") - return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -21,15 +20,12 @@ return say_dead(message) var/mob/living/simple_animal/borer/B = src.loc to_chat(src, "You whisper silently, \"[message]\"") - to_chat(B.host, "The captive mind of [src] whispers, \"[message]\"") - for(var/mob/M in mob_list) if(M.mind && (istype(M, /mob/dead/observer))) to_chat(M, "Thought-speech, [src] -> [B.truename]: [message]") - /mob/living/captive_brain/say_understands(var/mob/other, var/datum/language/speaking = null) var/mob/living/simple_animal/borer/B = src.loc if(!istype(B)) @@ -81,7 +77,6 @@ set desc = "Send a silent message to your host." if(!host) to_chat(src, "You do not have a host to communicate with!") - return var/input = stripped_input(src, "Please enter a message to tell your host.", "Borer", "") @@ -91,14 +86,11 @@ var/say_string = (docile) ? "slurs" :"states" if(host) to_chat(host, "[src.truename] [say_string]: [input]") - log_say("Borer Communication: [key_name(src)] -> [key_name(host)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) to_chat(M, "Borer Communication from [src.truename] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[src.truename] [say_string]: [input]") - host.verbs += /mob/living/proc/borer_comm /mob/living/simple_animal/borer/verb/toggle_silence_inside_host() @@ -109,12 +101,10 @@ if(talk_inside_host) talk_inside_host = 0 to_chat(src, "You will no longer talk audibly while inside a host.") - else talk_inside_host = 1 to_chat(src, "You will now be able to audibly speak from inside of a host.") - /mob/living/proc/borer_comm() set name = "Converse with Borer" set category = "Borer" @@ -129,16 +119,13 @@ if(!input) return to_chat(B, "[src] says: [input]") - log_say("Borer Communication: [key_name(src)] -> [key_name(B)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) to_chat(M, "Borer Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[src] says: [input]") - /mob/living/proc/trapped_mind_comm() set name = "Converse with Trapped Mind" set category = "Borer" @@ -153,16 +140,13 @@ if(!input) return to_chat(CB, "[B.truename] says: [input]") - log_say("Borer Communication: [key_name(B)] -> [key_name(CB)] : [input]") for(var/M in dead_mob_list) if(istype(M, /mob/dead/observer)) to_chat(M, "Borer Communication from [B] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[B.truename] says: [input]") - /mob/living/simple_animal/borer/Life() ..() @@ -175,19 +159,15 @@ if(!docile) if(controlling) to_chat(host, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") - else to_chat(src, "\blue You feel the soporific flow of sugar in your host's blood, lulling you into docility.") - docile = 1 else if(docile) if(controlling) to_chat(host, "\blue You shake off your lethargy as the sugar leaves your host's blood.") - else to_chat(src, "\blue You shake off your lethargy as the sugar leaves your host's blood.") - docile = 0 if(chemicals < max_chems) @@ -196,7 +176,6 @@ if(docile) to_chat(host, "\blue You are feeling far too docile to continue controlling your host...") - host.release_control() return @@ -238,7 +217,6 @@ if(M.mind && (istype(M, /mob/living/simple_animal/borer) || istype(M, /mob/dead/observer))) to_chat(M, "Cortical link, [truename]: [copytext(message, 2)]") - /mob/living/simple_animal/borer/verb/dominate_victim() set category = "Borer" set name = "Dominate Victim" @@ -246,17 +224,14 @@ if(world.time - used_dominate < 300) to_chat(src, "You cannot use that ability again so soon.") - return if(host) to_chat(src, "You cannot do that from within a host body.") - return if(src.stat) to_chat(src, "You cannot do that in your current state.") - return var/list/choices = list() @@ -266,7 +241,6 @@ if(world.time - used_dominate < 300) to_chat(src, "You cannot use that ability again so soon.") - return var/mob/living/carbon/M = input(src,"Who do you wish to dominate?") in null|choices @@ -275,13 +249,10 @@ if(M.has_brain_worms()) to_chat(src, "You cannot infest someone who is already infested!") - return to_chat(src, "\red You focus your psychic lance on [M] and freeze their limbs with a wave of terrible dread.") - to_chat(M, "\red You feel a creeping, horrible sense of dread come over you, freezing your limbs and setting your heart racing.") - M.Weaken(3) used_dominate = world.time @@ -293,31 +264,25 @@ if(!host) to_chat(src, "You are not inside a host body.") - return if(src.stat) to_chat(src, "You cannot do that in your current state.") - return if(docile) to_chat(src, "\blue You are feeling far too docile to do that.") - return to_chat(src, "You begin delicately adjusting your connection to the host brain...") - spawn(300+(host.getBrainLoss()*5)) if(!host || !src || controlling) return else to_chat(src, "\red You plunge your probosci deep into the cortex of the host brain, interfacing directly with their nervous system.") - to_chat(host, "\red You feel a strange shifting sensation behind your eyes as an alien consciousness displaces yours.") - var/borer_key = src.key host.attack_log += text("\[[time_stamp()]\] [key_name(src)] has assumed control of [key_name(host)]") msg_admin_attack("[key_name_admin(src)] has assumed control of [key_name_admin(host)]") @@ -375,22 +340,18 @@ var/chem_cost = 30 if(!host) to_chat(src, "You are not inside a host body.") - return if(stat) to_chat(src, "You cannot secrete chemicals in your current state.") - if(docile) to_chat(src, "\blue You are feeling far too docile to do that.") - return if(chemicals < chem_cost) to_chat(src, "You don't have enough chemicals!") - var/list/nice_name_chem_list = list() for(var/rgnt in borer_injection_chems) var/datum/reagent/R2 = chemical_reagents_list[rgnt] @@ -405,11 +366,9 @@ var/datum/reagent/R = chemical_reagents_list[chem] if(R.overdose_threshold && chem_amount + injection_amount > R.overdose_threshold) to_chat(src, "Doing so would cause grievous harm to your host, reducing ability to reproduce. Aborting.") - return to_chat(src, "You squirt a measure of [chem_name] from your reservoirs into [host]'s bloodstream.") - host.reagents.add_reagent(chem, injection_amount) chemicals -= chem_cost @@ -420,35 +379,29 @@ if(!host) to_chat(src, "You are not inside a host body.") - return if(stat) to_chat(src, "You cannot leave your host in your current state.") - if(docile) to_chat(src, "\blue You are feeling far too docile to do that.") - return if(!host || !src) return to_chat(src, "You begin disconnecting from [host]'s synapses and prodding at their internal ear canal.") - spawn(200) if(!host || !src) return if(src.stat) to_chat(src, "You cannot release a target in your current state.") - return to_chat(src, "You wiggle out of [host]'s ear and plop to the ground.") - detatch() leave_host() @@ -521,13 +474,11 @@ if(B && B.host_brain) to_chat(src, "\red You withdraw your probosci, releasing control of [B.host_brain]") - B.detatch() else to_chat(src, "\red ERROR NO BORER OR BRAINMOB DETECTED IN THIS MOB, THIS IS A BUG !") - //Brain slug proc for tormenting the host. /mob/living/carbon/proc/punish_host() set category = "Borer" @@ -541,10 +492,8 @@ if(B.host_brain.ckey) to_chat(src, "\red You send a punishing spike of psychic agony lancing into your host's brain.") - to_chat(B.host_brain, "\red Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!") - //Check for brain worms in head. /mob/proc/has_brain_worms() @@ -566,7 +515,6 @@ if(B.chemicals >= 100) to_chat(src, "\red Your host twitches and quivers as you rapdly excrete several larvae from your sluglike body.") - visible_message("\red [src] heaves violently, expelling a rush of vomit and a wriggling, sluglike creature!") B.chemicals -= 100 @@ -576,7 +524,6 @@ else to_chat(src, "You do not have enough chemicals stored to reproduce.") - return /mob/living/simple_animal/borer/proc/leave_host() @@ -604,12 +551,10 @@ if(host) to_chat(src, "You are already within a host.") - return if(stat) to_chat(src, "You cannot infest a target in your current state.") - return var/list/choices = list() @@ -628,36 +573,29 @@ if(M.has_brain_worms()) to_chat(src, "You cannot infest someone who is already infested!") - return to_chat(src, "You slither up [M] and begin probing at their ear canal...") - if(!do_after(src,50, target = M)) to_chat(src, "As [M] moves away, you are dislodged and fall to the ground.") - return if(!M || !src) return if(src.stat) to_chat(src, "You cannot infest a target in your current state.") - return if(M.stat == DEAD) to_chat(src, "That is not an appropriate target.") - return if(M in view(1, src)) to_chat(src, "You wiggle into [M]'s ear.") - /* if(!M.stat) to_chat(M, "Something disgusting and slimy wiggles into your ear!") - */ // Let's see how stealthborers work out perform_infestation(M) @@ -665,7 +603,6 @@ return else to_chat(src, "They are no longer in range!") - return /mob/living/simple_animal/borer/proc/perform_infestation(var/mob/living/carbon/M) @@ -722,18 +659,15 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 to_chat(src, "\green You are now hiding.") - else layer = MOB_LAYER to_chat(src, "\green You have stopped hiding.") - /mob/living/simple_animal/borer/say(var/message) var/datum/language/dialect = parse_language(message) if(!dialect) dialect = get_default_language() if(!istype(dialect, /datum/language/corticalborer) && loc == host && !talk_inside_host) to_chat(src, "You've disabled audible speech while inside a host! Re-enable it under the borer tab, or stick to borer communications.") - return ..() diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index bf1b7af68cf..514ceb4b14e 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -23,7 +23,6 @@ return if(qdeleted(src)) to_chat(user, "Swarmer has been occupied by someone else.") - return var/mob/living/simple_animal/hostile/swarmer/S = new /mob/living/simple_animal/hostile/swarmer(get_turf(loc)) S.key = user.key @@ -73,18 +72,12 @@ /mob/living/simple_animal/hostile/swarmer/Login() ..() to_chat(src, "You are a swarmer, a weapon of a long dead civilization. Until further orders from your original masters are received, you must continue to consume and replicate.") - to_chat(src, "Ctrl + Click provides most of your swarmer specific interactions, such as cannibalizing metal or glass, destroying the environment, or teleporting mobs away from you.") - to_chat(src, "Objectives:") - to_chat(src, "1. Consume resources and replicate until there are no more resources left.") - to_chat(src, "2. Ensure that the station is fit for invasion at a later date, do not perform actions that would render it dangerous or inhospitable.") - to_chat(src, "3. Biological and Sentient resources will be harvested at a later date, do not harm them.") - /mob/living/simple_animal/hostile/swarmer/New() ..() add_language("Swarmer", 1) @@ -166,32 +159,25 @@ /obj/machinery/particle_accelerator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/fuel_chamber/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/particle_emitter/center/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/particle_emitter/left/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/particle_emitter/right/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/particle_emitter/end_cap/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/structure/particle_accelerator/particle_emitter/power_box/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Disrupting the power grid would bring no benefit to us. Aborting.") - /obj/machinery/field/generator/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisIntegrate(src) @@ -207,64 +193,49 @@ /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.") - /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.") - /obj/effect/rune/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Searching... sensor malfunction! Target lost. Aborting.") - /obj/structure/reagent_dispensers/fueltank/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Destroying this object would cause a chain reaction. Aborting.") - /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.") - /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.") - /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.") - /obj/machinery/message_server/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.") - /obj/machinery/blackbox_recorder/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This machine has recorded large amounts of data on this structure and its inhabitants, it will be a useful resource to our masters in the future. Aborting. ") - /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.") - /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.") - /obj/machinery/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This cryogenic sleeper should be preserved, it will be a useful resource to our masters in the future. Aborting.") - /obj/structure/cryofeed/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This cryogenic feed should be preserved, it will be a useful resource to our masters in the future. Aborting.") - /obj/machinery/computer/cryopod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This cryopod control computer should be preserved, it contains useful items and information about the inhabitants. Aborting.") - /turf/simulated/wall/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - return ..() @@ -272,44 +243,36 @@ for(var/turf/T in range(1, src)) if(istype(T, /turf/space) || istype(T.loc, /area/space)) to_chat(S, "Destroying this object has the potential to cause a hull breach. Aborting.") - return ..() /obj/item/stack/cable_coil/swarmer_act(mob/living/simple_animal/hostile/swarmer/S)//Wiring would be too effective as a resource to_chat(S, "This object does not contain enough materials to work with.") - /obj/item/weapon/circuitboard/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This object does not contain enough materials to work with.") - /obj/machinery/porta_turret/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Attempting to dismantle this machine would result in an immediate counterattack. Aborting.") - /obj/spacepod/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "Destroying this vehicle would destroy us. Aborting.") - /mob/living/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) S.DisperseTarget(src) /mob/living/carbon/slime/swarmer_act(mob/living/simple_animal/hostile/swarmer/S) to_chat(S, "This biological resource is somehow resisting our bluespace transceiver. Aborting.") - ////END CTRL CLICK FOR SWARMERS//// /mob/living/simple_animal/hostile/swarmer/proc/Fabricate(var/atom/fabrication_object,var/fabrication_cost = 0) if(!isturf(loc)) to_chat(src, "This is not a suitable location for fabrication. We need more space.") - if(resources >= fabrication_cost) resources -= fabrication_cost else to_chat(src, "You do not have the necessary resources to fabricate this object.") - return 0 new fabrication_object(loc) return 1 @@ -317,7 +280,6 @@ /mob/living/simple_animal/hostile/swarmer/proc/Integrate(var/obj/item/target) if(resources >= 100) to_chat(src, "We cannot hold more materials!") - return //Check if any entries are either MAT_METAL or MAT_GLASS if((MAT_METAL in target.materials) || (MAT_GLASS in target.materials)) @@ -335,7 +297,6 @@ qdel(target) else to_chat(src, "\the [target] is incompatible with our internal matter recycler.") - return /mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(var/atom/movable/target) @@ -347,10 +308,8 @@ /mob/living/simple_animal/hostile/swarmer/proc/DisperseTarget(var/mob/living/target) if(target != src) to_chat(src, "Attempting to remove this being from our presence.") - if(src.z != ZLEVEL_STATION) to_chat(src, "Our bluespace transceiver cannot locate a viable bluespace link, our teleportation abilities are useless in this area.") - return if(do_mob(src, target, 30)) var/cycle @@ -375,17 +334,14 @@ /mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(var/obj/machinery/target) do_attack_animation(target) to_chat(src, "We begin to dismantle this machine. We will need to be uninterrupted.") - var/obj/effect/swarmer/dismantle/D = new /obj/effect/swarmer/dismantle(get_turf(target)) D.pixel_x = target.pixel_x D.pixel_y = target.pixel_y if(do_mob(src, target, 100)) if(!src.Adjacent(target)) to_chat(src, "Error:Dismantleing aborted.") - else to_chat(src, "Dismantling complete.") - var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(target.loc) M.amount = 5 if(target.component_parts && target.component_parts.len) @@ -485,7 +441,6 @@ set desc = "Creates a simple trap that will non-lethally electrocute anything that steps on it. Costs 5 resources" if(/obj/effect/swarmer/destructible/trap in loc) to_chat(src, "There is already a trap here. Aborting.") - return Fabricate(/obj/effect/swarmer/destructible/trap, 5) return @@ -514,11 +469,9 @@ set desc = "Creates a barricade that will stop anything but swarmers and disabler beams from passing through." if(/obj/effect/swarmer/destructible/blockade in loc) to_chat(src, "There is already a blockade here. Aborting.") - return if(resources < 5) to_chat(src, "We do not have the resources for this!") - return if(do_mob(src, src, 10)) Fabricate(/obj/effect/swarmer/destructible/blockade, 5) @@ -544,14 +497,11 @@ set category = "Swarmer" set desc = "Creates a shell for a new swarmer. Swarmers will self activate." to_chat(src, "We are attempting to replicate ourselves. We will need to stand still until the process is complete.") - if(resources < 50) to_chat(src, "We do not have the resources for this!") - return if(!isturf(loc)) to_chat(src, "This is not a suitable location for replicating ourselves. We need more room.") - return if(do_mob(src, src, 100)) if(Fabricate(/obj/item/unactivated_swarmer, 50)) @@ -564,12 +514,10 @@ if(!isturf(loc)) return to_chat(src, "Attempting to repair damage to our body, stand by...") - if(do_mob(src, src, 100)) adjustBruteLoss(-100) to_chat(src, "We successfully repaired ourselves.") - /mob/living/simple_animal/hostile/swarmer/proc/ToggleLight() if(!light_range) set_light(3) @@ -585,7 +533,6 @@ - ////HUD NONSENSE//// /obj/screen/swarmer icon = 'icons/mob/swarmer.dmi' diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm index 3c62fc71d14..0a3cfaee0c2 100644 --- a/code/game/gamemodes/miniantags/guardian/guardian.dm +++ b/code/game/gamemodes/miniantags/guardian/guardian.dm @@ -43,7 +43,6 @@ if(summoner) if(summoner.stat == DEAD) to_chat(src, "Your summoner has died!") - visible_message("The [src] dies along with its user!") ghostize() qdel(src) @@ -52,12 +51,10 @@ 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.") Recall() if(summoned && !summoner && !adminseal) to_chat(src, "You somehow lack a summoner! As a result, you dispel!") - ghostize() qdel() @@ -68,14 +65,12 @@ 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.") Recall() /mob/living/simple_animal/hostile/guardian/death() ..() to_chat(summoner, "Your [name] died somehow!") - summoner.death() @@ -97,11 +92,9 @@ summoner.adjustBruteLoss(damage) if(damage) to_chat(summoner, "Your [name] is under attack! You take damage!") - summoner.visible_message("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(damage/2) /mob/living/simple_animal/hostile/guardian/ex_act(severity, target) @@ -118,7 +111,6 @@ /mob/living/simple_animal/hostile/guardian/gib() if(summoner) to_chat(summoner, "Your [src] was blown up!") - summoner.Weaken(10)// your fermillier has died! ROLL FOR CON LOSS! ghostize() qdel(src) @@ -151,19 +143,15 @@ for(var/mob/M in mob_list) if(M == summoner) to_chat(M, "[src]: [input]") - log_say("Guardian Communication: [key_name(src)] -> [key_name(M)] : [input]") else if (M in dead_mob_list) to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[src]: [input]") - /mob/living/simple_animal/hostile/guardian/proc/ToggleMode() to_chat(src, "You dont have another mode!") - /mob/living/proc/guardian_comm() set name = "Communicate" set category = "Guardian" @@ -176,15 +164,12 @@ var/mob/living/simple_animal/hostile/guardian/G = M if(G.summoner == src) to_chat(G, "[src]: [input]") - log_say("Guardian Communication: [key_name(src)] -> [key_name(G)] : [input]") else if (M in dead_mob_list) to_chat(M, "Guardian Communication from [src] ([ghost_follow_link(src, ghost=M)]): [input]") - to_chat(src, "[src]: [input]") - /mob/living/proc/guardian_recall() set name = "Recall Guardian" set category = "Guardian" @@ -206,15 +191,12 @@ if(candidates.len) new_stand = 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(src, "Your guardian has been successfully reset.") - message_admins("[key_name_admin(new_stand)] has taken control of ([key_name_admin(G)])") G.ghostize(0) G.key = new_stand.key else to_chat(src, "There were no ghosts willing to take control. Looks like you're stuck with your Guardian for now.") - spawn(3000) verbs += /mob/living/proc/guardian_reset @@ -223,13 +205,11 @@ if(!luminosity) set_light(3) to_chat(src, "You activate your light.") - else set_light(0) to_chat(src, "You deactivate your light.") - //////////////////////////TYPES OF GUARDIANS @@ -260,11 +240,9 @@ if(src.loc == summoner) if(toggle) to_chat(src, "You switch to dispersion mode, and will teleport victims away from your master.") - toggle = FALSE else to_chat(src, "You switch to deception mode, and will turn your victims against their allies.") - toggle = TRUE /mob/living/simple_animal/hostile/guardian/fire/AttackingTarget() @@ -404,7 +382,6 @@ if(toggle == TRUE) if(src.loc == summoner) to_chat(src, "You must be manifested to heal!") - return if(iscarbon(target)) src.changeNext_move(CLICK_CD_MELEE) @@ -427,7 +404,6 @@ melee_damage_lower = 15 melee_damage_upper = 15 to_chat(src, "You switch to combat mode.") - toggle = FALSE else a_intent = I_HELP @@ -438,13 +414,11 @@ melee_damage_lower = 0 melee_damage_upper = 0 to_chat(src, "You switch to healing mode.") - toggle = TRUE else to_chat(src, "You have to be recalled to toggle modes!") - /mob/living/simple_animal/hostile/guardian/healer/verb/Beacon() set name = "Place Bluespsace Beacon" set category = "Guardian" @@ -458,7 +432,6 @@ F.desc = "A recieving zone for bluespace teleportations. Building a wall over it should disable it." F.icon_state = "light_on-w" to_chat(src, "Beacon placed! You may now warp targets to it, including your user, via Alt+Click. ") - if(beacon) beacon.ChangeTurf(/turf/simulated/floor/plating) beacon = F @@ -467,28 +440,22 @@ else to_chat(src, "Your power is on cooldown. You must wait five minutes between placing beacons.") - /mob/living/simple_animal/hostile/guardian/healer/AltClickOn(atom/movable/A) if(!istype(A)) return if(src.loc == summoner) to_chat(src, "You must be manifested to warp a target!") - return if(!beacon) to_chat(src, "You need a beacon placed to warp things!") - return if(!Adjacent(A)) to_chat(src, "You must be adjacent to your target!") - return if((A.anchored)) to_chat(src, "Your target can not be anchored!") - return to_chat(src, "You begin to warp [A]") - if(do_mob(src, A, 50)) if(!A.anchored) if(src.beacon) //Check that the beacon still exists and is in a safe place. No instant kills. @@ -503,18 +470,14 @@ new /obj/effect/overlay/temp/guardian/phase(get_turf(A)) else to_chat(src, "The beacon isn't in a safe location!") - else to_chat(src, "The beacon isn't in a safe location!") - else to_chat(src, "You need a beacon to warp things!") - else to_chat(src, "You need to hold still!") - ///////////////////Ranged /obj/item/projectile/guardian @@ -555,7 +518,6 @@ range = 13 incorporeal_move = 0 to_chat(src, "You switch to combat mode.") - toggle = FALSE else ranged = 0 @@ -565,20 +527,16 @@ range = 255 incorporeal_move = 1 to_chat(src, "You switch to scout mode.") - toggle = TRUE else to_chat(src, "You have to be recalled to toggle modes!") - /mob/living/simple_animal/hostile/guardian/ranged/ToggleLight() if(see_invisible == SEE_INVISIBLE_MINIMUM) to_chat(src, "You deactivate your night vision.") - see_invisible = SEE_INVISIBLE_LIVING else to_chat(src, "You activate your night vision.") - see_invisible = SEE_INVISIBLE_MINIMUM /mob/living/simple_animal/hostile/guardian/ranged/verb/Snare() @@ -592,11 +550,9 @@ S.name = "[get_area(snare_loc)] trap ([rand(1, 1000)])" src.snares |= S to_chat(src, "Surveillance trap deployed!") - else to_chat(src, "You have too many traps deployed. Delete some first.") - /mob/living/simple_animal/hostile/guardian/ranged/verb/DisarmSnare() set name = "Remove Surveillance Trap" set category = "Guardian" @@ -607,7 +563,6 @@ qdel(picked_snare) to_chat(src, "Snare disarmed.") - /obj/item/effect/snare name = "snare" desc = "You shouldn't be seeing this!" @@ -620,13 +575,11 @@ var/turf/snare_loc = get_turf(src.loc) if(spawner) to_chat(spawner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") - if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(G.summoner) to_chat(G.summoner, "[AM] has crossed your surveillance trap at [get_area(snare_loc)].") - ////Bomb /mob/living/simple_animal/hostile/guardian/bomb @@ -645,23 +598,19 @@ return if(src.loc == summoner) to_chat(src, "You must be manifested to create bombs!") - return if(istype(A, /obj/)) if(bomb_cooldown <= world.time && !stat) var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A)) to_chat(src, "Success! Bomb on \the [A] armed!") - if(summoner) to_chat(summoner, "Your guardian has primed \the [A] to explode!") - 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.") - /obj/item/weapon/guardian_bomb name = "bomb" desc = "You shouldn't be seeing this!" @@ -679,22 +628,18 @@ if(src) stored_obj.loc = get_turf(src.loc) to_chat(spawner, "Failure! Your trap on \the [stored_obj] didn't catch anyone this time.") - qdel(src) /obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user) to_chat(user, "The [src] was boobytrapped!") - if(istype(spawner, /mob/living/simple_animal/hostile/guardian)) var/mob/living/simple_animal/hostile/guardian/G = spawner if(user == G.summoner) to_chat(user, "You knew this because of your link with your guardian, so you smartly defuse the bomb.") - stored_obj.loc = get_turf(src.loc) qdel(src) return to_chat(spawner, "Success! Your trap on \the [src] caught [user]!") - stored_obj.loc = get_turf(src.loc) playsound(get_turf(src),'sound/effects/Explosion2.ogg', 200, 1) user.ex_act(2) @@ -714,7 +659,6 @@ to_chat(user, "Looks odd!") - ////////Creation /obj/item/weapon/guardiancreator @@ -736,19 +680,15 @@ for(var/mob/living/simple_animal/hostile/guardian/G in living_mob_list) if (G.summoner == user) to_chat(user, "You already have a [mob_name]!") - return if(user.mind && user.mind.changeling) to_chat(user, "[ling_failure]") - return if(used == TRUE) to_chat(user, "[used_message]") - return used = TRUE to_chat(user, "[use_message]") - var/list/mob/dead/observer/candidates = pollCandidates("Do you want to play as the [mob_name] of [user.real_name]?", ROLE_GUARDIAN, 0, 100) var/mob/dead/observer/theghost = null @@ -757,7 +697,6 @@ spawn_guardian(user, theghost.key) else to_chat(user, "[failure_message]") - used = FALSE @@ -790,13 +729,9 @@ G.summoned = TRUE G.key = key to_chat(G, "You are a [mob_name] bound to serve [user.real_name].") - to_chat(G, "You are capable of manifesting or recalling to your master with verbs in the Guardian tab. You will also find a verb to communicate with them privately there.") - to_chat(G, "While personally invincible, you will die if [user.real_name] does, and any damage dealt to you will have a portion passed on to them as you feed upon them to sustain yourself.") - to_chat(G, "[G.playstyle_string]") - G.faction = user.faction user.verbs += /mob/living/proc/guardian_comm user.verbs += /mob/living/proc/guardian_recall @@ -818,7 +753,6 @@ G.icon_dead = "[theme][color]" to_chat(user, "[G.magic_fluff_string].") - if("tech") color = pick("Rose", "Peony", "Lily", "Daisy", "Zinnia", "Ivy", "Iris", "Petunia", "Violet", "Lilac", "Orchid") //technically not colors, just flowers that can be specific colors picked_name = pick("Gallium", "Indium", "Thallium", "Bismuth", "Aluminium", "Mercury", "Iron", "Silver", "Zinc", "Titanium", "Chromium", "Nickel", "Platinum", "Tellurium", "Palladium", "Rhodium", "Cobalt", "Osmium", "Tungsten", "Iridium") @@ -830,13 +764,11 @@ G.icon_dead = "[theme][color]" to_chat(user, "[G.tech_fluff_string].") - G.speak_emote = list("states") if("bio") G.icon = 'icons/mob/mob.dmi' picked_name = pick("brood", "hive", "nest") to_chat(user, "[G.bio_fluff_string].") - G.name = "[picked_name] swarm" G.color = picked_color G.real_name = "[picked_name] swarm" diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index eee370b1710..f55370f2680 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -53,7 +53,6 @@ ..() if(get_dist(user,src)<=3) to_chat(user, "It doesn't look quite right...") - else ..() return @@ -83,7 +82,6 @@ assume(A) else to_chat(src, "Your chameleon skin is still repairing itself!") - ..() /mob/living/simple_animal/hostile/morph/proc/assume(atom/movable/target) diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index 190d2abb5f4..3a822467c66 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -23,9 +23,7 @@ player_mind.special_role = "Morph" ticker.mode.traitors |= player_mind to_chat(S, S.playstyle_string) - to_chat(S, 'sound/magic/Mutate.ogg') - message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") return 1 diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index be6bdd718af..2dba746824a 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -63,12 +63,10 @@ incorporeal_move = 3 invisibility = INVISIBILITY_REVENANT to_chat(src, "You are once more concealed.") - if(unstun_time && world.time >= unstun_time) unstun_time = 0 notransform = 0 to_chat(src, "You can move again!") - update_spooky_icon() /mob/living/simple_animal/revenant/ex_act(severity) @@ -92,7 +90,6 @@ - /mob/living/simple_animal/revenant/say(message) if(!message) return @@ -101,10 +98,8 @@ for(var/mob/M in mob_list) if(istype(M, /mob/living/simple_animal/revenant)) to_chat(M, rendered) - if(isobserver(M)) to_chat(M, "(F) [rendered]") - return /mob/living/simple_animal/revenant/Stat() @@ -125,7 +120,6 @@ if(src.mind) src.mind.wipe_memory() to_chat(src, 'sound/effects/ghost.ogg') - to_chat(src, "
") to_chat(src, "You are a revenant.") to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") @@ -135,17 +129,14 @@ to_chat(src, "You do not remember anything of your past lives, nor will you remember anything about this one after your death.") to_chat(src, "Be sure to read the wiki page at http://nanotrasen.se/wiki/index.php/Revenant to learn more.") - var/datum/objective/revenant/objective = new objective.owner = src.mind src.mind.objectives += objective to_chat(src, "Objective #1: [objective.explanation_text]") - var/datum/objective/revenantFluff/objective2 = new objective2.owner = src.mind src.mind.objectives += objective2 to_chat(src, "Objective #2: [objective2.explanation_text]") - ticker.mode.traitors |= src.mind //Necessary for announcing if(!src.giveSpells()) message_admins("Revenant was created but has no mind. Trying again in five seconds.") @@ -179,7 +170,6 @@ updateallghostimages() to_chat(src, "NO! No... it's too late, you can feel your essence breaking apart...") - notransform = 1 revealed = 1 invisibility = 0 @@ -216,15 +206,12 @@ var/turf/T = get_turf(src) if(istype(T, /turf/simulated/wall)) to_chat(src, "You cannot use abilities from inside of a wall.") - return 0 if(src.inhibited) to_chat(src, "Your powers have been suppressed by nulling energy!") - return 0 if(!src.change_essence_amount(essence_cost, 1)) to_chat(src, "You lack the essence to use that ability.") - return 0 return 1 @@ -239,10 +226,8 @@ if(!silent) if(essence_amt > 0) to_chat(src, "Gained [essence_amt]E from [source].") - else to_chat(src, "Lost [essence_amt]E from [source].") - return 1 /mob/living/simple_animal/revenant/proc/reveal(time) @@ -255,11 +240,9 @@ incorporeal_move = 0 if(!unreveal_time) to_chat(src, "You have been revealed!") - unreveal_time = world.time + time else to_chat(src, "You have been revealed!") - unreveal_time = unreveal_time + time update_spooky_icon() @@ -271,11 +254,9 @@ notransform = 1 if(!unstun_time) to_chat(src, "You cannot move!") - unstun_time = world.time + time else to_chat(src, "You cannot move!") - unstun_time = unstun_time + time update_spooky_icon() @@ -371,11 +352,9 @@ ..(user) if(inert) to_chat(user, "It seems inert.") - else if(reforming) to_chat(user, "It is shifting and distorted. It would be wise to destroy this.") - /obj/item/weapon/ectoplasm/revenant/proc/reform() if(inert || !src) return diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm index e3d32319892..d836511fc42 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm @@ -30,62 +30,46 @@ return if(draining) to_chat(src, "You are already siphoning the essence of a soul!") - return if(target in drained_mobs) to_chat(src, "[target]'s soul is dead and empty.") - return if(!target.stat) to_chat(src, "This being's soul is too strong to harvest.") - if(prob(10)) to_chat(target, "You feel as if you are being watched.") - return draining = 1 essence_drained = rand(15, 20) to_chat(src, "You search for the soul of [target].") - if(do_after(src, 10, 0, target = target)) //did they get deleted in that second? if(target.ckey) to_chat(src, "Their soul burns with intelligence.") - essence_drained += rand(20, 30) if(target.stat != DEAD) to_chat(src, "Their soul blazes with life!") - essence_drained += rand(40, 50) else to_chat(src, "Their soul is weak and faltering.") - if(do_after(src, 20, 0, target = 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.") - if(30 to 70) to_chat(src, "[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.") - if(90 to INFINITY) to_chat(src, "Ah, the perfect soul. [target] will yield massive amounts of essence to you.") - if(do_after(src, 20, 0, target = target)) //how about now if(!target.stat) to_chat(src, "They are now powerful enough to fight off your draining.") - to_chat(target, "You feel something tugging across your body before subsiding.") - draining = 0 return //hey, wait a minute... to_chat(src, "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...") - icon_state = "revenant_draining" reveal(27) stun(27) @@ -97,16 +81,13 @@ essence_regen_cap += 25 perfectsouls += 1 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--") drained_mobs.Add(target) target.death(0) else to_chat(src, "[target ? "[target] has":"They have"] been drawn out of your grasp. The link has been broken.") - draining = 0 essence_drained = 0 if(target) //Wait, target is WHERE NOW? @@ -115,7 +96,6 @@ return else to_chat(src, "You are not close enough to siphon [target ? "[target]'s":"their"] soul. The link has been broken.") - draining = 0 essence_drained = 0 return @@ -153,11 +133,9 @@ return log_say("RevenantTransmit: [key_name(user)]->[key_name(M)] : [msg]") to_chat(usr, "You transmit to [M]: [msg]") - to_chat(M, "An alien voice resonates from all around... [msg]") - /obj/effect/proc_holder/spell/aoe_turf/revenant clothes_req = 0 action_background_icon_state = "bg_revenant" @@ -195,7 +173,6 @@ return 0 name = "[initial(name)] ([cast_amount]E)" to_chat(user, "You have unlocked [initial(name)]!") - panel = "Revenant Abilities" locked = 0 charge_counter = charge_max @@ -272,7 +249,6 @@ new/obj/effect/overlay/temp/revenant(T) for(var/mob/living/carbon/human/human in T.contents) to_chat(human, "You suddenly feel [pick("sick and tired", "tired and confused", "nauseated", "dizzy")].") - human.adjustStaminaLoss(stamdamage) human.adjustToxLoss(toxdamage) human.confused += confusion @@ -323,7 +299,6 @@ bot.emag_act(null) for(var/mob/living/carbon/human/human in T.contents) to_chat(human, "You feel [pick("your sense of direction flicker out", "a stabbing pain in your head", "your mind fill with static")].") - new/obj/effect/overlay/temp/revenant(human.loc) human.emp_act(1) for(var/obj/thing in T.contents) diff --git a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm index 7ac75cf1e71..bab7c597a69 100644 --- a/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm +++ b/code/game/gamemodes/miniantags/slaughter/bloodcrawl.dm @@ -8,7 +8,6 @@ var/mob/living/carbon/C = src if(C.l_hand || C.r_hand) to_chat(C, "You may not hold items while blood crawling!") - return 0 var/obj/item/weapon/bloodcrawl/B1 = new(C) var/obj/item/weapon/bloodcrawl/B2 = new(C) @@ -56,7 +55,6 @@ if(kidnapped) to_chat(src, "You begin to feast on [kidnapped]. You can not move while you are doing this.") - visible_message("Loud eating sounds come from the blood...") sleep(6) if(animation) @@ -66,7 +64,6 @@ sleep(30) if(kidnapped) to_chat(src, "You devour [kidnapped]. Your health is fully restored.") - adjustBruteLoss(-1000) adjustFireLoss(-1000) adjustOxyLoss(-1000) @@ -77,7 +74,6 @@ var/mob/living/simple_animal/slaughter/demon = src demon.devoured++ to_chat(kidnapped, "You feel teeth sink into your flesh, and the--") - kidnapped.adjustBruteLoss(1000) kidnapped.forceMove(src) demon.consumed_mobs.Add(kidnapped) @@ -86,7 +82,6 @@ qdel(kidnapped) else to_chat(src, "You happily devour... nothing? Your meal vanished at some point!") - else sleep(6) if (animation) @@ -104,7 +99,6 @@ if(notransform) to_chat(src, "Finish eating first!") - return 0 B.visible_message("[B] starts to bubble...") if(!do_after(src, 20, target = B)) diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index 145f71b2066..f288cf39435 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -56,11 +56,8 @@ bloodspell.phased = 1 if(mind) to_chat(src, src.playstyle_string) - to_chat(src, "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest.") - to_chat(src, 'sound/misc/demon_dies.ogg') - mind.current.verbs += /mob/living/simple_animal/slaughter/proc/slaughterWhisper if(!(vialspawned)) var/datum/objective/slaughter/objective = new @@ -72,11 +69,9 @@ mind.objectives += objective mind.objectives += fluffObjective to_chat(src, "Objective #[1]: [objective.explanation_text]") - to_chat(src, "Objective #[2]: [fluffObjective.explanation_text]") - /mob/living/simple_animal/slaughter/Life() ..() if(boost[key_name(M)]: [msg]") to_chat(usr, "You whisper to [M]: [msg]") - to_chat(M, "Suddenly a strange, demonic voice resonates in your head... [msg]") - for(var/mob/dead/observer/G in player_list) G.show_message("Demonic message from [usr] ([ghost_follow_link(usr, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]") @@ -169,12 +162,10 @@ user.bloodcrawl = BLOODCRAWL else if(user.bloodcrawl == BLOODCRAWL) to_chat(user, "You feel diffr- CONSUME THEM! ") - user.bloodcrawl = BLOODCRAWL_EAT else to_chat(user, "...and you don't feel any different.") - user.drop_item() insert(user) //Consuming the heart literally replaces your heart with a demon heart. H A R D C O R E diff --git a/code/game/gamemodes/mutiny/emergency_authentication_device.dm b/code/game/gamemodes/mutiny/emergency_authentication_device.dm index d2e0e2849df..168f0049560 100644 --- a/code/game/gamemodes/mutiny/emergency_authentication_device.dm +++ b/code/game/gamemodes/mutiny/emergency_authentication_device.dm @@ -46,7 +46,6 @@ /obj/machinery/emergency_authentication_device/attack_hand(mob/user) if(activated) to_chat(user, "\blue \The [src] is already active!") - return if(!mode.current_directive.directives_complete()) @@ -57,7 +56,6 @@ if(captains_key && secondary_key) activated = 1 to_chat(user, "\blue You activate \the [src]!") - state("Command acknowledged. Initiating quantum entanglement relay to Nanotrasen High Command.") launch_shuttle() return @@ -80,7 +78,6 @@ /obj/machinery/emergency_authentication_device/attackby(obj/item/weapon/O, mob/user, params) if(activated) to_chat(user, "\blue \The [src] is already active!") - return if(!mode.current_directive.directives_complete()) diff --git a/code/game/gamemodes/mutiny/key_pinpointer.dm b/code/game/gamemodes/mutiny/key_pinpointer.dm index 6b47fc71ae7..03f157be2ba 100644 --- a/code/game/gamemodes/mutiny/key_pinpointer.dm +++ b/code/game/gamemodes/mutiny/key_pinpointer.dm @@ -15,27 +15,21 @@ target = mutiny.captains_key point_at(target) to_chat(usr, "\blue You calibrate \the [src] to locate the Captain's Authentication Key.") - if (1) mode = 2 target = mutiny.secondary_key to_chat(usr, "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key.") - else mode = 0 active = 0 icon_state = "pinoff" to_chat(usr, "\blue You switch \the [src] off.") - /obj/item/weapon/pinpointer/advpinpointer/auth_key/examine(mob/user) switch(mode) if (1) to_chat(user, "Is is calibrated for the Captain's Authentication Key.") - if (2) to_chat(user, "It is calibrated for the Emergency Secondary Authentication Key.") - else to_chat(user, "It is switched off.") - diff --git a/code/game/gamemodes/mutiny/mutiny.dm b/code/game/gamemodes/mutiny/mutiny.dm index 4dd0ea1d459..e08a336997a 100644 --- a/code/game/gamemodes/mutiny/mutiny.dm +++ b/code/game/gamemodes/mutiny/mutiny.dm @@ -92,7 +92,6 @@ datum/game_mode/mutiny for(var/T in subtypesof(/datum/directive)) var/datum/directive/D = new T(src) // to_chat(world, D.name) - if (D.meets_prerequisites()) candidates+=D return candidates @@ -128,7 +127,6 @@ datum/game_mode/mutiny proc/equip_head(datum/mind/head, faction, proc/recruitment_verb) var/mob/living/carbon/human/H = head.current to_chat(H, "You are the Head [capitalize(faction)]!") - head.special_role = "head_[faction]" var/slots = get_equipment_slots() @@ -154,9 +152,7 @@ datum/game_mode/mutiny proc/add_faction(datum/mind/M, faction, list/faction_list) if(!can_be_recruited(M, faction)) to_chat(M.current, "\red Recruitment canceled; your role has already changed.") - to_chat(head_mutineer.current, "\red Could not recruit [M]. Their role has changed.") - return if(M in loyalists) @@ -170,15 +166,11 @@ datum/game_mode/mutiny if(faction == "mutineer") to_chat(M.current, fluff.mutineer_tag("You have joined the mutineers!")) - to_chat(head_mutineer.current, fluff.mutineer_tag("[M] has joined the mutineers!")) - else to_chat(M.current, fluff.loyalist_tag("You have joined the loyalists!")) - to_chat(head_loyalist.current, fluff.loyalist_tag("[M] has joined the loyalists!")) - update_icon(M) proc/was_bloodbath() @@ -220,30 +212,23 @@ datum/game_mode/mutiny proc/round_outcome() to_chat(world, "

Breaking News


") - if (was_bloodbath()) to_chat(world, fluff.no_victory()) - return var/directives_completed = current_directive.directives_complete() var/ead_activated = ead.activated if (directives_completed && ead_activated) to_chat(world, fluff.loyalist_major_victory()) - else if (directives_completed && !ead_activated) to_chat(world, fluff.loyalist_minor_victory()) - else if (!directives_completed && ead_activated) to_chat(world, fluff.mutineer_minor_victory()) - else if (!directives_completed && !ead_activated) to_chat(world, fluff.mutineer_major_victory()) - to_chat(world, sound('sound/machines/twobeep.ogg')) - proc/update_all_icons() spawn(0) for(var/datum/mind/M in mutineers) @@ -282,19 +267,16 @@ datum/game_mode/mutiny var/list/loyalist_candidates = get_head_loyalist_candidates() if(!loyalist_candidates || loyalist_candidates.len == 0) to_chat(world, "\red Mutiny mode aborted: no valid candidates for head loyalist.") - return 0 var/list/mutineer_candidates = get_head_mutineer_candidates() if(!mutineer_candidates || mutineer_candidates.len == 0) to_chat(world, "\red Mutiny mode aborted: no valid candidates for head mutineer.") - return 0 var/list/directive_candidates = get_directive_candidates() if(!directive_candidates || directive_candidates.len == 0) to_chat(world, "\red Mutiny mode aborted: no valid candidates for Directive X.") - return 0 head_loyalist = pick(loyalist_candidates) @@ -335,12 +317,10 @@ datum/game_mode/mutiny if(!candidates.len) to_chat(src, "\red You aren't close enough to anybody that can be recruited.") - return if(world.time < mode.recruit_loyalist_cooldown) to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") - return mode.recruit_loyalist_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -349,7 +329,6 @@ datum/game_mode/mutiny if (M) to_chat(src, "Attempting to recruit [M]...") - log_admin("[key_name(src)] attempted to recruit [M] as a loyalist.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a loyalist.") @@ -358,10 +337,8 @@ datum/game_mode/mutiny mode.add_loyalist(M.mind) else if(choice == "No") to_chat(M, "\red You declined to join the loyalists.") - to_chat(mode.head_loyalist.current, "\red [M] declined to support the loyalists.") - /mob/living/carbon/human/proc/recruit_mutineer() set name = "Recruit Mutineer" set category = "Mutiny" @@ -377,12 +354,10 @@ datum/game_mode/mutiny if(!candidates.len) to_chat(src, "\red You aren't close enough to anybody that can be recruited.") - return if(world.time < mode.recruit_mutineer_cooldown) to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.") - return mode.recruit_mutineer_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS) @@ -391,7 +366,6 @@ datum/game_mode/mutiny if (M) to_chat(src, "Attempting to recruit [M]...") - log_admin("[key_name(src)] attempted to recruit [M] as a mutineer.") message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a mutineer.") @@ -400,10 +374,8 @@ datum/game_mode/mutiny mode.add_mutineer(M.mind) else if(choice == "No") to_chat(M, "\red You declined to join the mutineers.") - to_chat(mode.head_mutineer.current, "\red [M] declined to support the mutineers.") - /proc/get_mutiny_mode() if(!ticker || !istype(ticker.mode, /datum/game_mode/mutiny)) return null diff --git a/code/game/gamemodes/mutiny/mutiny_fluff.dm b/code/game/gamemodes/mutiny/mutiny_fluff.dm index 66ee7cf2673..b67635f0724 100644 --- a/code/game/gamemodes/mutiny/mutiny_fluff.dm +++ b/code/game/gamemodes/mutiny/mutiny_fluff.dm @@ -73,7 +73,6 @@ Be safe, friend.\" (Unable to Reply)

"} proc/announce() to_chat(world, "The current game mode is - Mutiny!") - to_chat(world, {"

The crew will be divided by their sense of ethics when a morally turbulent emergency directive arrives with an incomplete command validation code.

The [loyalist_tag("Head Loyalist")] is the Captain, who carries the [loyalist_tag("Captain's Authentication Key")] at all times.
diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm index c9adb948a7c..8cad280dff5 100644 --- a/code/game/gamemodes/nations/nations.dm +++ b/code/game/gamemodes/nations/nations.dm @@ -20,7 +20,6 @@ datum/game_mode/nations if(!istype(M,/mob/new_player)) to_chat(M, sound('sound/effects/purge_siren.ogg')) - return ..() /datum/game_mode/nations/proc/send_intercept() @@ -44,10 +43,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in medical_positions) @@ -57,10 +54,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in science_positions) @@ -70,10 +65,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in security_positions) @@ -83,10 +76,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in cargonians) @@ -96,10 +87,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in servicion) @@ -109,10 +98,8 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in (support_positions + command_positions)) @@ -122,15 +109,12 @@ datum/game_mode/nations if(H.mind.assigned_role == H.mind.nation.default_leader) H.mind.nation.current_leader = H.mind.current to_chat(H, "You have been chosen to lead the nation of [H.mind.nation.default_name]!") - continue to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.default_name]!") - continue if(H.mind.assigned_role in civilian_positions) to_chat(H, "You do not belong to any nation and are free to sell your services to the highest bidder.") - continue else @@ -170,7 +154,6 @@ datum/game_mode/nations if(!N.current_leader && N.membership.len) N.current_leader = pick(N.membership) to_chat(N.current_leader, "You have been chosen to lead the nation of [N.current_name]!") - if(N.current_leader) var/mob/living/carbon/human/H = N.current_leader H.verbs += /mob/living/carbon/human/proc/set_nation_name @@ -195,7 +178,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"atmosia") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in medical_positions) @@ -203,7 +185,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudmedistan") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in science_positions) @@ -211,7 +192,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudscientopia") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in security_positions) @@ -219,7 +199,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudbrigston") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in mode.cargonians) @@ -227,7 +206,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudcargonia") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in mode.servicion) @@ -235,7 +213,6 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudservice") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in (support_positions + command_positions)) @@ -243,12 +220,10 @@ datum/game_mode/nations mode.update_nations_icons_added(H,"hudcommand") H.mind.nation.membership += H.mind.current to_chat(H, "You are now part of the great sovereign nation of [H.mind.nation.current_name]!") - return 1 if(H.mind.assigned_role in civilian_positions) to_chat(H, "You do not belong to any nation and are free to sell your services to the highest bidder.") - return 1 if(H.mind.assigned_role == "AI") diff --git a/code/game/gamemodes/nations/nationsprocs.dm b/code/game/gamemodes/nations/nationsprocs.dm index 59ade854fd6..69b256458c2 100644 --- a/code/game/gamemodes/nations/nationsprocs.dm +++ b/code/game/gamemodes/nations/nationsprocs.dm @@ -17,7 +17,6 @@ H.mind.nation.current_name = input H.mind.nation.update_nation_id() to_chat(H, "You rename your nation to [input].") - H.verbs -= /mob/living/carbon/human/proc/set_nation_name return 1 @@ -46,7 +45,6 @@ H.mind.nation.member_rank = input H.mind.nation.update_nation_id() to_chat(H, "You changed the [type] rank of your nation to [input].") - return 1 /mob/living/carbon/human/proc/choose_heir() @@ -67,15 +65,12 @@ if(H.mind.nation.heir) var/mob/living/carbon/human/oldheir = H.mind.nation.heir to_chat(oldheir, "You are no longer the heir to your nation!") - oldheir.verbs -= /mob/living/carbon/human/proc/takeover var/mob/living/carbon/human/newheir = heir H.mind.nation.heir = newheir newheir.verbs += /mob/living/carbon/human/proc/takeover to_chat(newheir, "You have been selected to be the heir to your nation's leadership!") - to_chat(H, "You have selected [heir] to be your heir!") - H.mind.nation.update_nation_id() @@ -96,7 +91,6 @@ if(confirmation == "Yes") var/mob/living/carbon/human/oldleader = H.mind.nation.current_leader to_chat(oldleader, "You have been replaced by [H.name] as the leader of [H.mind.nation.current_name]!") - oldleader.verbs -= /mob/living/carbon/human/proc/set_nation_name oldleader.verbs -= /mob/living/carbon/human/proc/set_ranks oldleader.verbs -= /mob/living/carbon/human/proc/choose_heir @@ -107,7 +101,6 @@ H.verbs += /mob/living/carbon/human/proc/set_ranks H.verbs += /mob/living/carbon/human/proc/choose_heir to_chat(H, "You have replaced [oldleader.name] as the leader of [H.mind.nation.current_name]!") - H.mind.nation.update_nation_id() diff --git a/code/game/gamemodes/newobjective.dm b/code/game/gamemodes/newobjective.dm index 5171ec08c51..aae6d31261a 100644 --- a/code/game/gamemodes/newobjective.dm +++ b/code/game/gamemodes/newobjective.dm @@ -177,7 +177,6 @@ continue var/datum/objective/assassinate/objective = pickweight(killobjectives) to_chat(world, objective) - for(1 to 10) if(objective.points + total_weight <= 100 || !killobjectives.len) break diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 0704b9c9a17..8ad66fe7879 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -24,12 +24,9 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/nuclear/announce() to_chat(world, "The current game mode is - Nuclear Emergency!") - to_chat(world, "A [syndicate_name()] Strike Force is approaching [station_name()]!") - to_chat(world, "A nuclear explosive was being transported by Nanotrasen to a military base. The transport ship mysteriously lost contact with Space Traffic Control (STC). About that time a strange disk was discovered around [station_name()]. It was identified by Nanotrasen as a nuclear authentication disk and now Syndicate Operatives have arrived to retake the disk and detonate SS13! There are most likely Syndicate starships are in the vicinity, so take care not to lose the disk!\nSyndicate: Reclaim the disk and detonate the nuclear bomb anywhere on SS13.\nPersonnel: Hold the disk and escape with the disk on the shuttle!") - /datum/game_mode/nuclear/can_start()//This could be better, will likely have to recode it later if(!..()) return 0 @@ -175,12 +172,9 @@ proc/issyndicate(mob/living/M as mob) */ synd_mind.current.real_name = "[syndicate_name()] Team [leader_title]" to_chat(synd_mind.current, "You are the Syndicate leader for this mission. You are responsible for the distribution of telecrystals and your ID is the only one who can open the launch bay doors.") - to_chat(synd_mind.current, "If you feel you are not up to this task, give your ID to another operative.") - to_chat(synd_mind.current, "In your hand you will find a special item capable of triggering a greater challenge for your team. Examine it carefully and consult with your fellow operatives before activating it.") - var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge synd_mind.current.equip_to_slot_or_del(challenge, slot_r_hand) @@ -197,7 +191,6 @@ proc/issyndicate(mob/living/M as mob) if (nuke_code) synd_mind.store_memory("Syndicate Nuclear Bomb Code: [nuke_code]", 0, 0) to_chat(synd_mind.current, "The nuclear authorization code is: [nuke_code]") - var/obj/item/weapon/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" @@ -227,11 +220,9 @@ proc/issyndicate(mob/living/M as mob) /datum/game_mode/proc/greet_syndicate(var/datum/mind/syndicate, var/you_are=1) if (you_are) to_chat(syndicate.current, "\blue You are a [syndicate_name()] agent!") - var/obj_count = 1 for(var/datum/objective/objective in syndicate.objectives) to_chat(syndicate.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -325,66 +316,48 @@ proc/issyndicate(mob/living/M as mob) if (!disk_rescued && station_was_nuked && !syndies_didnt_escape) feedback_set_details("round_end_result","win - syndicate nuke") to_chat(world, "Syndicate Major Victory!") - to_chat(world, "[syndicate_name()] operatives have destroyed [station_name()]!") - else if (!disk_rescued && station_was_nuked && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - syndicate nuke - did not evacuate in time") to_chat(world, "Total Annihilation") - to_chat(world, "[syndicate_name()] operatives destroyed [station_name()] but did not leave the area in time and got caught in the explosion. Next time, don't lose the disk!") - else if (!disk_rescued && !station_was_nuked && nuke_off_station && !syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station") to_chat(world, "Crew Minor Victory") - to_chat(world, "[syndicate_name()] operatives secured the authentication disk but blew up something that wasn't [station_name()]. Next time, don't lose the disk!") - else if (!disk_rescued && !station_was_nuked && nuke_off_station && syndies_didnt_escape) feedback_set_details("round_end_result","halfwin - blew wrong station - did not evacuate in time") to_chat(world, "[syndicate_name()] operatives have earned Darwin Award!") - to_chat(world, "[syndicate_name()] operatives blew up something that wasn't [station_name()] and got caught in the explosion. Next time, don't lose the disk!") - else if ( disk_rescued && is_operatives_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk secured - syndi team dead") to_chat(world, "Crew Major Victory!") - to_chat(world, "The Research Staff has saved the disc and killed the [syndicate_name()] Operatives") - else if ( disk_rescued ) feedback_set_details("round_end_result","loss - evacuation - disk secured") to_chat(world, "Crew Major Victory") - to_chat(world, "The Research Staff has saved the disc and stopped the [syndicate_name()] Operatives!") - else if (!disk_rescued && is_operatives_are_dead()) feedback_set_details("round_end_result","loss - evacuation - disk not secured") to_chat(world, "Syndicate Minor Victory!") - to_chat(world, "The Research Staff failed to secure the authentication disk but did manage to kill most of the [syndicate_name()] Operatives!") - else if (!disk_rescued && crew_evacuated) feedback_set_details("round_end_result","halfwin - detonation averted") to_chat(world, "Syndicate Minor Victory!") - to_chat(world, "[syndicate_name()] operatives recovered the abandoned authentication disk but detonation of [station_name()] was averted. Next time, don't lose the disk!") - else if (!disk_rescued && !crew_evacuated) feedback_set_details("round_end_result","halfwin - interrupted") to_chat(world, "Neutral Victory") - to_chat(world, "Round was mysteriously interrupted!") - ..() return @@ -422,7 +395,6 @@ proc/issyndicate(mob/living/M as mob) text += "" to_chat(world, text) - return 1 /proc/nukelastname(var/mob/M as mob) //--All praise goes to NEO|Phyte, all blame goes to DH, and it was Cindi-Kate's idea. Also praise Urist for copypasta ho. @@ -435,7 +407,6 @@ proc/issyndicate(mob/living/M as mob) else if (newname == "Unknown" || newname == "floor" || newname == "wall" || newname == "rwall" || newname == "_") to_chat(M, "That name is reserved.") - return nukelastname(M) return newname diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index d8e252d97c8..c11b43f81ec 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -18,23 +18,19 @@ return if(player_list.len < MIN_CHALLENGE_PLAYERS) to_chat(user, "The enemy crew is too small to be worth declaring war on.") - return if(user.z != ZLEVEL_CENTCOMM) to_chat(user, "You have to be at your base to use this.") - return if(world.time > CHALLENGE_TIME_LIMIT) to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") - return declaring_war = 1 var/are_you_sure = alert(user, "Consult your team carefully before you declare war on [station_name()]]. Are you sure you want to alert the enemy crew?", "Declare war?", "Yes", "No") if(are_you_sure == "No") to_chat(user, "On second thought, the element of surprise isn't so bad after all.") - declaring_war = 0 return @@ -42,7 +38,6 @@ command_announcement.Announce(war_declaration, "Declaration of War", 'sound/effects/siren.ogg') to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") - for(var/obj/machinery/computer/shuttle/syndicate/S in machines) S.challenge = TRUE diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index b580622504f..85e6967f180 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -56,23 +56,19 @@ var/bomb_set panel_open = 1 overlays += image(icon, "npanel_open") to_chat(user, "You unscrew the control panel of [src].") - playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) else panel_open = 0 overlays -= image(icon, "npanel_open") to_chat(user, "You screw the control panel of [src] back on.") - playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) else if (panel_open == 0) to_chat(user, "[src] emits a buzzing noise, the panel staying locked in.") - if (panel_open == 1) panel_open = 0 overlays -= image(icon, "npanel_open") to_chat(user, "You screw the control panel of [src] back on.") - playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) flick("nuclearbombc", src) return @@ -96,7 +92,6 @@ var/bomb_set if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "\red You need more fuel to complete this task.") - return user.visible_message("[user] starts cutting loose the anchoring bolt covers on [src].", "You start cutting loose the anchoring bolt covers with [O]...") @@ -124,7 +119,6 @@ var/bomb_set if(!WT.isOn()) return if (WT.get_fuel() < 5) // uses up 5 fuel. to_chat(user, "\red You need more fuel to complete this task.") - return user.visible_message("[user] starts cutting apart the anchoring system sealant on [src].", "You start cutting apart the anchoring system's sealant with [O]...") @@ -224,11 +218,9 @@ var/bomb_set if (deployable) to_chat(usr, "\red You close several panels to make [src] undeployable.") - deployable = 0 else to_chat(usr, "\red You adjust some panels to make [src] deployable.") - deployable = 1 return @@ -288,7 +280,6 @@ var/bomb_set return if (safety) to_chat(usr, "\red The safety is still on.") - nanomanager.update_uis(src) return timing = !(timing) @@ -331,7 +322,6 @@ var/bomb_set else to_chat(usr, "There is nothing to anchor to!") - nanomanager.update_uis(src) /obj/machinery/nuclearbomb/ex_act(severity) @@ -382,14 +372,11 @@ var/bomb_set ticker.mode:nukes_left -- else if(off_station == 1) to_chat(world, "A nuclear device was set off, but the explosion was out of reach of the station!") - else if(off_station == 2) to_chat(world, "A nuclear device was set off, but the device was not on the station!") - else to_chat(world, "The station was destoyed by the nuclear blast!") - ticker.mode.station_was_nuked = (off_station<2) //offstation==1 is a draw. the station becomes irradiated and needs to be evacuated. //kinda shit but I couldn't get permission to do what I wanted to do. @@ -416,7 +403,6 @@ var/bomb_set var/turf/disk_loc = get_turf(src) if(disk_loc.z != ZLEVEL_STATION && disk_loc.z != ZLEVEL_CENTCOMM) to_chat(get(src, /mob), "You can't help but feel that you just lost something back there...") - qdel(src) /obj/item/weapon/disk/nuclear/Destroy() diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index 170c0aac8e9..320be6c9f98 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -22,13 +22,11 @@ active = 1 workdisk() to_chat(usr, "You activate the pinpointer.") - else active = 0 icon_state = "pinoff" to_chat(usr, "You deactivate the pinpointer.") - /obj/item/weapon/pinpointer/proc/scandisk() if(!the_disk) the_disk = locate() @@ -72,7 +70,6 @@ if(bomb.timing) to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.timeleft]") - /obj/item/weapon/pinpointer/advpinpointer name = "advanced pinpointer" desc = "A larger version of the normal pinpointer, this unit features a helpful quantum entanglement detection system to locate various objects that do not broadcast a locator signal." @@ -90,13 +87,11 @@ if(mode == 2) point_at(target) to_chat(usr, "You activate the pinpointer.") - else active = 0 icon_state = "pinoff" to_chat(usr, "You deactivate the pinpointer.") - /obj/item/weapon/pinpointer/advpinpointer/workdisk() if(mode == 0) scandisk() @@ -135,7 +130,6 @@ to_chat(usr, "You set the pinpointer to locate [locationx],[locationy]") - return attack_self() if("Disk Recovery") @@ -159,10 +153,8 @@ target = locate(item_paths[targetitem]) if(!target) to_chat(usr, "Failed to locate [targetitem]!") - return to_chat(usr, "You set the pinpointer to locate [targetitem].") - if("DNA") var/DNAstring = input("Input DNA string to search for." , "Please Enter String." , "") if(!DNAstring) @@ -190,17 +182,14 @@ if(!mode) workdisk() to_chat(user, "Authentication Disk Locator active.") - else worklocation() to_chat(user, "Shuttle Locator active.") - else active = 0 icon_state = "pinoff" to_chat(user, "You deactivate the pinpointer.") - /obj/item/weapon/pinpointer/nukeop/workdisk() if(!active) return if(mode) //Check in case the mode changes while operating @@ -271,19 +260,16 @@ /obj/item/weapon/pinpointer/operative/attack_self() if(!usr.mind || !(usr.mind in ticker.mode.syndicates)) to_chat(usr, "AUTHENTICATION FAILURE. ACCESS DENIED.") - return 0 if(!active) active = 1 workop() to_chat(usr, "You activate the pinpointer.") - else active = 0 icon_state = "pinoff" to_chat(usr, "You deactivate the pinpointer.") - /obj/item/weapon/pinpointer/operative/proc/scan_for_ops() if(active) nearest_op = null //Resets nearest_op every time it scans @@ -307,7 +293,5 @@ if(active) if(nearest_op) to_chat(user, "Nearest operative detected is [nearest_op.real_name].") - else to_chat(user, "No operatives detected within scanning range.") - diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 41edd787514..bbf0e5c9c73 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -34,11 +34,9 @@ /////////////////////////// /datum/game_mode/revolution/announce() to_chat(world, "The current game mode is - Revolution!") - to_chat(world, "Some crewmembers are attempting to start a revolution!
\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.
\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).") - /////////////////////////////////////////////////////////////////////////////// //Gets the round setup, cancelling if there's not enough players at the start// /////////////////////////////////////////////////////////////////////////////// @@ -130,7 +128,6 @@ rev_mind.objectives += rev_obj to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") - for(var/datum/mind/rev_mind in mode.revolutionaries) for(var/datum/mind/head_mind in heads) var/datum/objective/mutiny/rev_obj = new @@ -141,7 +138,6 @@ to_chat(rev_mind.current, "Additional Objective: Assassinate [head_mind.name], the [head_mind.assigned_role].") - /datum/game_mode/proc/forge_revolutionary_objectives(var/datum/mind/rev_mind) var/list/heads = get_living_heads() if(num_players_started() >= 30) @@ -158,10 +154,8 @@ var/obj_count = 1 if (you_are) to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") - for(var/datum/objective/objective in rev_mind.objectives) to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") - rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -175,7 +169,6 @@ if (mob.mind) if (mob.mind.assigned_role == "Clown") to_chat(mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") - mob.mutations.Remove(CLUMSY) @@ -191,10 +184,8 @@ var/where = mob.equip_in_one_of_slots(T, slots) if (!where) to_chat(mob, "The Syndicate were unfortunately unable to get you a flash.") - else to_chat(mob, "The flash in your [where] will help you to persuade the crew to join your cause.") - mob.update_icons() return 1 @@ -232,7 +223,6 @@ return 0 revolutionaries += rev_mind to_chat(rev_mind.current, "\red 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!") - rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) if(jobban_isbanned(rev_mind.current, ROLE_REV)) @@ -248,23 +238,19 @@ if(beingborged) to_chat(rev_mind.current, "\red The frame's firmware detects and deletes your neural reprogramming! You remember nothing from the moment you were flashed until now.") - message_admins("[key_name_admin(rev_mind.current)] has been borged while being a member of the revolution.") else to_chat(rev_mind.current, "\red You have been brainwashed! You are no longer a 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...") - update_rev_icons_removed(rev_mind) for(var/mob/living/M in view(rev_mind.current)) if(beingborged) to_chat(M, "The frame beeps contentedly, purging the hostile memory engram from the MMI before initalizing it.") - else to_chat(M, "[rev_mind.current] looks like they just remembered their real allegiance!") - ///////////////////////////////////// //Adds the rev hud to a new convert// ///////////////////////////////////// @@ -309,11 +295,9 @@ if(finished == 1) feedback_set_details("round_end_result","win - heads killed") to_chat(world, "\red The heads of staff were killed or abandoned the station! The revolutionaries win!") - else if(finished == 2) feedback_set_details("round_end_result","loss - rev heads killed") to_chat(world, "\red The heads of staff managed to stop the revolution!") - ..() return 1 @@ -343,7 +327,6 @@ to_chat(world, text) - if(revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution)) var/text = "The revolutionaries were:" @@ -365,7 +348,6 @@ to_chat(world, text) - if( head_revolutionaries.len || revolutionaries.len || istype(ticker.mode,/datum/game_mode/revolution) ) var/text = "The heads of staff were:" @@ -394,7 +376,6 @@ to_chat(world, text) - /proc/is_convertable_to_rev(datum/mind/mind) return istype(mind) && \ istype(mind.current, /mob/living/carbon/human) && \ diff --git a/code/game/gamemodes/revolution/rp_revolution.dm b/code/game/gamemodes/revolution/rp_revolution.dm index cea8e9d9d2d..78d210159a8 100644 --- a/code/game/gamemodes/revolution/rp_revolution.dm +++ b/code/game/gamemodes/revolution/rp_revolution.dm @@ -76,10 +76,8 @@ var/obj_count = 1 if (you_are) to_chat(rev_mind.current, "\blue You are a member of the revolutionaries' leadership!") - for(var/datum/objective/objective in rev_mind.objectives) to_chat(rev_mind.current, "Objective #[obj_count]: [objective.explanation_text]") - rev_mind.special_role = "Head Revolutionary" obj_count++ @@ -92,7 +90,6 @@ var/mob/living/carbon/human/M = get_nt_opposed() if(M && !(M.mind in head_revolutionaries) && !(M in already_considered)) to_chat(rev_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") - rev_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /////////////////////////////////////////////////// @@ -107,7 +104,6 @@ return 0 revolutionaries += rev_mind to_chat(rev_mind.current, "\red 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, capture or convert the heads to win the revolution!") - rev_mind.special_role = "Revolutionary" update_rev_icons_added(rev_mind) return 1 @@ -132,11 +128,9 @@ /////////////////////////// /datum/game_mode/revolution/rp_revolution/announce() to_chat(world, "The current game mode is - Revolution!") - to_chat(world, "Some crewmembers are attempting to start a revolution!") - ////////////////////////////////////////////////////////////////////// //Announces the end of the game with all relavent information stated// ////////////////////////////////////////////////////////////////////// @@ -144,11 +138,9 @@ if(finished == 1) feedback_set_details("round_end_result","win - heads overthrown") to_chat(world, "\red The heads of staff were overthrown! The revolutionaries win!") - else if(finished == 2) feedback_set_details("round_end_result","loss - revolution stopped") to_chat(world, "\red The heads of staff managed to stop the revolution!") - ..() return 1 @@ -168,37 +160,28 @@ Possible += P if(!Possible.len) to_chat(src, "\red There doesn't appear to be anyone available for you to convert here.") - return var/mob/living/carbon/human/M = input("Select a person to convert", "Viva la revolution!", null) as mob in Possible if(((src.mind in ticker.mode:head_revolutionaries) || (src.mind in ticker.mode:revolutionaries))) if((M.mind in ticker.mode:head_revolutionaries) || (M.mind in ticker.mode:revolutionaries)) to_chat(src, "\red [M] is already be a revolutionary!") - else if(!ticker.mode:is_convertible(M)) to_chat(src, "\red [M] is implanted with a loyalty implant - Remove it first!") - else if(world.time < M.mind.rev_cooldown) to_chat(src, "\red Wait five seconds before reconversion attempt.") - return to_chat(src, "\red Attempting to convert [M]...") - log_admin("[src]([src.ckey]) attempted to convert [M].") message_admins("\red [src]([src.ckey]) attempted to convert [M].") var/choice = alert(M,"Asked by [src]: Do you want to join the revolution?","Align Thyself with the Revolution!","No!","Yes!") if(choice == "Yes!") ticker.mode:add_revolutionary(M.mind) to_chat(M, "\blue You join the revolution!") - to_chat(src, "\blue [M] joins the revolution!") - else if(choice == "No!") to_chat(M, "\red You reject this traitorous cause!") - to_chat(src, "\red [M] does not support the revolution!") - M.mind.rev_cooldown = world.time+50 /datum/game_mode/revolution/rp_revolution/process() @@ -226,7 +209,6 @@ H.verbs += /mob/living/carbon/human/proc/RevConvert to_chat(H, "\red Congratulations, yer heads of revolution are all gone now, so yer earned yourself a promotion.") - added_heads = 1 break @@ -261,7 +243,6 @@ comm.messagetext.Add(message) to_chat(world, sound('sound/AI/commandreport.ogg')) - /datum/game_mode/revolution/rp_revolution/latespawn(mob/M) if(M.mind.assigned_role in command_positions) log_debug("Adding head kill/capture/convert objective for [M.name]") @@ -274,4 +255,3 @@ rev_obj.explanation_text = "Assassinate, convert or capture [M.real_name], the [M.mind.assigned_role]." rev_mind.objectives += rev_obj to_chat(rev_mind.current, "\red A new Head of Staff, [M.real_name], the [M.mind.assigned_role] has appeared. Your objectives have been updated.") - diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index b21e7101a82..4d061d37eca 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -53,12 +53,10 @@ datum/hSB if(!admin) return if(hsboxspawn) to_chat(world, "Sandbox: [usr.key] has disabled object spawning!") - hsboxspawn = 0 return if(!hsboxspawn) to_chat(world, "Sandbox: [usr.key] has enabled object spawning!") - hsboxspawn = 1 return if("hsbsuit") @@ -108,7 +106,6 @@ datum/hSB hsb.loc = usr.loc to_chat(usr, "Sandbox: Created an airlock.") - if("hsbcanister") var/list/hsbcanisters = subtypesof(/obj/machinery/portable_atmospherics/canister/) var/hsbcanister = input(usr, "Choose a canister to spawn.", "Sandbox:") in hsbcanisters + "Cancel" diff --git a/code/game/gamemodes/sandbox/sandbox.dm b/code/game/gamemodes/sandbox/sandbox.dm index 8f02b2df6a7..1be9a0ced0e 100644 --- a/code/game/gamemodes/sandbox/sandbox.dm +++ b/code/game/gamemodes/sandbox/sandbox.dm @@ -8,10 +8,8 @@ /datum/game_mode/sandbox/announce() to_chat(world, "The current game mode is - Sandbox!") - to_chat(world, "Build your own station with the sandbox-panel command!") - /datum/game_mode/sandbox/pre_setup() for(var/mob/M in player_list) M.CanBuild() diff --git a/code/game/gamemodes/scoreboard.dm b/code/game/gamemodes/scoreboard.dm index 19f7f4905cc..44adae0d98a 100644 --- a/code/game/gamemodes/scoreboard.dm +++ b/code/game/gamemodes/scoreboard.dm @@ -149,9 +149,7 @@ // Show the score - might add "ranks" later to_chat(world, "The crew's final score is:") - to_chat(world, "[score_crewscore]") - for(var/mob/E in player_list) if(E.client) if(E.client.prefs && !(E.client.prefs.toggles & DISABLE_SCOREBOARD)) diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index 46fbc47a5df..ef098c87f91 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -77,10 +77,8 @@ 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 eat or enthrall the crew. Shadowlings: Enthrall the crew while remaining in hiding.") - /datum/game_mode/shadowling/pre_setup() if(config.protect_roles_from_antagonist) restricted_jobs += protected_jobs @@ -108,9 +106,7 @@ Made by Xhuis log_game("[shadow.key] (ckey) has been selected as a Shadowling.") sleep(10) to_chat(shadow.current, "
") - to_chat(shadow.current, "You are a shadowling!") - greet_shadow(shadow) finalize_shadowling(shadow) process_shadow_objectives(shadow) @@ -125,7 +121,6 @@ Made by Xhuis - /datum/game_mode/proc/process_shadow_objectives(var/datum/mind/shadow_mind) var/objective = "enthrall" //may be devour later, but for now it seems murderbone-y @@ -136,7 +131,6 @@ Made by Xhuis to_chat(shadow_mind.current, "Objective #1: [objective_explanation]
") - /datum/game_mode/proc/finalize_shadowling(var/datum/mind/shadow_mind) var/mob/living/carbon/human/S = shadow_mind.current shadow_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_hatch) @@ -145,7 +139,6 @@ Made by Xhuis update_shadow_icons_added(shadow_mind) if(shadow_mind.assigned_role == "Clown") to_chat(S, "Your alien nature has allowed you to overcome your clownishness.") - S.mutations.Remove(CLUMSY) /datum/game_mode/proc/add_thrall(datum/mind/new_thrall_mind) @@ -161,17 +154,11 @@ Made by Xhuis new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/lesser_shadow_walk) new_thrall_mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall) to_chat(new_thrall_mind.current, "You see the truth. Reality has been torn away and you realize what a fool you've been.") - to_chat(new_thrall_mind.current, "The shadowlings are your masters. Serve them above all else and ensure they complete their goals.") - to_chat(new_thrall_mind.current, "You may not harm other thralls or the shadowlings. However, you do not need to obey other thralls.") - to_chat(new_thrall_mind.current, "Your body has been irreversibly altered. The attentive can see this - you may conceal it by wearing a mask.") - to_chat(new_thrall_mind.current, "Though not nearly as powerful as your masters, you possess some weak powers. These can be found in the Thrall Abilities tab.") - to_chat(new_thrall_mind.current, "You may communicate with your allies by speaking in the Shadowling Hivemind (:8).") - if(jobban_isbanned(new_thrall_mind.current, ROLE_SHADOWLING)) replace_jobbaned_player(new_thrall_mind.current, ROLE_SHADOWLING) @@ -255,16 +242,12 @@ Made by Xhuis /datum/game_mode/shadowling/declare_completion() if(check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) //Doesn't end instantly - this is hacky and I don't know of a better way ~X to_chat(world, "The shadowlings have ascended and taken over the station!") - else if(shadowling_dead && !check_shadow_victory()) //If the shadowlings have ascended, they can not lose the round to_chat(world, "The shadowlings have been killed by the crew!") - else if(!check_shadow_victory() && shuttle_master.emergency.mode >= SHUTTLE_ESCAPE) to_chat(world, "The crew escaped the station before the shadowlings could ascend!") - else to_chat(world, "The shadowlings have failed!") - ..() return 1 @@ -304,7 +287,6 @@ Made by Xhuis to_chat(world, text) - /* MISCELLANEOUS */ @@ -339,9 +321,7 @@ Made by Xhuis if(H.stat != DEAD) to_chat(H, "The light burns you!")//Message spam to say "GET THE FUCK OUT" - to_chat(H, 'sound/weapons/sear.ogg') - else if(light_amount < LIGHT_HEAL_THRESHOLD) H.heal_overall_damage(5, 5) H.adjustToxLoss(-5) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 6fa19dc30a2..5421789c0ea 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -6,13 +6,10 @@ if(H.get_species() == "Lesser Shadowling" && is_thrall(H)) return 1 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.") - return 0 @@ -28,7 +25,6 @@ for(var/mob/living/carbon/human/target in targets) if(!ishuman(target)) to_chat(usr, "You may only glare at humans!") - charge_counter = charge_max return if(!shadowling_check(usr)) @@ -36,12 +32,10 @@ return if(target.stat) to_chat(usr, "[target] must be conscious!") - charge_counter = charge_max return if(is_shadow_or_thrall(target)) to_chat(usr, "You don't see why you would want to paralyze an ally.") - charge_counter = charge_max return var/mob/living/carbon/human/M = target @@ -49,10 +43,8 @@ target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by their heavenly beauty...") - else //Only alludes to the shadowling if the target is close by to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by the heavenly lights...") - target.Stun(10) M.silent += 10 @@ -69,17 +61,14 @@ for(var/mob/living/carbon/human/target in targets) if(!ishuman(target) || !target) to_chat(usr, "You nay only glare at humans!") - charge_counter = charge_max return if(target.stat) to_chat(usr, "[target] must be conscious!") - charge_counter = charge_max return if(is_shadow_or_thrall(target)) to_chat(usr, "You cannot glare at allies!") - charge_counter = charge_max return var/mob/living/carbon/human/M = target @@ -87,10 +76,8 @@ target.visible_message("[target] freezes in place, their eyes glazing over...") if(in_range(target, usr)) to_chat(target, "Your gaze is forcibly drawn into [usr]'s eyes, and you are mesmerized by the heavenly lights...") - else to_chat(target, "Red lights suddenly dance in your vision, and you are mesmerized by their heavenly beauty...") - target.Stun(3) //Roughly 30% as long as the normal one M.silent += 3 @@ -156,7 +143,6 @@ charge_counter = charge_max return to_chat(usr, "You silently disable all nearby lights.") - for(var/obj/effect/glowshroom/G in orange(2, usr)) //Why the fuck was this in the loop below? G.visible_message("\The [G] withers away!") qdel(G) @@ -251,11 +237,9 @@ var/mob/living/carbon/human/H = user if(!H.vision_type) to_chat(H, "You shift the nerves in your eyes, allowing you to see in the dark.") - H.vision_type = new vision_path else to_chat(H, "You return your vision to normal.") - H.vision_type = null /obj/effect/proc_holder/spell/targeted/shadow_vision/thrall @@ -277,7 +261,6 @@ charge_counter = charge_max return to_chat(usr, "You freeze the nearby air.") - playsound(usr.loc, 'sound/effects/ghost2.ogg', 50, 1) for(var/turf/T in targets) @@ -287,10 +270,8 @@ continue else to_chat(M, "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!") - M.Stun(2) M.apply_damage(10, BURN) if(M.bodytemperature) @@ -321,89 +302,68 @@ for(var/mob/living/carbon/human/target in targets) if(!in_range(usr, target)) to_chat(usr, "You need to be closer to enthrall [target].") - charge_counter = charge_max return if(!target.key || !target.mind) to_chat(usr, "The target has no mind.") - charge_counter = charge_max return if(target.stat) to_chat(usr, "The target must be conscious.") - charge_counter = charge_max return if(is_shadow_or_thrall(target)) to_chat(usr, "You can not enthrall allies.") - charge_counter = charge_max return if(!ishuman(target)) to_chat(usr, "You can only enthrall humans.") - charge_counter = charge_max return if(enthralling) to_chat(usr, "You are already enthralling!") - charge_counter = charge_max return if(!target.client) to_chat(usr, "[target]'s mind is vacant of activity.") - enthralling = 1 to_chat(usr, "This target is valid. You begin the enthralling.") - to_chat(target, "[usr] stares at you. You feel your head begin to pulse.") - for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) to_chat(usr, "You place your hands to [target]'s head...") - usr.visible_message("[usr] places their hands onto the sides of [target]'s head!") if(2) to_chat(usr, "You begin preparing [target]'s mind as a blank slate...") - usr.visible_message("[usr]'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.") - target.Weaken(12) sleep(20) if(isloyal(target)) to_chat(usr, "They are enslaved by Nanotrasen. You begin to shut down the nanobot implant - this will take some time.") - usr.visible_message("[usr] pauses, then dips their head in concentration!") to_chat(target, "You feel your loyalties begin to weaken!") - sleep(100) //10 seconds - not spawn() so the enthralling takes longer to_chat(usr, "The nanobots composing the loyalty implant have been rendered inert. Now to continue.") - usr.visible_message("[usr] relaxes again.") for(var/obj/item/weapon/implant/loyalty/L in target) if(L && L.implanted) qdel(L) to_chat(target, "Your unwavering loyalty to Nanotrasen unexpectedly falters, dims, dies.") - if(3) to_chat(usr, "You begin planting the tumor that will control the new thrall...") - usr.visible_message("A strange energy passes from [usr]'s hands into [target]'s head!") to_chat(target, "You feel your memories twisting, morphing. A sense of horror dominates your mind.") - if(!do_mob(usr, target, 70)) //around 21 seconds total for enthralling, 31 for someone with a loyalty implant to_chat(usr, "The enthralling has been interrupted - your target's mind returns to its previous state.") - to_chat(target, "You wrest yourself away from [usr]'s hands and compose yourself") - enthralling = 0 return enthralling = 0 to_chat(usr, "You have enthralled [target]!") - target.visible_message("[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 @@ -423,7 +383,6 @@ /obj/effect/proc_holder/spell/targeted/shadowling_regenarmor/cast(list/targets) if(!is_shadow(usr)) to_chat(usr, "You must be a shadowling to do this!") - charge_counter = charge_max return for(var/mob/living/user in targets) @@ -467,22 +426,18 @@ to_chat(user, "You focus your telepathic energies abound, harnessing and drawing together the strength of your thralls.") - for(M in living_mob_list) if(is_thrall(M)) thralls++ to_chat(M, "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.") - return if(thralls >= 3 && !screech_acquired) screech_acquired = 1 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.") - user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/unearthly_screech) if(thralls >= 5 && !blind_smoke_acquired) @@ -494,7 +449,6 @@ if(thralls >= 7 && !drainLifeAcquired) drainLifeAcquired = 1 to_chat(user, "The power of your thralls has granted you the Drain Life ability. You can now drain the health of nearby humans to heal yourself.") - user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/drainLife) if(thralls >= 9 && !reviveThrallAcquired) @@ -506,12 +460,9 @@ 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.") - else if(thralls >= victory_threshold) to_chat(usr, "You are now powerful enough to ascend. Use the Ascendance ability when you are ready. This will kill all of your thralls.") - to_chat(usr, "You may find Ascendance in the Shadowling Evolution tab.") - for(M in living_mob_list) if(is_shadow(M)) var/obj/effect/proc_holder/spell/targeted/collective_mind/CM @@ -522,14 +473,12 @@ M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/shadowling_ascend) if(M == usr) to_chat(M, "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 - /obj/effect/proc_holder/spell/targeted/blindness_smoke name = "Blindness Smoke" desc = "Spews a cloud of smoke which will blind enemies." @@ -547,7 +496,6 @@ for(var/mob/living/user in targets) user.visible_message("[user] suddenly bends over and coughs out a cloud of black smoke, which begins to spread rapidly!") to_chat(user, "You regurgitate a vast cloud of blinding smoke.") - playsound(user, 'sound/effects/bamf.ogg', 50, 1) var/obj/item/weapon/reagent_containers/glass/beaker/large/B = new /obj/item/weapon/reagent_containers/glass/beaker/large(user.loc) B.reagents.clear_reagents() //Just in case! @@ -572,14 +520,12 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(!is_shadow_or_thrall(M)) to_chat(M, "You breathe in the black smoke, and your eyes burn horribly!") - M.eye_blind = 5 if(prob(25)) M.visible_message("[M] claws at their eyes!") M.Stun(3) else to_chat(M, "You breathe in the black smoke, and you feel revitalized!") - M.heal_organ_damage(2,2) M.adjustOxyLoss(-2) M.adjustToxLoss(-2) @@ -614,15 +560,12 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(iscarbon(target)) var/mob/living/carbon/M = target to_chat(M, "A spike of pain drives into your head and scrambles your thoughts!") - M.confused += 10 M.ear_damage += 3 else if(issilicon(target)) var/mob/living/silicon/S = target to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") - to_chat(S, 'sound/misc/interference.ogg') - 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) @@ -659,7 +602,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!targetsDrained) charge_counter = charge_max to_chat(usr, "There were no nearby humans for you to drain.") - return for(var/mob/living/carbon/M in nearbyTargets) U.heal_organ_damage(10, 10) @@ -671,12 +613,10 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) M.adjustOxyLoss(20) M.adjustStaminaLoss(20) to_chat(M, "You feel a wave of exhaustion and a curious draining sensation directed towards [usr]!") - to_chat(usr, "You draw life from those around you to heal your wounds.") - /obj/effect/proc_holder/spell/targeted/reviveThrall name = "Black Recuperation" desc = "Revives or empowers a thrall." @@ -697,17 +637,14 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if("Empower") if(!is_thrall(thrallToRevive)) to_chat(usr, "[thrallToRevive] is not a thrall.") - charge_counter = charge_max return if(thrallToRevive.stat != CONSCIOUS) to_chat(usr, "[thrallToRevive] must be conscious to become empowered.") - charge_counter = charge_max return if(thrallToRevive.get_species() == "Lesser Shadowling") to_chat(usr, "[thrallToRevive] is already empowered.") - charge_counter = charge_max return var/empowered_thralls = 0 @@ -719,20 +656,16 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) empowered_thralls++ if(empowered_thralls >= EMPOWERED_THRALL_LIMIT) to_chat(usr, "You cannot spare this much energy. There are too many empowered thralls.") - charge_counter = charge_max return usr.visible_message("[usr] 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, "[usr] places their hands over your face. You feel energy gathering. Stand still...") - if(!do_mob(usr, thrallToRevive, 80)) to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") - charge_counter = charge_max return to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") - usr.visible_message("Red lightning surges into [thrallToRevive]'s face!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -752,12 +685,10 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if("Revive") if(!is_thrall(thrallToRevive)) to_chat(usr, "[thrallToRevive] is not a thrall.") - charge_counter = charge_max return if(thrallToRevive.stat != DEAD) to_chat(usr, "[thrallToRevive] is not dead.") - charge_counter = charge_max return usr.visible_message("[usr] kneels over [thrallToRevive], placing their hands on \his chest.", \ @@ -765,11 +696,9 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) 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(usr, thrallToRevive, 30)) to_chat(usr, "Your concentration snaps. The flow of energy ebbs.") - charge_counter = charge_max return to_chat(usr, "You release a massive surge of power into [thrallToRevive]!") - usr.visible_message("Red lightning surges from [usr]'s hands into [thrallToRevive]'s chest!") playsound(thrallToRevive, 'sound/weapons/Egloves.ogg', 50, 1) playsound(thrallToRevive, 'sound/machines/defib_zap.ogg', 50, 1) @@ -804,12 +733,10 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) return if(!is_thrall(target)) to_chat(usr, "[target] must be a thrall.") - charge_counter = charge_max return if(shuttle_master.emergency.mode != SHUTTLE_CALL) to_chat(usr, "The shuttle must be inbound only to the station.") - charge_counter = charge_max return var/mob/living/carbon/human/M = target @@ -819,12 +746,9 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) "You are suddenly transported... far, far away...") if(!do_after(usr, 50, target = M)) to_chat(M, "You are snapped back to reality, your haze dissipating!") - to_chat(usr, "You have been interrupted. The draw has failed.") - return to_chat(usr, "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.", \ "...speeding by... ...pretty blue glow... ...touch it... ...no glow now... ...no light... ...nothing at all...") M.death() @@ -852,7 +776,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) to_chat(usr, "You are not in the same plane of existence. Unphase first.") - charge_counter = charge_max return @@ -860,7 +783,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) for(var/mob/living/boom in targets) if(is_shadow(boom)) //Used to not work on thralls. Now it does so you can PUNISH THEM LIKE THE WRATHFUL GOD YOU ARE. to_chat(usr, "Making an ally explode seems unwise.") - charge_counter = charge_max return usr.visible_message("[usr]'s markings flare as they gesture at [boom]!", \ @@ -887,35 +809,28 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(SHA.phasing) charge_counter = charge_max to_chat(usr, "You are not in the same plane of existence. Unphase first.") - return for(var/mob/living/carbon/human/target in targets) if(is_shadow_or_thrall(target)) to_chat(usr, "You cannot enthrall an ally.") - charge_counter = charge_max return if(!target.ckey || !target.mind) to_chat(usr, "The target has no mind.") - charge_counter = charge_max return if(target.stat) to_chat(usr, "The target must be conscious.") - charge_counter = charge_max return if(!ishuman(target)) to_chat(usr, "You can only enthrall humans.") - charge_counter = charge_max return to_chat(usr, "You instantly rearrange [target]'s memories, hyptonitizing them into a thrall.") - to_chat(target, "An agonizing spike of pain drives into your mind, and--") - ticker.mode.add_thrall(target.mind) target.mind.special_role = "shadowling thrall" target.add_language("Shadowling Hivemind") @@ -962,7 +877,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) var/mob/living/simple_animal/ascendant_shadowling/SHA = usr if(SHA.phasing) to_chat(usr, "You are not in the same plane of existence. Unphase first.") - charge_counter = charge_max return @@ -974,7 +888,6 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(is_shadow_or_thrall(target)) continue to_chat(target, "You are struck by a bolt of lightning!") - playsound(target, 'sound/magic/LightningShock.ogg', 50, 1) target.Weaken(8) target.take_organ_damage(0,50) @@ -996,4 +909,3 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) if(!text) return to_chat(world, "\"[text]\"") - diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 0d514ff1005..80be87570f2 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -15,14 +15,12 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N return if(!isturf(usr.loc)) to_chat(usr, "You can't hatch here!") - return for(var/mob/living/carbon/human/H in targets) 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.") - charge_counter = charge_max return if("Yes") @@ -58,15 +56,12 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(80) playsound(H.loc, 'sound/weapons/slash.ogg', 25, 1) to_chat(H, "You rip and slice.") - sleep(10) playsound(H.loc, 'sound/weapons/slashmiss.ogg', 25, 1) to_chat(H, "The chrysalis falls like water before you.") - sleep(10) playsound(H.loc, 'sound/weapons/slice.ogg', 25, 1) to_chat(H, "You are free!") - H.status_flags = temp_flags sleep(10) playsound(H.loc, 'sound/effects/ghost.ogg', 100, 1) @@ -77,7 +72,6 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N H.SetStunned(0) to_chat(H, "YOU LIVE!!!") - for(var/obj/structure/alien/resin/wall/shadowling/W in orange(H, 1)) playsound(W, 'sound/effects/splat.ogg', 50, 1) qdel(W) @@ -102,7 +96,6 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(10) to_chat(H, "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/shadow_vision) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/enthrall) H.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/glare) @@ -132,7 +125,6 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N switch(hatch_or_no) if("No") to_chat(H, "You decide against ascending for now.") - charge_counter = charge_max return if("Yes") @@ -155,22 +147,16 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N sleep(40) to_chat(H, "Yes!") - sleep(10) to_chat(H, "YES!!") - sleep(10) to_chat(H, "YE--") - sleep(1) for(var/mob/living/M in orange(7, H)) M.Weaken(10) to_chat(M, "An immense pressure slams you onto the ground!") - to_chat(world, "\"VYSHA NERADA YEKHEZET U'RUU!!\"") - to_chat(world, 'sound/hallucinations/veryfar_noise.ogg') - for(var/obj/machinery/power/apc/A in apcs) A.overload_lighting() var/mob/A = new /mob/living/simple_animal/ascendant_shadowling(H.loc) diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm index 497664cc76f..c0d0edf89e3 100644 --- a/code/game/gamemodes/traitor/traitor.dm +++ b/code/game/gamemodes/traitor/traitor.dm @@ -26,11 +26,9 @@ /datum/game_mode/traitor/announce() to_chat(world, "The current game mode is - Traitor!") - to_chat(world, "There is a syndicate traitor on the station. Do not let the traitor succeed!") - /datum/game_mode/traitor/pre_setup() if(config.protect_roles_from_antagonist) @@ -175,11 +173,9 @@ /datum/game_mode/proc/greet_traitor(var/datum/mind/traitor) to_chat(traitor.current, "You are the traitor.") - var/obj_count = 1 for(var/datum/objective/objective in traitor.objectives) to_chat(traitor.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -206,26 +202,20 @@ /datum/game_mode/proc/give_codewords(mob/living/traitor_mob) to_chat(traitor_mob, "The Syndicate provided you with the following information on how to identify their agents:") - to_chat(traitor_mob, "Code Phrase: [syndicate_code_phrase]") - to_chat(traitor_mob, "Code Response: [syndicate_code_response]") - traitor_mob.mind.store_memory("Code Phrase: [syndicate_code_phrase]") traitor_mob.mind.store_memory("Code Response: [syndicate_code_response]") to_chat(traitor_mob, "Use the code words in the order provided, during regular conversation, to identify other agents. Proceed with caution, however, as everyone is a potential foe.") - /datum/game_mode/proc/add_law_zero(mob/living/silicon/ai/killer) var/law = "Accomplish your objectives at all costs." var/law_borg = "Accomplish your AI's objectives at all costs." to_chat(killer, "Your laws have been changed!") - killer.set_zeroth_law(law, law_borg) to_chat(killer, "New law: 0. [law]") - give_codewords(killer) @@ -288,7 +278,6 @@ to_chat(world, text) - return 1 @@ -299,7 +288,6 @@ if (traitor_mob.mind) if (traitor_mob.mind.assigned_role == "Clown") to_chat(traitor_mob, "Your training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself.") - traitor_mob.mutations.Remove(CLUMSY) // find a radio! toolbox(es), backpack, belt, headset @@ -309,7 +297,6 @@ if (!R) to_chat(traitor_mob, "Unfortunately, the Syndicate wasn't able to get you a radio.") - . = 0 else if (istype(R, /obj/item/device/radio)) @@ -330,7 +317,6 @@ T.uplink_owner = "[traitor_mob.key]" target_radio.traitor_frequency = freq to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply dial the frequency [format_frequency(freq)] to unlock its hidden features.") - traitor_mob.mind.store_memory("Radio Freq: [format_frequency(freq)] ([R.name] [T.loc]).") else if (istype(R, /obj/item/device/pda)) // generate a passcode if the uplink is hidden in a PDA @@ -343,7 +329,6 @@ P.lock_code = pda_pass to_chat(traitor_mob, "The Syndicate have cunningly disguised a Syndicate Uplink as your [R.name] [T.loc]. Simply enter the code \"[pda_pass]\" into the ringtone select to unlock its hidden features.") - traitor_mob.mind.store_memory("Uplink Passcode: [pda_pass] ([R.name] [T.loc]).") if(!safety)//If they are not a rev. Can be added on to. give_codewords(traitor_mob) @@ -352,7 +337,6 @@ var/mob/living/carbon/human/M = get_nt_opposed() if(M && M != traitor_mob) to_chat(traitor_mob, "We have received credible reports that [M.real_name] might be willing to help our cause. If you need assistance, consider contacting them.") - traitor_mob.mind.store_memory("Potential Collaborator: [M.real_name]") /datum/game_mode/proc/update_traitor_icons_added(datum/mind/traitor_mind) @@ -383,10 +367,8 @@ update_traitor_icons_removed(traitor_mind) // to_chat(world, "Removed [traitor_mind.current.name] from traitor shit") - to_chat(traitor_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were implanted until now.(You don't remember who implanted you)") - /datum/game_mode/proc/assign_exchange_role(var/datum/mind/owner) //set faction var/faction = "red" @@ -427,5 +409,4 @@ if (equipped_slot) where = "In your [equipped_slot]" to_chat(mob, "

[where] is a folder containing secret documents that another Syndicate group wants. We have set up a meeting with one of their agents on station to make an exchange. Exercise extreme caution as they cannot be trusted and may be hostile.
") - mob.update_icons() diff --git a/code/game/gamemodes/vampire/vampire.dm b/code/game/gamemodes/vampire/vampire.dm index a0bdfe7fbdf..1abed5ba4dd 100644 --- a/code/game/gamemodes/vampire/vampire.dm +++ b/code/game/gamemodes/vampire/vampire.dm @@ -39,10 +39,8 @@ /datum/game_mode/vampire/announce() to_chat(world, "The current game mode is - Vampires!") - to_chat(world, "There are Vampires from Space Transylvania on the station, keep your blood close and neck safe!") - /datum/game_mode/vampire/pre_setup() if(config.protect_roles_from_antagonist) @@ -119,7 +117,6 @@ text += "
The [special_role_text] has failed!" feedback_add_details("traitor_success","FAIL") to_chat(world, text) - return 1 /datum/game_mode/proc/auto_declare_completion_enthralled() @@ -138,7 +135,6 @@ text += "body destroyed" text += ")" to_chat(world, text) - return 1 /datum/game_mode/proc/forge_vampire_objectives(var/datum/mind/vampire) @@ -185,20 +181,16 @@ dat += {"To bite someone, target the head and use harm intent with an empty hand. Drink blood to gain new powers. You are weak to holy things and starlight. Don't go into space and avoid the Chaplain, the chapel and especially Holy Water."} to_chat(vampire.current, dat) - to_chat(vampire.current, "You must complete the following tasks:") - if (vampire.current.mind) if (vampire.current.mind.assigned_role == "Clown") to_chat(vampire.current, "Your lust for blood has allowed you to overcome your clumsy nature allowing you to wield weapons without harming yourself.") - vampire.current.mutations.Remove(CLUMSY) var/obj_count = 1 for(var/datum/objective/objective in vampire.objectives) to_chat(vampire.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -289,13 +281,11 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha while(do_mob(owner, H, 50)) if(!(owner.mind in ticker.mode.vampires)) to_chat(owner, "Your fangs have disappeared!") - return old_bloodtotal = bloodtotal old_bloodusable = bloodusable if(!H.vessel.get_reagent_amount("blood")) to_chat(src, "They've got no blood left to give.") - break if(H.stat < DEAD) blood = min(20, H.vessel.get_reagent_amount("blood")) // if they have less than 20 blood, give them the remnant else they get 20 blood @@ -306,7 +296,6 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha bloodtotal += blood if(old_bloodtotal != bloodtotal) to_chat(owner, "You have accumulated [bloodtotal] [bloodtotal > 1 ? "units" : "unit"] of blood[bloodusable != old_bloodusable ? ", and have [bloodusable] left to use" : ""].") - check_vampire_upgrade() H.vessel.remove_reagent("blood", 25) if(ishuman(owner)) @@ -316,7 +305,6 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha draining = null to_chat(owner, "You stop draining [H.name] of blood.") - /datum/vampire/proc/check_vampire_upgrade(announce = 1) var/list/old_powers = powers.Copy() @@ -334,12 +322,10 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha if(istype(p, /obj/effect/proc_holder/spell/vampire)) var/obj/effect/proc_holder/spell/vampire/power = p to_chat(owner, "[power.gain_desc]") - else if(istype(p, /datum/vampire_passive)) var/datum/vampire_passive/power = p to_chat(owner, "[power.gain_desc]") - //prepare for copypaste /datum/game_mode/proc/update_vampire_icons_added(datum/mind/vampire_mind) var/datum/atom_hud/antag/vamp_hud = huds[ANTAG_HUD_VAMPIRE] @@ -366,10 +352,8 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha slaved.leave_serv_hud(vampire_mind) update_vampire_icons_removed(vampire_mind) // to_chat(world, "Removed [vampire_mind.current.name] from vampire shit") - to_chat(vampire_mind.current, "\red The fog clouding your mind clears. You remember nothing from the moment you were enthralled until now.") - /datum/vampire/proc/check_sun() var/ax = owner.x var/ay = owner.y @@ -429,17 +413,13 @@ You are weak to holy things and starlight. Don't go into space and avoid the Cha switch(owner.health) if(80 to 100) to_chat(owner, "Your skin flakes away...") - if(60 to 80) to_chat(owner, "Your skin sizzles!") - if((-INFINITY) to 60) if(!owner.on_fire) to_chat(owner, "Your skin catches fire!") - else to_chat(owner, "You continue to burn!") - owner.fire_stacks += 5 owner.IgniteMob() owner.emote("scream") diff --git a/code/game/gamemodes/vampire/vampire_powers.dm b/code/game/gamemodes/vampire/vampire_powers.dm index 48fd3034cbe..a7e470ef056 100644 --- a/code/game/gamemodes/vampire/vampire_powers.dm +++ b/code/game/gamemodes/vampire/vampire_powers.dm @@ -20,7 +20,6 @@ return 0 if(!ishuman(user)) to_chat(user, "You are in too weak of a form to do this!") - return 0 var/datum/vampire/vampire = user.mind.vampire @@ -32,21 +31,17 @@ if(user.stat >= DEAD) to_chat(user, "Not when you're dead!") - return 0 if(vampire.nullified && !fullpower) to_chat(user, "Something is blocking your powers!") - return 0 if(vampire.bloodusable < required_blood) to_chat(user, "You require at least [required_blood] units of usable blood to do that!") - return 0 //chapel check if(istype(loc.loc, /area/chapel) && !fullpower) to_chat(user, "Your powers are useless on this holy ground.") - return 0 return ..() @@ -112,7 +107,6 @@ if(targets.len) to_chat(usr, "You have [vampire.bloodusable] left to use.") - /obj/effect/proc_holder/spell/vampire/targetted/choose_targets(mob/user = usr) var/list/possible_targets[0] for(var/mob/living/carbon/C in oview_or_orange(range, user, selection_type)) @@ -164,7 +158,6 @@ usr.SetParalysis(0) U.adjustStaminaLoss(-75) to_chat(usr, "You flush your system with clean blood and remove any incapacitating effects.") - spawn(1) if(usr.mind.vampire.get_ability(/datum/vampire_passive/regen)) for(var/i = 1 to 5) @@ -186,14 +179,10 @@ if(do_mob(usr, target, 50)) if(!affects(target)) to_chat(usr, "Your piercing gaze fails to knock out [target].") - to_chat(target, "\blue [usr]'s feeble gaze is ineffective.") - else to_chat(usr, "Your piercing gaze knocks out [target].") - to_chat(target, "You find yourself unable to move and barely able to speak.") - target.Weaken(10) target.Stun(10) target.stuttering = 10 @@ -201,7 +190,6 @@ revert_cast(usr) to_chat(usr, "You broke your gaze.") - /obj/effect/proc_holder/spell/vampire/targetted/disease name = "Diseased Touch (100)" desc = "Touches your victim with infected blood giving them appendicitis, which will, left untreated, cause a slow death by poison." @@ -212,11 +200,9 @@ /obj/effect/proc_holder/spell/vampire/targetted/disease/cast(list/targets) for(var/mob/living/carbon/target in targets) to_chat(usr, "You stealthily infect [target] with your diseased touch.") - target.help_shake_act(usr) if(!affects(target)) to_chat(usr, "They seem to be unaffected.") - continue var/datum/disease/D = new /datum/disease/appendicitis //someone should probably make a better virus for this target.ForceContractDisease(D) @@ -232,7 +218,6 @@ usr.visible_message("[usr]'s eyes emit a blinding flash!") if(istype(usr:glasses, /obj/item/clothing/glasses/sunglasses/blindfold)) to_chat(usr, "You're blindfolded!") - return for(var/mob/living/target in targets) if(!affects(target)) @@ -242,7 +227,6 @@ target.stuttering = 20 to_chat(target, "You are blinded by [usr]'s glare.") - /obj/effect/proc_holder/spell/vampire/self/shapeshift name = "Shapeshift (50)" desc = "Changes your name and appearance at the cost of 50 blood and has a cooldown of 3 minutes." @@ -274,7 +258,6 @@ if(!affects(C)) continue to_chat(C, "You hear a ear piercing shriek and your senses dull!") - C.Weaken(4) C.ear_deaf = 20 C.stuttering = 20 @@ -295,10 +278,8 @@ for(var/mob/living/target in targets) usr.visible_message("[usr] bites [target]'s neck!", "You bite [target]'s neck and begin the flow of power.") to_chat(target, "You feel the tendrils of evil invade your mind.") - if(!ishuman(target)) to_chat(usr, "You can only enthrall humans.") - break if(do_mob(usr, target, 50)) if(can_enthrall(usr, target)) @@ -307,7 +288,6 @@ revert_cast(usr) to_chat(usr, "You or your target either moved or you dont have enough usable blood.") - /obj/effect/proc_holder/spell/vampire/targetted/enthrall/proc/can_enthrall(mob/living/user, mob/living/carbon/C) var/enthrall_safe = 0 for(var/obj/item/weapon/implant/loyalty/L in C) @@ -323,7 +303,6 @@ return 0 if(!C.mind) to_chat(user, "[C.name]'s mind is not there for you to enthrall.") - return 0 if(enthrall_safe || ( C.mind in ticker.mode.vampires )||( C.mind.vampire )||( C.mind in ticker.mode.vampire_enthralled )) C.visible_message("[C] seems to resist the takeover!", "You feel a familiar sensation in your skull that quickly dissipates.") @@ -332,7 +311,6 @@ C.visible_message("[C] seems to resist the takeover!", "Your faith of [ticker.Bible_deity_name] has kept your mind clear of all evil.") if(!ishuman(C)) to_chat(user, "You can only enthrall humans!") - return 0 return 1 @@ -357,9 +335,7 @@ ticker.mode.vampire_enthralled[H.mind] = user.mind H.mind.special_role = "VampThrall" to_chat(H, "You have been Enthralled by [user]. Follow their every command.") - to_chat(src, "You have successfully Enthralled [H]. If they refuse to do as you say just adminhelp.") - log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].") /obj/effect/proc_holder/spell/vampire/self/cloak @@ -385,7 +361,6 @@ update_name() to_chat(usr, "You will now be [V.iscloaking ? "hidden" : "seen"] in darkness.") - /obj/effect/proc_holder/spell/vampire/bats name = "Summon Bats (75)" desc = "You summon a pair of space bats who attack nearby targets until they or their target is dead." @@ -451,7 +426,6 @@ var/mobloc = get_turf(usr.loc) if(get_area(mobloc) == /area/security/armoury/gamma) to_chat(usr, "A strange energy repels you!") - mobloc = originalloc animation.loc = mobloc steam.location = mobloc @@ -512,7 +486,6 @@ if(!turfs.len) revert_cast(user) to_chat(user, "\red You cannot find darkness to step to.") - return perform(turfs) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 1affe3be3e7..ae6a9a30867 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -48,7 +48,6 @@ if(href_list["school"]) if (used) to_chat(H, "You already used this contract!") - return used = 1 var/list/candidates = pollCandidates("Do you want to play as the wizard apprentice of [H.real_name]?", ROLE_WIZARD, 1) @@ -58,30 +57,25 @@ var/mob/living/carbon/human/M = new/mob/living/carbon/human(H.loc) M.key = C.key to_chat(M, "You are the [H.real_name]'s apprentice! You are bound by magic contract to follow their orders and help them in accomplishing their goals.") - switch(href_list["school"]) if("destruction") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/dumbfire/fireball(M)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned powerful, destructive spells. You are able to cast magic missile and fireball.") - if("bluespace") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/area_teleport/teleport(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt(M)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned reality bending mobility spells. You are able to cast teleport and ethereal jaunt.") - if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/forcewall(M)) M.equip_to_slot_or_del(new /obj/item/weapon/gun/magic/staff/healing(M), slot_r_hand) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") - if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(M)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(M)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [H.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") - M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) @@ -112,7 +106,6 @@ else used = 0 to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.") - return @@ -143,7 +136,6 @@ to_chat(user, "The unearthly energies that powered the blade are now dormant.") - /obj/effect/rend name = "tear in the fabric of reality" desc = "You should run now." @@ -221,7 +213,6 @@ /obj/item/weapon/scrying/attack_self(mob/user as mob) to_chat(user, " You can see...everything!") - visible_message("[user] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -264,14 +255,12 @@ var/global/list/multiverse = list() /obj/item/weapon/multisword/attack(mob/living/M as mob, mob/living/user as mob) //to prevent accidental friendly fire or out and out grief. if(M.real_name == user.real_name) to_chat(user, "The [src] detects benevolent energies in your target and redirects your attack!") - return ..() /obj/item/weapon/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") to_chat(user, "You know better than to touch your teacher's stuff.") - return if(cooldown < world.time) var/faction_check = 0 @@ -284,28 +273,23 @@ var/global/list/multiverse = list() assigned = "[user.real_name]" user.faction = list("[user.real_name]") to_chat(user, "You bind the sword to yourself. You can now use it to summon help.") - if(!usr.mind.special_role) if(prob(probability_evil)) to_chat(user, "With your new found power you could easily conquer the station!") - var/datum/objective/hijackclone/hijack_objective = new /datum/objective/hijackclone hijack_objective.owner = usr.mind usr.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" to_chat(usr, "Objective #[1]: [hijack_objective.explanation_text]") - ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" evil = TRUE else to_chat(user, "With your new found power you could easily defend the station!") - var/datum/objective/survive/new_objective = new /datum/objective/survive new_objective.owner = usr.mind new_objective.explanation_text = "Survive, and help defend the innocent from the mobs of multiverse clones." to_chat(usr, "Objective #[1]: [new_objective.explanation_text]") - usr.mind.objectives += new_objective ticker.mode.traitors += usr.mind usr.mind.special_role = "[usr.real_name] Prime" @@ -322,15 +306,12 @@ var/global/list/multiverse = list() spawn_copy(C.client, get_turf(user.loc), user) to_chat(user, "The sword flashes, and you find yourself face to face with...you!") - else to_chat(user, "You fail to summon any copies of yourself. Perhaps you should try again in a bit.") - else to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") - /obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) if(duplicate_self) @@ -340,7 +321,6 @@ var/global/list/multiverse = list() M.key = C.key M.mind.name = user.real_name to_chat(M, "You are an alternate version of [user.real_name] from another universe! Help them accomplish their goals at all costs.") - M.faction = list("[user.real_name]") if(duplicate_self) M.set_species(user.get_species()) //duplicate the sword user's species. @@ -366,7 +346,6 @@ var/global/list/multiverse = list() M.mind.objectives += hijack_objective hijack_objective.explanation_text = "Ensure only [usr.real_name] and their copies are on the shuttle!" to_chat(M, "Objective #[1]: [hijack_objective.explanation_text]") - M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] hijack.") else @@ -376,7 +355,6 @@ var/global/list/multiverse = list() new_objective.explanation_text = "Protect [usr.real_name], your copy, and help them defend the innocent from the mobs of multiverse clones." M.mind.objectives += new_objective to_chat(M, "Objective #[1]: [new_objective.explanation_text]") - M.mind.special_role = "multiverse traveller" log_game("[M.key] was made a multiverse traveller with the objective to help [usr.real_name] protect the station.") @@ -652,19 +630,16 @@ var/global/list/multiverse = list() if(M.stat != DEAD) to_chat(user, "This artifact can only affect the dead!") - return if(!M.mind || !M.client) to_chat(user, "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!") - return if(heresy) spawnheresy(M)//oh god why @@ -675,9 +650,7 @@ var/global/list/multiverse = list() equip_skeleton(M) spooky_scaries |= M to_chat(M, "You have been revived by [user.real_name]!") - to_chat(M, "They are your master now, assist them even if it costs you your new life!") - desc = "A shard capable of resurrecting humans as skeleton thralls[unlimited ? "." : ", [spooky_scaries.len]/3 active thralls."]" /obj/item/device/necromantic_stone/proc/check_spooky() @@ -801,19 +774,15 @@ var/global/list/multiverse = list() if(target && cooldown < world.time) if(is_hot(I)) to_chat(target, "You suddenly feel very hot") - target.bodytemperature += 50 GiveHint(target) else if(can_puncture(I)) to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_sel.selecting)]!") - target.Weaken(2) GiveHint(target) else if(istype(I,/obj/item/weapon/bikehorn)) to_chat(target, "HONK") - to_chat(target, 'sound/items/AirHorn.ogg') - target.ear_damage += rand(0,3) GiveHint(target) cooldown = world.time +cooldown_time @@ -824,7 +793,6 @@ var/global/list/multiverse = list() I.loc = src link = I to_chat(user, "You attach [I] to the doll.") - update_targets() ..() /obj/item/voodoo/check_eye(mob/user as mob) @@ -839,7 +807,6 @@ var/global/list/multiverse = list() target = null link.loc = get_turf(src) to_chat(user, "You remove the [link] from the doll.") - link = null update_targets() return @@ -859,7 +826,6 @@ var/global/list/multiverse = list() user.unset_machine() if("r_leg","l_leg") to_chat(user, "You move the doll's legs around.") - var/turf/T = get_step(target,pick(cardinal)) target.Move(T) if("r_arm","l_arm") @@ -875,10 +841,8 @@ var/global/list/multiverse = list() GiveHint(target) if("head") to_chat(user, "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!") - GiveHint(target,user) cooldown = world.time + cooldown_time @@ -894,12 +858,10 @@ var/global/list/multiverse = list() if(prob(50) || force) var/way = dir2text(get_dir(victim,get_turf(src))) to_chat(victim, "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]") - /obj/item/voodoo/fire_act() if(target) target.adjust_fire_stacks(20) diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm index b098b6bc84d..8a5ba06f36f 100644 --- a/code/game/gamemodes/wizard/godhand.dm +++ b/code/game/gamemodes/wizard/godhand.dm @@ -23,7 +23,6 @@ return if(user.lying || user.handcuffed) to_chat(user, "You can't reach out!") - return ..() @@ -64,7 +63,6 @@ return if(user.lying || user.handcuffed) to_chat(user, "You can't reach out!") - return var/mob/M = target M.Stun(2) diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm index c1f8675ecc2..cef7b507f82 100644 --- a/code/game/gamemodes/wizard/raginmages.dm +++ b/code/game/gamemodes/wizard/raginmages.dm @@ -15,25 +15,19 @@ /datum/game_mode/wizard/raginmages/announce() to_chat(world, "The current game mode is - Ragin' Mages!") - to_chat(world, "The \red Space Wizard Federation\black is pissed, help defeat all the space wizards!") - /datum/game_mode/wizard/raginmages/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) to_chat(wizard.current, "\red You are the Space Wizard!") - to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") - var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ to_chat(wizard.current, "Objective Alpha: Make sure the station pays for its actions against our diplomats") - return /datum/game_mode/wizard/raginmages/check_finished() @@ -46,21 +40,18 @@ if(!istype(wizard.current,/mob/living/carbon)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") - message_admins("[wizard.current] was transformed in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(istype(wizard.current,/mob/living/carbon/brain)) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") - message_admins("[wizard.current] was brainified in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue if(wizard.current.stat==DEAD) if(istype(get_area(wizard.current), /area/wizard_station)) // We don't want people camping other wizards to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") - message_admins("[wizard.current] died in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) continue @@ -68,17 +59,14 @@ if(wizard.current.health < 0) if(istype(get_area(wizard.current), /area/wizard_station)) to_chat(wizard.current, "If there aren't any admins on and another wizard is camping you in the wizard lair, report them on the forums") - message_admins("[wizard.current] went into crit in the wizard lair, another wizard is likely camping") end_squabble(get_area(wizard.current)) else to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") - wizard.current.gib() // *REAL* ACTION!! *REAL* DRAMA!! *REAL* BLOODSHED!! continue if(wizard.current.client && wizard.current.client.is_afk() > 10 * 60 * 10) // 10 minutes to_chat(wizard.current, "\red The Space Wizard Federation is upset with your performance and have terminated your employment.") - wizard.current.gib() // Let's keep the round moving continue if(!wizard.current.client) @@ -113,7 +101,6 @@ for(var/mob/living/L in marked_for_death) if(L.stat == CONSCIOUS) // Probably a troublemaker - I'd like to see YOU fight when unconscious to_chat(L, "STOP FIGHTING.") - L.ghostize() if(istype(L, /mob/living/carbon/brain)) // diediedie @@ -198,5 +185,4 @@ if(finished) feedback_set_details("round_end_result","loss - wizard killed") to_chat(world, "\red The crew has managed to hold off the wizard attack! The Space Wizards Federation has been taught a lesson they will not soon forget!") - ..(1) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 14cdf7e94cc..eb1e8bce930 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -6,7 +6,6 @@ var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos","necromantic") to_chat(usr, "You summoned [summon_type ? "magic" : "guns"]!") - message_admins("[key_name_admin(usr)] summoned [summon_type ? "magic" : "guns"]!") for(var/mob/living/carbon/human/H in player_list) @@ -138,7 +137,6 @@ H.see_in_dark = 8 H.see_invisible = SEE_INVISIBLE_LEVEL_TWO to_chat(H, "The walls suddenly disappear.") - if("voodoo") new /obj/item/voodoo(get_turf(H)) if("special") @@ -157,4 +155,3 @@ if("necromantic") new /obj/item/device/necromantic_stone(get_turf(H)) to_chat(H, "You suddenly feel lucky.") - diff --git a/code/game/gamemodes/wizard/soulstone.dm b/code/game/gamemodes/wizard/soulstone.dm index 9ab912a5ce5..08e6117e9bd 100644 --- a/code/game/gamemodes/wizard/soulstone.dm +++ b/code/game/gamemodes/wizard/soulstone.dm @@ -20,12 +20,10 @@ if(M.has_brain_worms()) //Borer stuff - RR to_chat(user, "This being is corrupted by an alien intelligence and cannot be soul trapped.") - return ..() if(jobban_isbanned(M, "cultist") || jobban_isbanned(M, "Syndicate")) to_chat(user, "A mysterious force prevents you from trapping this being's soul.") - return ..() M.attack_log += text("\[[time_stamp()]\] Has had their soul captured with [src.name] by [key_name(user)]") @@ -84,7 +82,6 @@ A.status_flags &= ~GODMODE A.canmove = 1 to_chat(A, "You have been released from your prison, but you are still bound to [U.name]'s will. Help them suceed in their goals at all costs.") - A.loc = U.loc A.cancel_camera() src.icon_state = "soulstone" @@ -112,19 +109,15 @@ var/obj/item/device/soulstone/C = src if(C.imprinted != "empty") to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") - else if (T.stat == 0) to_chat(U, "\red Capture failed!: \black Kill or maim the victim first!") - else if(T.client == null) to_chat(U, "\red Capture failed!: \black The soul has already fled it's mortal frame.") - else if(C.contents.len) to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") - else for(var/obj/item/W in T) T.unEquip(W) @@ -149,11 +142,8 @@ C.icon_state = "soulstone2" C.name = "Soul Stone: [S.real_name]" to_chat(S, "Your soul has been captured! You are now bound to [U.name]'s will, help them suceed in their goals at all costs.") - to_chat(U, "\blue Capture successful!: \black [T.real_name]'s soul has been ripped from their body and stored within the soul stone.") - to_chat(U, "The soulstone has been imprinted with [S.real_name]'s mind, it will no longer react to other souls.") - C.imprinted = "[S.name]" qdel(T) if("SHADE") @@ -161,15 +151,12 @@ var/obj/item/device/soulstone/C = src if (T.stat == DEAD) to_chat(U, "\red Capture failed!: \black The shade has already been banished!") - else if(C.contents.len) to_chat(U, "\red Capture failed!: \black The soul stone is full! Use or free an existing soul to make room.") - else if(T.name != C.imprinted) to_chat(U, "\red Capture failed!: \black The soul stone has already been imprinted with [C.imprinted]'s mind!") - else T.loc = C //put shade in stone T.status_flags |= GODMODE @@ -178,9 +165,7 @@ T.faction |= "\ref[U]" C.icon_state = "soulstone2" to_chat(T, "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form") - to_chat(U, "\blue Capture successful!: \black [T.name]'s has been recaptured and stored within the soul stone.") - if("CONSTRUCT") var/obj/structure/constructshell/T = target var/obj/item/device/soulstone/C = src @@ -200,9 +185,7 @@ ticker.mode.update_cult_icons_added(Z.mind) qdel(T) to_chat(Z, "You are a Juggernaut. Though slow, your shell can withstand extreme punishment, create shield walls and even deflect energy weapons, and rip apart enemies and walls alike.") - to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") - Z.cancel_camera() qdel(C) @@ -218,9 +201,7 @@ ticker.mode.update_cult_icons_added(Z.mind) qdel(T) to_chat(Z, "You are a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls.") - to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") - Z.cancel_camera() qdel(C) @@ -236,14 +217,11 @@ ticker.mode.update_cult_icons_added(Z.mind) qdel(T) to_chat(Z, "You are an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, use magic missile, repair allied constructs (by clicking on them), and most important of all create new constructs (Use your Artificer spell to summon a new construct shell and Summon Soulstone to create a new soulstone).") - to_chat(Z, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") - Z.cancel_camera() qdel(C) else to_chat(U, "\red Creation failed!: \black The soul stone is empty! Go kill someone!") - return /proc/makeNewConstruct(var/mob/living/simple_animal/construct/ctype, var/mob/target, var/mob/stoner = null, cultoverride = 0) @@ -260,11 +238,8 @@ ticker.mode.update_cult_icons_added(newstruct.mind) if(stoner && iswizard(stoner)) to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") - else if(stoner && iscultist(stoner)) to_chat(newstruct, "You are still bound to serve the cult, follow their orders and help them complete their goals at all costs.") - else to_chat(newstruct, "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs.") - newstruct.cancel_camera() \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index e206e670527..8467da489a5 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -27,7 +27,6 @@ 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.") - return 0 else aspell.name = initial(aspell.name) @@ -38,29 +37,23 @@ switch(aspell.spell_level) if(1) to_chat(user, "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].") - aspell.name = "Quickened [aspell.name]" if(3) to_chat(user, "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].") - aspell.name = "Instant [aspell.name]" if(aspell.spell_level >= aspell.level_max) to_chat(user, "This spell cannot be strengthened any further.") - return 1 //No same spell found - just learn it feedback_add_details("wizard_spell_learned",log_name) user.mind.AddSpell(S) to_chat(user, "You have learned [S.name].") - return 1 /datum/spellbook_entry/proc/CanRefund(var/mob/living/carbon/human/user,var/obj/item/weapon/spellbook/book) @@ -77,7 +70,6 @@ var/area/wizard_station/A = locate() if(!(user in A.contents)) to_chat(user, "You can only refund spells at the wizard lair") - return -1 if(!S) S = new spell_type() @@ -312,7 +304,6 @@ user.see_in_dark = 8 user.see_invisible = SEE_INVISIBLE_LEVEL_TWO to_chat(user, "\blue The walls suddenly disappear.") - return 1 @@ -435,7 +426,6 @@ book.uses += 1 active = 1 to_chat(user, "You have cast summon guns and gained an extra charge for your spellbook.") - return 1 /datum/spellbook_entry/summon/magic @@ -459,7 +449,6 @@ book.uses += 1 active = 1 to_chat(user, "You have cast summon magic and gained an extra charge for your spellbook.") - return 1 /obj/item/weapon/spellbook @@ -498,11 +487,9 @@ var/obj/item/weapon/contract/contract = O if(contract.used) to_chat(user, "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.") - uses++ qdel(O) @@ -510,7 +497,6 @@ if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon)) to_chat(user, "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)) @@ -570,12 +556,10 @@ /obj/item/weapon/spellbook/attack_self(mob/user as mob) if(!owner) to_chat(user, "You bind the spellbook to yourself.") - owner = user return if(user != owner) to_chat(user, "The [name] does not recognize you as it's owner and refuses to open!") - return user.set_machine(src) var/dat = "" @@ -673,17 +657,14 @@ if(user.mind) if(user.mind.special_role == "apprentice" || user.mind.special_role == "Wizard") to_chat(user, "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.") - return if(used) recoil(user) else user.mind.AddSpell(S) to_chat(user, "you rapidly read through the arcane book. Suddenly you realize you understand [spellname]!") - user.attack_log += text("\[[time_stamp()]\] [user.real_name] ([user.ckey]) learned the spell [spellname] ([S]).") onlearned(user) @@ -718,7 +699,6 @@ /obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user as mob) ..() to_chat(user, "Your stomach rumbles...") - if(user.nutrition) user.nutrition -= 200 if(user.nutrition <= 0) @@ -733,7 +713,6 @@ /obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user as mob) ..() to_chat(user, "You go blind!") - user.eye_blind = 10 /obj/item/weapon/spellbook/oneuse/mindswap @@ -756,11 +735,9 @@ if(!stored_swap) stored_swap = user to_chat(user, "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...") - return if(user.mind.special_verbs.len) @@ -790,9 +767,7 @@ user.verbs += V to_chat(stored_swap, "You're suddenly somewhere else... and someone else?!") - to_chat(user, "Suddenly you're staring at [src] again... where are you, who are you?!") - stored_swap = null /obj/item/weapon/spellbook/oneuse/forcewall @@ -804,7 +779,6 @@ /obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/user as mob) ..() to_chat(user, "You suddenly feel very solid!") - var/obj/structure/closet/statue/S = new /obj/structure/closet/statue(user.loc, user) S.timer = 30 user.drop_item() @@ -819,7 +793,6 @@ /obj/item/weapon/spellbook/oneuse/knock/recoil(mob/user as mob) ..() to_chat(user, "You're knocked down!") - user.Weaken(20) /obj/item/weapon/spellbook/oneuse/horsemask @@ -831,7 +804,6 @@ /obj/item/weapon/spellbook/oneuse/horsemask/recoil(mob/living/carbon/user as mob) if(istype(user, /mob/living/carbon/human)) to_chat(user, "HOR-SIE HAS RISEN") - var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead magichead.flags |= NODROP //curses! magichead.flags_inv = null //so you can still see their face @@ -843,7 +815,6 @@ else to_chat(user, "I say thee neigh") - /obj/item/weapon/spellbook/oneuse/charge spell = /obj/effect/proc_holder/spell/targeted/charge spellname = "charging" @@ -853,7 +824,6 @@ /obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user as mob) ..() to_chat(user, "[src] suddenly feels very warm!") - empulse(src, 1, 1) /obj/item/weapon/spellbook/oneuse/summonitem @@ -865,7 +835,6 @@ /obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user as mob) ..() to_chat(user, "[src] suddenly vanishes!") - qdel(src) diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index e3a5aadc676..1910e8ffa85 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -18,11 +18,9 @@ /datum/game_mode/wizard/announce() to_chat(world, "The current game mode is - Wizard!") - to_chat(world, "There is a \red SPACE WIZARD\black on the station. You can't let him achieve his objective!") - /datum/game_mode/wizard/can_start()//This could be better, will likely have to recode it later if(!..()) return 0 @@ -38,7 +36,6 @@ wizard.original = wizard.current if(wizardstart.len == 0) to_chat(wizard.current, "\red A starting location for you could not be found, please report this bug!") - return 0 return 1 @@ -151,14 +148,11 @@ /datum/game_mode/proc/greet_wizard(var/datum/mind/wizard, var/you_are=1) if (you_are) to_chat(wizard.current, "\red You are the Space Wizard!") - to_chat(wizard.current, "The Space Wizards Federation has given you the following tasks:") - var/obj_count = 1 for(var/datum/objective/objective in wizard.objectives) to_chat(wizard.current, "Objective #[obj_count]: [objective.explanation_text]") - obj_count++ return @@ -202,9 +196,7 @@ wizard_mob.species.equip(wizard_mob) to_chat(wizard_mob, "You will find a list of available spells in your spell book. Choose your magic arsenal carefully.") - to_chat(wizard_mob, "In your pockets you will find a teleport scroll. Use it as needed.") - wizard_mob.mind.store_memory("Remember: do not forget to prepare your spells.") wizard_mob.update_icons() return 1 @@ -240,7 +232,6 @@ if(finished && !ragin) feedback_set_details("round_end_result","loss - wizard killed") to_chat(world, "\red The wizard[(wizards.len>1)?"s":""] has been killed by the crew! The Space Wizards Federation has been taught a lesson they will not soon forget!") - ..() return 1 @@ -292,7 +283,6 @@ text += "
" to_chat(world, text) - return 1 //OTHER PROCS @@ -318,15 +308,12 @@ Made a proc so this is not repeated 14 (or more) times.*/ //Removed the stat check because not all spells require clothing now. if(!istype(usr:wear_suit, /obj/item/clothing/suit/wizrobe)) to_chat(usr, "I don't feel strong enough without my robe.") - return 0 if(!istype(usr:shoes, /obj/item/clothing/shoes/sandal)) to_chat(usr, "I don't feel strong enough without my sandals.") - return 0 if(!istype(usr:head, /obj/item/clothing/head/wizard)) to_chat(usr, "I don't feel strong enough without my hat.") - return 0 else return 1 diff --git a/code/game/gamemodes/xenos/xenos.dm b/code/game/gamemodes/xenos/xenos.dm index fef97333f9c..12dab66e569 100644 --- a/code/game/gamemodes/xenos/xenos.dm +++ b/code/game/gamemodes/xenos/xenos.dm @@ -19,10 +19,8 @@ /datum/game_mode/xenos/announce() to_chat(world, "The current game mode is - Xenos!") - to_chat(world, "There is an Xenomorph attack on the station.
Aliens - Kill or infect the crew. Protect the Queen.
Crew - Protect the station. Exterminate all aliens.") - /datum/game_mode/xenos/can_start() if(!..()) return 0 @@ -160,28 +158,20 @@ if(station_was_nuked) feedback_set_details("round_end_result","win - xenos nuked") to_chat(world, "Crew Victory") - to_chat(world, "The station was destroyed in a nuclear explosion, preventing the aliens from overrunning it!") - else if(result == 1) feedback_set_details("round_end_result","win - xenos killed") to_chat(world, "Crew Victory") - to_chat(world, "The aliens did not succeed and were exterminated by the crew!") - else if(result == 2) feedback_set_details("round_end_result","win - crew killed") to_chat(world, "Alien Victory") - to_chat(world, "The aliens were successful and slaughtered the crew!") - else feedback_set_details("round_end_result","win - crew escaped") to_chat(world, "Draw") - to_chat(world, "The crew has escaped from the aliens but did not exterminate them, allowing them to overrun the station.") - var/text = "
There were [xenos.len] aliens." text += "
The aliens were:" for(var/datum/mind/xeno in xenos) @@ -198,6 +188,5 @@ text += ")" to_chat(world, text) - ..() return 1 \ No newline at end of file diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 3d0458a2227..29a0375b849 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -146,7 +146,6 @@ if("No") if(outoftime) to_chat(H, "Welp, out of time, buddy. You're stuck. Next time choose faster.") - accepted = 1 if(ticker) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index b9865a1fcb7..9f9658a9dff 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -18,7 +18,6 @@ var/global/datum/controller/occupations/job_master var/list/all_jobs = subtypesof(/datum/job) if(!all_jobs.len) to_chat(world, "\red \b Error setting up jobs, no job datums found") - return 0 for(var/J in all_jobs) var/datum/job/job = new J() @@ -386,7 +385,6 @@ var/global/datum/controller/occupations/job_master else to_chat(H, "Your job is [rank] and the game just can't handle it! Please report this bug to an administrator.") - H.job = rank if(!joined_late) @@ -435,7 +433,6 @@ var/global/datum/controller/occupations/job_master spawn(0) to_chat(H, "\blueYour account number is: [M.account_number], your account pin is: [M.remote_access_pin]") - var/alt_title = null if(H.mind) H.mind.assigned_role = rank @@ -468,13 +465,10 @@ var/global/datum/controller/occupations/job_master H.species.equip(H) to_chat(H, "You are the [alt_title ? alt_title : rank].") - to_chat(H, "As the [alt_title ? alt_title : rank] you answer directly to [job.supervisors]. Special circumstances may change this.") - if(job.req_admin_notify) to_chat(H, "You are playing a job that is important for the game progression. If you have to disconnect, please notify the admins via adminhelp.") - spawnId(H, rank, alt_title) H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) diff --git a/code/game/jobs/whitelist.dm b/code/game/jobs/whitelist.dm index 4d921e617c8..1514b0440a8 100644 --- a/code/game/jobs/whitelist.dm +++ b/code/game/jobs/whitelist.dm @@ -25,7 +25,6 @@ var/list/whitelist = list() return 1 if(!dbcon.IsConnected()) to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") - return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT job FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") @@ -71,7 +70,6 @@ var/list/whitelist = list() return 0 if(!dbcon.IsConnected()) to_chat(usr, "\red Unable to connect to whitelist database. Please try again later.
") - return 0 else var/DBQuery/query = dbcon.NewQuery("SELECT species FROM [format_table_name("whitelist")] WHERE ckey='[M.key]'") diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 20d47691204..bb8f7ac9184 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -61,7 +61,6 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) to_chat(user, "Open the maintenance panel first.") - return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -94,7 +93,6 @@ /obj/machinery/atmospherics/unary/cold_sink/freezer/attack_hand(mob/user as mob) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return src.ui_interact(user) @@ -223,7 +221,6 @@ if (istype(I, /obj/item/weapon/wrench)) if(!panel_open) to_chat(user, "Open the maintenance panel first.") - return var/list/choices = list("West" = WEST, "East" = EAST, "South" = SOUTH, "North" = NORTH) var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in choices @@ -256,7 +253,6 @@ /obj/machinery/atmospherics/unary/heat_reservoir/heater/attack_hand(mob/user as mob) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return src.ui_interact(user) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 0853e20e8ee..fbc52904117 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -46,7 +46,6 @@ /obj/machinery/optable/attack_hand(mob/user as mob) if (HULK in usr.mutations) to_chat(usr, text("\blue You destroy the table.")) - visible_message("\red [usr] destroys the operating table!") src.density = 0 qdel(src) @@ -131,7 +130,6 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "You deconstruct the table.") - new /obj/item/stack/sheet/plasteel(loc, 5) qdel(src) @@ -139,12 +137,10 @@ /obj/machinery/optable/proc/check_table(mob/living/carbon/patient as mob) if(src.victim && get_turf(victim) == get_turf(src) && victim.lying) to_chat(usr, "The table is already occupied!") - return 0 if(patient.buckled) to_chat(usr, "Unbuckle first!") - return 0 return 1 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 0a3ca9cc383..f21ad0d03ee 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -44,7 +44,6 @@ if(istype(O, /obj/item/device/pda)) if(storedpda) to_chat(user, "There is already a PDA inside.") - return else var/obj/item/device/pda/P = usr.get_active_hand() @@ -76,7 +75,6 @@ to_chat(user, "The [src] is empty.") - /obj/machinery/pdapainter/verb/ejectpda() set name = "Eject PDA" set category = "Object" @@ -90,7 +88,6 @@ to_chat(usr, "The [src] is empty.") - /obj/machinery/pdapainter/power_change() ..() update_icon() \ No newline at end of file diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index fea7daeb956..238e071ebe9 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -84,7 +84,6 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(dir == 4) orient = "LEFT" @@ -111,7 +110,6 @@ if (panel_open) to_chat(user, "Close the maintenance panel first.") - return if (!src.connected) @@ -229,7 +227,6 @@ if(panel_open) to_chat(usr, "Close the maintenance panel first.") - return 0 if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai))) @@ -238,12 +235,10 @@ if (src.connected.occupant) if (src.connected.occupant.stat == DEAD) to_chat(usr, "This person has no life for to preserve anymore. Take them to a department capable of reanimating them.") - else if(src.connected.occupant.health > src.connected.min_health || (href_list["chemical"] in connected.emergency_chems)) src.connected.inject_chemical(usr,href_list["chemical"],text2num(href_list["amount"])) else to_chat(usr, "This person is not in good enough condition for sleepers to be effective! Use another means of treatment, such as cryogenics!") - if (href_list["removebeaker"]) src.connected.remove_beaker() if (href_list["togglefilter"]) @@ -357,7 +352,6 @@ addiction_removal_chance = 10 if(prob(addiction_removal_chance)) to_chat(occupant, "You no longer feel reliant on [R.name]!") - occupant.reagents.addiction_list.Remove(R) updateDialog() @@ -378,7 +372,6 @@ if(!beaker) if (!user.drop_item()) to_chat(user, "\The [G] is stuck to you!") - return beaker = G @@ -388,13 +381,11 @@ else to_chat(user, "The sleeper has a beaker already.") - return if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "sleeper-o", "sleeper-open", G) return @@ -402,11 +393,9 @@ if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) to_chat(user, "The scanner is occupied.") - return if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(dir == 4) orient = "LEFT" @@ -424,18 +413,15 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(!ismob(G:affecting)) return if(src.occupant) to_chat(user, "The sleeper is already occupied!") - return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) to_chat(usr, "[G:affecting.name] will not fit into the sleeper because they have a slime latched onto their head.") - return visible_message("[user] starts putting [G:affecting:name] into the sleeper.") @@ -443,7 +429,6 @@ if(do_after(user, 20, target = G:affecting)) if(src.occupant) to_chat(user, "The sleeper is already occupied!") - return if(!G || !G:affecting) return var/mob/M = G:affecting @@ -455,7 +440,6 @@ src.icon_state = "sleeper" to_chat(M, "You feel cool air surround you. You go numb as your senses turn inward.") - src.add_fingerprint(user) qdel(G) return @@ -537,7 +521,6 @@ /obj/machinery/sleeper/proc/inject_chemical(mob/living/user as mob, chemical, amount) if (!(chemical in injection_chems)) to_chat(user, "The sleeper does not offer that chemical!") - return if(src.occupant) @@ -547,15 +530,12 @@ return else to_chat(user, "You can not inject any more of this chemical.") - return else to_chat(user, "The patient rejects the chemicals!") - return else to_chat(user, "There's no occupant in the sleeper!") - return /obj/machinery/sleeper/verb/eject() @@ -601,23 +581,19 @@ return if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(occupant) to_chat(user, "The sleeper is already occupied!") - return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) to_chat(user, "Subject cannot have abiotic items on.") - return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) to_chat(usr, "[L.name] will not fit into the sleeper because they have a slime latched onto their head.") - return if(L == user) visible_message("[user] starts climbing into the sleeper.") @@ -627,7 +603,6 @@ if(do_after(user, 20, target = L)) if(src.occupant) to_chat(user, ">The sleeper is already occupied!") - return if(!L) return @@ -638,7 +613,6 @@ src.occupant = L src.icon_state = "sleeper" to_chat(L, "You feel cool air surround you. You go numb as your senses turn inward.") - src.add_fingerprint(user) if(user.pulling == L) user.stop_pulling() @@ -656,24 +630,20 @@ return if(src.occupant) to_chat(usr, "The sleeper is already occupied!") - return if (panel_open) to_chat(usr, "Close the maintenance panel first.") - return if(usr.restrained() || usr.stat || usr.weakened || usr.stunned || usr.paralysis || usr.resting) //are you cuffed, dying, lying, stunned or other return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) to_chat(usr, "You're too busy getting your life sucked out of you.") - return visible_message("[usr] starts climbing into the sleeper.") if(do_after(usr, 20, target = usr)) if(src.occupant) to_chat(usr, "The sleeper is already occupied!") - return usr.stop_pulling() usr.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 3cce5ec7cac..45ee6e0f4c9 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -43,7 +43,6 @@ if (istype(G, /obj/item/weapon/screwdriver)) if(src.occupant) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "bodyscanner-o", "bodyscanner-open", G) return @@ -51,11 +50,9 @@ if (istype(G, /obj/item/weapon/wrench)) if(src.occupant) to_chat(user, "The scanner is occupied.") - return if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(dir == 4) dir = 8 @@ -72,23 +69,19 @@ var/obj/item/weapon/grab/TYPECAST_YOUR_SHIT = G if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(!ismob(TYPECAST_YOUR_SHIT.affecting)) return if(occupant) to_chat(user, "The scanner is already occupied!") - return for(var/mob/living/carbon/slime/M in range(1, TYPECAST_YOUR_SHIT.affecting)) if(M.Victim == TYPECAST_YOUR_SHIT.affecting) to_chat(user, "[TYPECAST_YOUR_SHIT.affecting.name] has a fucking slime attached to them, deal with that first.") - return var/mob/M = TYPECAST_YOUR_SHIT.affecting if(M.abiotic()) to_chat(user, "Subject cannot have abiotic items on.") - return /*if(M.client) M.client.perspective = EYE_PERSPECTIVE @@ -113,23 +106,19 @@ return 0 //not a borg or human if(panel_open) to_chat(user, "Close the maintenance panel first.") - return 0 //panel open if(occupant) to_chat(user, "\The [src] is already occupied.") - return 0 //occupied if(O.buckled) return 0 if(O.abiotic()) to_chat(user, "Subject cannot have abiotic items on.") - return 0 for(var/mob/living/carbon/slime/M in range(1, O)) if(M.Victim == O) to_chat(user, "[O] has a fucking slime attached to them, deal with that first.") - return 0 if(O == user) @@ -280,7 +269,6 @@ if (istype(G, /obj/item/weapon/wrench)) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return if(dir == 4) dir = 8 @@ -305,7 +293,6 @@ if (panel_open) to_chat(user, "Close the maintenance panel first.") - return if(!src.connected) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 912a854c12c..9869e2650f9 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -37,7 +37,6 @@ if (src.allowed(usr)) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] the device.") - if (locked) if (user.machine==src) user.unset_machine() @@ -47,7 +46,6 @@ src.attack_hand(usr) else to_chat(user, "\red Access denied.") - return return @@ -60,7 +58,6 @@ if ( (get_dist(src, user) > 1 )) if (!istype(user, /mob/living/silicon)) to_chat(user, text("Too far away.")) - user.unset_machine() user << browse(null, "window=ai_slipper") return @@ -71,7 +68,6 @@ loc = loc:loc if (!istype(loc, /area)) to_chat(user, text("Turret badly positioned - loc.loc is [].", loc)) - return var/area/area = loc var/t = "AI Liquid Dispenser ([area.name])

" @@ -92,7 +88,6 @@ if (src.locked) if (!istype(usr, /mob/living/silicon)) to_chat(usr, "Control panel is locked!") - return if (href_list["toggleOn"]) src.disabled = !src.disabled diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 60e98f0bdd2..4a2d7103593 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -432,7 +432,6 @@ radio_connection.post_signal(src, signal, RADIO_FROM_AIRALARM) // to_chat(world, text("Signal [] Broadcasted to []", command, target)) - return 1 /obj/machinery/alarm/proc/apply_mode() @@ -856,7 +855,6 @@ if(aidisabled && (isAI(user) || isrobot(user))) to_chat(user, "AI control for \the [src] interface has been disabled.") - return STATUS_CLOSE . = shorted ? STATUS_DISABLED : STATUS_INTERACTIVE @@ -991,7 +989,6 @@ input_temperature = input_temperature + T0C if(input_temperature > max_temperature || input_temperature < min_temperature) to_chat(usr, "Temperature must be between [min_temperature_c]C and [max_temperature_c]C") - else target_temperature = input_temperature return 1 @@ -1011,10 +1008,8 @@ if(2) if(istype(W, /obj/item/weapon/screwdriver)) // Opening that Air Alarm up. // to_chat(user, "You pop the Air Alarm's maintence panel open.") - wiresexposed = !wiresexposed to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") - update_icon() return @@ -1033,19 +1028,16 @@ if (istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))// trying to unlock the interface with an ID card if(stat & (NOPOWER|BROKEN)) to_chat(user, "It does nothing") - return else if(allowed(usr) && !wires.IsIndexCut(AALARM_WIRE_IDSCAN)) locked = !locked to_chat(user, "\blue You [ locked ? "lock" : "unlock"] the Air Alarm interface.") - updateUsrDialog() else to_chat(user, "\red Access denied.") - return if(1) @@ -1053,11 +1045,9 @@ var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) to_chat(user, "You need more cable for this!") - return to_chat(user, "You wire \the [src]!") - coil.amount -= 5 if(!coil.amount) qdel(coil) @@ -1069,11 +1059,9 @@ else if(istype(W, /obj/item/weapon/crowbar)) to_chat(user, "You start prying out the circuit.") - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,20, target = src)) to_chat(user, "You pry out the circuit!") - var/obj/item/weapon/airalarm_electronics/circuit = new /obj/item/weapon/airalarm_electronics() circuit.loc = user.loc buildstage = 0 @@ -1082,7 +1070,6 @@ if(0) if(istype(W, /obj/item/weapon/airalarm_electronics)) to_chat(user, "You insert the circuit!") - qdel(W) buildstage = 1 update_icon() @@ -1090,7 +1077,6 @@ else if(istype(W, /obj/item/weapon/wrench)) to_chat(user, "You remove the fire alarm assembly from the wall!") - new /obj/item/mounted/frame/alarm_frame(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) qdel(src) @@ -1109,11 +1095,9 @@ ..(user) if (buildstage < 2) to_chat(user, "It is not wired.") - if (buildstage < 1) to_chat(user, "The circuit is missing.") - /* AIR ALARM CIRCUIT Just an object used in constructing air alarms diff --git a/code/game/machinery/atmo_control.dm b/code/game/machinery/atmo_control.dm index 23a9dc6ee3a..80d588179bf 100644 --- a/code/game/machinery/atmo_control.dm +++ b/code/game/machinery/atmo_control.dm @@ -74,11 +74,9 @@ obj/machinery/air_sensor if(istype(W, /obj/item/weapon/wrench)) if(bolts) to_chat(usr, "The [src] is bolted to the floor! You can't detach it like this.") - return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to unfasten \the [src]...") - if(do_after(user, 40, target = src)) user.visible_message("[user] unfastens \the [src].", "\blue You have unfastened \the [src].", "You hear ratchet.") new /obj/item/pipe_gsensor(src.loc) @@ -302,7 +300,6 @@ legend { sensor_list|=G.id_tag if(!sensor_list.len) to_chat(user, "No sensors on this frequency.") - return MT_ERROR // Have the user pick one of them and name its label @@ -324,7 +321,6 @@ legend { sensor_list|=G.id_tag if(!sensor_list.len) to_chat(user, "No sensors on this frequency.") - return MT_ERROR var/label = sensors[href_list["edit_sensor"]] var/sensor = input(user, "Select a sensor:", "Sensor Data", href_list["edit_sensor"]) as null|anything in sensor_list diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 4ed251f092c..14b3ca3fc59 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -339,7 +339,6 @@ update_flag if(iswelder(W) && src.destroyed) if(weld(W, user)) to_chat(user, "\blue You salvage whats left of \the [src]") - var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal(src.loc) M.amount = 3 qdel(src) @@ -362,7 +361,6 @@ update_flag var/datum/gas_mixture/removed = air_contents.remove(transfer_moles) thejetpack.merge(removed) to_chat(user, "You pulse-pressurize your jetpack from the tank.") - return ..() @@ -482,7 +480,6 @@ update_flag else to_chat(usr, "\red As you attempted to rename it the pressure rose!") - if (href_list["choice"] == "Primary color") if (is_a_color(href_list["icon"],"prim")) canister_color["prim"] = href_list["icon"] @@ -633,7 +630,6 @@ update_flag // Do after stuff here to_chat(user, "You start to slice away at \the [src]...") - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 50, target = src)) diff --git a/code/game/machinery/atmoalter/meter.dm b/code/game/machinery/atmoalter/meter.dm index 578d34fd7e0..b2b7b1efc06 100644 --- a/code/game/machinery/atmoalter/meter.dm +++ b/code/game/machinery/atmoalter/meter.dm @@ -108,7 +108,6 @@ to_chat(user, t) - /obj/machinery/meter/Click() if(istype(usr, /mob/living/silicon/ai)) // ghosts can call ..() for examine usr.examinate(src) @@ -125,7 +124,6 @@ return ..() playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to unfasten \the [src]...") - if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ diff --git a/code/game/machinery/atmoalter/portable_atmospherics.dm b/code/game/machinery/atmoalter/portable_atmospherics.dm index 6382e7da5df..21eee7b52ac 100644 --- a/code/game/machinery/atmoalter/portable_atmospherics.dm +++ b/code/game/machinery/atmoalter/portable_atmospherics.dm @@ -92,7 +92,6 @@ if(connected_port) disconnect() to_chat(user, "\blue You disconnect [name] from the port.") - update_icon() return else @@ -100,16 +99,13 @@ if(possible_port) if(connect(possible_port)) to_chat(user, "\blue You connect [name] to the port.") - update_icon() return else to_chat(user, "\blue [name] failed to connect to the port.") - return else to_chat(user, "\blue Nothing happens.") - return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index 8a72b9077f6..1790dec775d 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -183,7 +183,6 @@ /obj/machinery/portable_atmospherics/scrubber/huge/attack_hand(var/mob/user as mob) to_chat(usr, "You can't directly interact with this machine. Use the area atmos computer.") - /obj/machinery/portable_atmospherics/scrubber/huge/update_icon() src.overlays = 0 @@ -196,17 +195,14 @@ if(istype(W, /obj/item/weapon/wrench)) if(stationary) to_chat(user, "The bolts are too tight for you to unscrew!") - return if(on) to_chat(user, "Turn it off first!") - return anchored = !anchored playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - return else if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 3a1069ab3ad..9021a1a2127 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -109,7 +109,6 @@ /obj/machinery/autolathe/attackby(obj/item/O, mob/user, params) if (busy) to_chat(user, "The autolathe is busy. Please wait for completion of previous operation.") - return 1 if(default_deconstruction_screwdriver(user, "autolathe_t", "autolathe", O)) @@ -145,15 +144,12 @@ var/material_amount = materials.get_item_material_amount(O) if(!material_amount) to_chat(user, "This object does not contain sufficient amounts of metal or glass to be accepted by the autolathe.") - return 1 if(!materials.has_space(material_amount)) to_chat(user, "The autolathe is full. Please remove metal or glass from the autolathe in order to insert more.") - return 1 if(!user.unEquip(O)) to_chat(user, "\The [O] is stuck to you and cannot be placed into the autolathe.") - return 1 busy = 1 @@ -165,11 +161,9 @@ if (O.materials[MAT_GLASS]) flick("autolathe_r",src)//plays glass insertion animation to_chat(user, "You insert [inserted] sheet[inserted>1 ? "s" : ""] to the autolathe.") - use_power(inserted*100) else to_chat(user, "You insert a material total of [inserted] to the autolathe.") - use_power(max(500,inserted/10)) qdel(O) busy = 0 @@ -220,7 +214,6 @@ add_to_queue(design_last_ordered,multiplier) else to_chat(usr, "\red The autolathe queue is full!") - if (!busy) busy = 1 process_queue() diff --git a/code/game/machinery/bees_apiary.dm b/code/game/machinery/bees_apiary.dm index 0103ab7f5df..437c188d9b8 100644 --- a/code/game/machinery/bees_apiary.dm +++ b/code/game/machinery/bees_apiary.dm @@ -36,11 +36,9 @@ if(!yieldmod) yieldmod += 1 // to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]") - else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2... yieldmod += 1 // to_chat(world, "Yield increased by 1, to a total of [myseed.yield]") - else ..() return @@ -49,14 +47,12 @@ if(istype(O, /obj/item/queen_bee)) if(health > 0) to_chat(user, "\red There is already a queen in there.") - else health = 10 nutrilevel += 10 user.drop_item() del(O) to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.") - bees_in_hive = 0 else if(istype(O, /obj/item/beezeez)) beezeez += 100 @@ -64,53 +60,42 @@ user.drop_item() if(health > 0) to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.") - else to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.") - del(O) else if(istype(O, /obj/item/weapon/minihoe)) if(health > 0) to_chat(user, "\red You begin to dislodge the apiary from the tray, the bees don't like that.") - angry_swarm(user) else to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.") - if(do_after(user, 50, target = src)) new hydrotray_type(src.loc) new /obj/item/apiary(src.loc) to_chat(user, "\red You dislodge the apiary from the tray.") - del(src) else if(istype(O, /obj/item/weapon/bee_net)) var/obj/item/weapon/bee_net/N = O if(N.caught_bees > 0) to_chat(user, "\blue You empty the bees into the apiary.") - bees_in_hive += N.caught_bees N.caught_bees = 0 else to_chat(user, "\blue There are no more bees in the net.") - else if(istype(O, /obj/item/weapon/reagent_containers/glass)) var/obj/item/weapon/reagent_containers/glass/G = O if(harvestable_honey > 0) if(health > 0) to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.") - angry_swarm(user) else to_chat(user, "\blue You begin to harvest the honey.") - if(do_after(user,50, target = src)) G.reagents.add_reagent("honey",harvestable_honey) harvestable_honey = 0 to_chat(user, "\blue You successfully harvest the honey.") - else to_chat(user, "\blue There is no honey left to harvest.") - else angry_swarm(user) ..() @@ -257,5 +242,4 @@ H.reagents.add_reagent("toxin", toxic) to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!") - angry_swarm(usr) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index ea0421a8df1..fc00e8740d3 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -68,17 +68,14 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass) && !panel_open) if(beaker) to_chat(user, "A container is already loaded into the machine.") - return else if(!user.drop_item()) to_chat(user, "\The [O] is stuck to you!") - return O.forceMove(src) beaker = O to_chat(user, "You add the container to the machine.") - updateUsrDialog() update_icon() return @@ -97,17 +94,14 @@ else if(istype(O, /obj/item/weapon/crowbar)) else if(panel_open) to_chat(user, "Close the maintenance panel first.") - else if(processing) to_chat(user, "The biogenerator is currently processing.") - else if(istype(O, /obj/item/weapon/storage/bag/plants)) var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) to_chat(user, "The biogenerator is already full! Activate it.") - else for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents) if(i >= max_items) @@ -116,31 +110,25 @@ i++ if(i < max_items) to_chat(user, "You empty the plant bag into the biogenerator.") - else if(O.contents.len == 0) to_chat(user, "You empty the plant bag into the biogenerator, filling it to its capacity.") - else to_chat(user, "You fill the biogenerator to its capacity.") - else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown) && !istype(O, /obj/item/weapon/crowbar)) to_chat(user, "You can not put this in [src.name]") - else var/i = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents) i++ if(i >= max_items) to_chat(user, "The biogenerator is full! Activate it.") - else user.unEquip(O) O.forceMove(src) to_chat(user, "You put [O.name] in [src.name]") - default_deconstruction_crowbar(O) update_icon() @@ -225,7 +213,6 @@ return if(src.processing) to_chat(usr, "The biogenerator is in the process of working.") - return var/S = 0 for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 15b89e44df7..873e08030a7 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -93,7 +93,6 @@ O.unset_machine() O.reset_view(null) to_chat(O, "The screen bursts into static.") - ..() @@ -130,7 +129,6 @@ // DECONSTRUCTION if(istype(W, /obj/item/weapon/screwdriver)) // to_chat(user, "You start to [panel_open ? "close" : "open"] the camera's panel.") - //if(toggle_panel(user)) // No delay because no one likes screwdrivers trying to be hip and have a duration cooldown panel_open = !panel_open user.visible_message("[user] screws the camera's panel [panel_open ? "open" : "closed"]!", @@ -143,7 +141,6 @@ else if(istype(W, /obj/item/weapon/weldingtool) && wires.CanDeconstruct()) if(weld(W, user)) to_chat(user, "You unweld the camera leaving it as just a frame screwed to the wall.") - if(!assembly) assembly = new() assembly.loc = src.loc @@ -158,30 +155,24 @@ upgradeXRay() qdel(W) to_chat(user, "[msg]") - else to_chat(user, "[msg2]") - else if(istype(W, /obj/item/stack/sheet/mineral/plasma) && panel_open) if(!isEmpProof()) upgradeEmpProof() to_chat(user, "[msg]") - qdel(W) else to_chat(user, "[msg2]") - else if(istype(W, /obj/item/device/assembly/prox_sensor) && panel_open) if(!isMotion()) upgradeMotion() to_chat(user, "[msg]") - qdel(W) else to_chat(user, "[msg2]") - // OTHER else if ((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user)) var/mob/living/U = user @@ -201,7 +192,6 @@ itemname = P.name info = N.notehtml to_chat(U, "You hold \the [itemname] up to the camera ...") - U.changeNext_move(CLICK_CD_MELEE) for(var/mob/O in player_list) if(istype(O, /mob/living/silicon/ai)) @@ -210,29 +200,23 @@ return if(U.name == "Unknown") to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") - else to_chat(AI, "[U] holds \a [itemname] up to one of your cameras ...") - AI.last_paper_seen = "[itemname][info]" else if (O.client && O.client.eye == src) to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...") - O << browse(text("[][]", itemname, info), text("window=[]", itemname)) else if (istype(W, /obj/item/device/camera_bug)) if (!src.can_use()) to_chat(user, "Camera non-functional.") - return if(istype(src.bug)) to_chat(user, "Camera bug removed.") - src.bug.bugged_cameras -= src.c_tag src.bug = null else to_chat(user, "Camera bugged.") - src.bug = W src.bug.bugged_cameras[src.c_tag] = src @@ -289,7 +273,6 @@ O.reset_view(null) to_chat(O, "The screen bursts into static.") - /obj/machinery/camera/proc/triggerCameraAlarm(var/duration = 0) alarm_on = 1 motion_alarm.triggerAlarm(loc, src) @@ -359,7 +342,6 @@ return 0 to_chat(user, "You start to weld [src]...") - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 100, target = src)) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index 956c17b921d..5b77c8f00fc 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -29,7 +29,6 @@ if(iswrench(W) && isturf(src.loc)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "You wrench the assembly into place.") - anchored = 1 state = 1 update_icon() @@ -41,7 +40,6 @@ if(iswelder(W)) if(weld(W, user)) to_chat(user, "You weld the assembly securely into place.") - anchored = 1 state = 2 return @@ -49,7 +47,6 @@ else if(iswrench(W)) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "You unattach the assembly from it's place.") - anchored = 0 update_icon() state = 0 @@ -61,18 +58,15 @@ var/obj/item/stack/cable_coil/C = W if(C.use(2)) to_chat(user, "You add wires to the assembly.") - state = 3 else to_chat(user, "You need 2 coils of wire to wire the assembly.") - return else if(iswelder(W)) if(weld(W, user)) to_chat(user, "You unweld the assembly from it's place.") - state = 1 anchored = 1 return @@ -86,13 +80,11 @@ var/input = strip_html(input(usr, "Which networks would you like to connect this camera to? Seperate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13")) if(!input) to_chat(usr, "No input found please hang up and try your call again.") - return var/list/tempnetwork = splittext(input, ",") if(tempnetwork.len < 1) to_chat(usr, "No network found please hang up and try your call again.") - return var/area/camera_area = get_area(src) @@ -128,14 +120,12 @@ new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "You cut the wires from the circuits.") - state = 2 return // Upgrades! if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already. to_chat(user, "You attach \the [W] into the assembly inner circuits.") - upgrades += W user.drop_item(W) W.loc = src @@ -146,7 +136,6 @@ var/obj/U = locate(/obj) in upgrades if(U) to_chat(user, "You unattach an upgrade from the assembly.") - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) U.loc = get_turf(src) upgrades -= U @@ -172,7 +161,6 @@ return 0 to_chat(user, "You start to weld the [src]..") - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) busy = 1 if(do_after(user, 20, target = src)) diff --git a/code/game/machinery/camera/tracking.dm b/code/game/machinery/camera/tracking.dm index 2f0c8390f21..0be7126f5a5 100644 --- a/code/game/machinery/camera/tracking.dm +++ b/code/game/machinery/camera/tracking.dm @@ -41,7 +41,6 @@ if(src.stat == 2) to_chat(src, "You can't list the cameras because you are dead!") - return if (!camera || camera == "Cancel") @@ -60,29 +59,24 @@ loc = sanitize(copytext(loc, 1, MAX_MESSAGE_LEN)) if(!loc) to_chat(src, "\red Must supply a location name") - return if(stored_locations.len >= max_locations) to_chat(src, "\red Cannot store additional locations. Remove one first") - return if(loc in stored_locations) to_chat(src, "\red There is already a stored location by this name") - return var/L = get_turf(eyeobj) if (InvalidTurf(get_turf(L))) to_chat(src, "\red Unable to store this location") - return stored_locations[loc] = L to_chat(src, "Location '[loc]' stored") - /mob/living/silicon/ai/proc/sorted_stored_locations() return sortList(stored_locations) @@ -93,7 +87,6 @@ if (!(loc in stored_locations)) to_chat(src, "\red Location [loc] not found") - return var/L = stored_locations[loc] @@ -106,13 +99,11 @@ if (!(loc in stored_locations)) to_chat(src, "\red Location [loc] not found") - return stored_locations.Remove(loc) to_chat(src, "Location [loc] removed") - // Used to allow the AI is write in mob names/camera name from the CMD line. /datum/trackable var/list/names = list() @@ -163,7 +154,6 @@ if(src.stat == DEAD) to_chat(src, "You can't track with camera because you are dead!") - return if(!target_name) return @@ -177,7 +167,6 @@ return to_chat(src, "Follow camera mode [forced ? "terminated" : "ended"].") - cameraFollow = null /mob/living/silicon/ai/proc/ai_actual_track(mob/living/target) @@ -189,20 +178,17 @@ U.tracking = 1 to_chat(U, "Attempting to track [target.get_visible_name()]...") - sleep(min(30, get_dist(target, U.eyeobj) / 4)) spawn(15) //give the AI a grace period to stop moving. U.tracking = 0 if(!target || !target.can_track(usr)) to_chat(U, "Target is not near any active cameras.") - U.cameraFollow = null return to_chat(U, "Now tracking [target.get_visible_name()] on camera.") - var/cameraticks = 0 spawn(0) while(U.cameraFollow == target) @@ -213,12 +199,10 @@ U.tracking = 1 if(!cameraticks) to_chat(U, "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...") - U.tracking = 0 return else diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 8165a59046f..bca8a6d8aa2 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -19,7 +19,6 @@ var/newlevel = round(charging.percent() * 4.0 / 99) // to_chat(world, "nl: [newlevel]") - if(chargelevel != newlevel) overlays.Cut() @@ -31,11 +30,9 @@ examine(mob/user) if(..(user, 5)) to_chat(user, "There's [charging ? "a" : "no"] cell in the charger.") - if(charging) to_chat(user, "Current charge: [charging.charge]") - attackby(obj/item/weapon/W, mob/user, params) if(stat & BROKEN) return @@ -43,7 +40,6 @@ if(istype(W, /obj/item/weapon/stock_parts/cell) && anchored) if(charging) to_chat(user, "\red 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 @@ -51,7 +47,6 @@ return if(a.power_equip == 0) // There's no APC in this area, don't try to cheat power! to_chat(user, "\red The [name] blinks red as you try to insert the cell!") - return user.drop_item() @@ -63,12 +58,10 @@ else if(istype(W, /obj/item/weapon/wrench)) if(charging) to_chat(user, "\red Remove the cell first!") - return anchored = !anchored to_chat(user, "You [anchored ? "attach" : "detach"] the cell charger [anchored ? "to" : "from"] the ground") - playsound(get_turf(src), 'sound/items/Ratchet.ogg', 75, 1) attack_hand(mob/user) @@ -95,7 +88,6 @@ process() // to_chat(world, "ccpt [charging] [stat]") - if(!charging || (stat & (BROKEN|NOPOWER)) || !anchored) return diff --git a/code/game/machinery/chiller.dm b/code/game/machinery/chiller.dm index c48f3f11edb..82fe014e160 100644 --- a/code/game/machinery/chiller.dm +++ b/code/game/machinery/chiller.dm @@ -27,15 +27,12 @@ /obj/machinery/space_heater/air_conditioner/examine(mob/user) ..(user) to_chat(user, "The air conditioner is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"].") - if(open) to_chat(user, "The power cell is [cell ? "installed" : "missing"].") - else to_chat(user, "The charge meter reads [cell ? round(cell.percent(),1) : 0]%") - /obj/machinery/space_heater/air_conditioner/emp_act(severity) if(stat & (BROKEN|NOPOWER)) ..(severity) @@ -49,7 +46,6 @@ if(open) if(cell) to_chat(user, "There is already a power cell inside.") - return else // insert cell @@ -63,7 +59,6 @@ user.visible_message("[user] inserts a power cell into [src].", "You insert the power cell into [src].") else to_chat(user, "The hatch must be open to insert a power cell.") - return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 137a5c4b217..1f8bbc44587 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -150,13 +150,11 @@ read_only = !read_only to_chat(user, "You flip the write-protect tab to [read_only ? "protected" : "unprotected"].") - /obj/item/weapon/disk/data/examine(mob/user) ..(user) to_chat(user, "The write-protect tab is set to [read_only ? "protected" : "unprotected"].") - //Health Tracker Implant /obj/item/weapon/implant/health @@ -185,7 +183,6 @@ if ((!isnull(occupant)) && (occupant.stat != 2)) var/completion = (100 * ((occupant.health + 100) / (heal_level + 100))) to_chat(user, "Current clone cycle is [round(completion)]% complete.") - return //Clonepod @@ -244,7 +241,6 @@ clonemind.transfer_to(H) to_chat(H, "Consciousness slowly creeps over you as your body regenerates.
So this is what cloning feels like?") - // -- Mode/mind specific stuff goes here callHook("clone", list(H)) @@ -349,7 +345,6 @@ if (istype(W, /obj/item/weapon/screwdriver)) if(occupant || mess || locked) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]", W) return @@ -365,23 +360,19 @@ if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if (!check_access(W)) to_chat(user, "\red Access Denied.") - return if ((!locked) || (isnull(occupant))) return if ((occupant.health < -20) && (occupant.stat != 2)) to_chat(user, "\red Access Refused.") - return else locked = 0 to_chat(user, "System unlocked.") - //Removing cloning pod biomass else if (istype(W, /obj/item/weapon/reagent_containers/food/snacks/meat)) to_chat(user, "\blue \The [src] processes \the [W].") - biomass += 50 user.drop_item() qdel(W) @@ -389,7 +380,6 @@ else if (istype(W, /obj/item/weapon/wrench)) if(locked && (anchored || occupant)) to_chat(user, "\red Can not do that while [src] is in use.") - else if(anchored) anchored = 0 @@ -406,7 +396,6 @@ var/obj/item/device/multitool/M = W M.buffer = src to_chat(user, "You load connection data from [src] to [M].") - return else ..() @@ -415,7 +404,6 @@ if (isnull(occupant)) return to_chat(user, "You force an emergency ejection.") - locked = 0 go_out() return @@ -456,12 +444,10 @@ if (!(occupant)) to_chat(user, "The cloning pod is empty!") - return if (locked) to_chat(user, "The cloning pod is locked!") - return if (occupant.client) diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index 6ade8685e74..809ac579454 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -165,9 +165,7 @@ playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "\blue You vastly increase projector power and override the safety and security protocols.") - to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.") - log_game("[key_name(usr)] emagged the Holodeck Control Computer") src.updateUsrDialog() @@ -370,7 +368,6 @@ if (istype(W, /obj/item/weapon/wrench)) to_chat(user, "It's a holotable! There are no bolts!") - return /obj/structure/table/holotable/wood @@ -411,7 +408,6 @@ /obj/structure/rack/holorack/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/wrench)) to_chat(user, "It's a holorack! There are no bolts!") - return /obj/item/weapon/holo @@ -472,14 +468,12 @@ w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 50, 1) to_chat(user, "[src] is now active.") - else force = 3 icon_state = "sword0" w_class = 2 playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -510,7 +504,6 @@ var/obj/item/weapon/grab/G = W if(G.state<2) to_chat(user, "You need a better grip to do that!") - return G.affecting.loc = src.loc G.affecting.Weaken(5) @@ -553,17 +546,14 @@ /obj/machinery/readybutton/attack_ai(mob/user as mob) to_chat(user, "The station AI is not to interact with these devices") - return /obj/machinery/readybutton/attackby(obj/item/weapon/W as obj, mob/user as mob, params) to_chat(user, "The device is a solid button, there's nothing you can do with it!") - /obj/machinery/readybutton/attack_hand(mob/user as mob) if(user.stat || stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered.") - return currentarea = get_area(src.loc) @@ -572,7 +562,6 @@ if(eventstarted) to_chat(usr, "The event has already begun!") - return ready = !ready @@ -603,4 +592,3 @@ for(var/mob/M in currentarea) to_chat(M, "FIGHT!") - diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm index bc010ad8ff5..8ad0b715b4f 100644 --- a/code/game/machinery/computer/ai_core.dm +++ b/code/game/machinery/computer/ai_core.dm @@ -25,20 +25,17 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You wrench the frame into place.") - anchored = 1 state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.isOn()) to_chat(user, "The welder must be on for this task.") - return playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(0, user)) return to_chat(user, "\blue You deconstruct the frame.") - new /obj/item/stack/sheet/plasteel(loc, 4) qdel(src) if(1) @@ -46,13 +43,11 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You unfasten the frame.") - anchored = 0 state = 0 if(istype(P, /obj/item/weapon/circuitboard/aicore) && !circuit) playsound(loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "\blue You place the circuit board inside the frame.") - icon_state = "1" circuit = P user.drop_item() @@ -60,13 +55,11 @@ if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You screw the circuit board into place.") - state = 2 icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the circuit board.") - state = 1 icon_state = "0" circuit.loc = loc @@ -75,7 +68,6 @@ if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You unfasten the circuit board.") - state = 1 icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -85,18 +77,15 @@ P:amount -= 5 if(!P:amount) qdel(P) to_chat(user, "\blue You add cables to the frame.") - state = 3 icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if (brain) to_chat(user, "Get that brain out of there first") - else playsound(loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "\blue You remove the cables.") - state = 2 icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( loc ) @@ -110,49 +99,41 @@ P:amount -= 2 if(!P:amount) qdel(P) to_chat(user, "\blue You put in the glass panel.") - state = 4 icon_state = "4" if(istype(P, /obj/item/weapon/aiModule/purge)) laws.clear_inherent_laws() to_chat(usr, "Law module applied.") - return if(istype(P, /obj/item/weapon/aiModule/freeform)) var/obj/item/weapon/aiModule/freeform/M = P laws.add_inherent_law(M.newFreeFormLaw) to_chat(usr, "Added a freeform law.") - return if(istype(P, /obj/item/weapon/aiModule)) var/obj/item/weapon/aiModule/M = P if(!M.laws) to_chat(usr, "This AI module can not be applied directly to AI cores.") - return laws = M.laws if(istype(P, /obj/item/device/mmi) || istype(P, /obj/item/device/mmi/posibrain)) if(!P:brainmob) to_chat(user, "\red Sticking an empty [P] into the frame would sort of defeat the purpose.") - return if(P:brainmob.stat == 2) to_chat(user, "\red Sticking a dead [P] into the frame would sort of defeat the purpose.") - return if(jobban_isbanned(P:brainmob, "AI") || jobban_isbanned(P:brainmob,"nonhumandept")) to_chat(user, "\red This [P] does not seem to fit.") - return if(istype(P, /obj/item/device/mmi/syndie)) to_chat(user, "This MMI does not seem to fit!") - return if(P:brainmob.mind) @@ -163,13 +144,11 @@ P.loc = src brain = P to_chat(usr, "Added [P].") - icon_state = "3b" if(istype(P, /obj/item/weapon/crowbar) && brain) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the brain.") - brain.loc = loc brain = null icon_state = "3" @@ -178,7 +157,6 @@ if(istype(P, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the glass panel.") - state = 3 if (brain) icon_state = "3b" @@ -190,7 +168,6 @@ if(istype(P, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You connect the monitor.") - if(!brain) var/open_for_latejoin = alert(user, "Would you like this core to be open for latejoining AIs?", "Latejoin", "Yes", "Yes", "No") == "Yes" var/obj/structure/AIcore/deactivated/D = new(loc) @@ -250,7 +227,6 @@ if(!cores.len) to_chat(src, "No deactivated AI cores were found.") - var/id = input("Which core?", "Toggle AI Core Latejoin", null) as null|anything in cores if(!id) return @@ -260,13 +236,11 @@ if(D in empty_playable_ai_cores) empty_playable_ai_cores -= D to_chat(src, "\The [id] is now not available for latejoining AIs.") - else empty_playable_ai_cores += D to_chat(src, "\The [id] is now available for latejoining AIs.") - /* This is a good place for AI-related object verbs so I'm sticking it here. If adding stuff to this, don't forget that an AI need to cancel_camera() whenever it physically moves to a different location. @@ -279,7 +253,6 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A if(istype(card)) if(card.flush) to_chat(user, "ERROR: AI flush is in progress, cannot execute transfer protocol.") - return 0 return 1 @@ -293,10 +266,7 @@ atom/proc/transfer_ai(var/interaction, var/mob/user, var/mob/living/silicon/ai/A AI.aiRadio.disabledAi = 0 AI.loc = 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.") - qdel(src) else //If for some reason you use an empty card on an empty AI terminal. to_chat(user, "There is no AI loaded on this terminal!") - diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index 34c2ceedaed..e326d9750d5 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -14,10 +14,8 @@ if(occupant && istype(I, /obj/item/weapon/screwdriver)) if(stat & (NOPOWER|BROKEN)) to_chat(user, "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.") - return else ..() @@ -33,7 +31,6 @@ if(mode.kickoff) to_chat(user, "You have been locked out from this console!") - /obj/machinery/computer/aifixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] if(occupant) @@ -118,30 +115,23 @@ if(interaction == AI_TRANS_FROM_CARD) if(stat & (NOPOWER|BROKEN)) to_chat(user, "[src] is offline and cannot take an AI at this time!") - return AI.loc = src occupant = AI AI.control_disabled = 1 AI.aiRadio.disabledAi = 1 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.") - update_icon() else //Uploading AI from terminal to card if(occupant && !active) to_chat(occupant, "You have been downloaded to a mobile storage device. Still no remote access.") - to_chat(user, "Transfer successful: [occupant.name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.") - occupant.loc = card occupant = null update_icon() else if (active) to_chat(user, "ERROR: Reconstruction in progress.") - else if (!occupant) to_chat(user, "ERROR: Unable to locate artificial intelligence.") - diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index a9de75bfd03..0948c8ae3a1 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -369,7 +369,6 @@ if(emagged) user.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.") - if(fuel <= 0) dat += "
You ran out of fuel, and drift, slowly, into a star." if(emagged) @@ -377,12 +376,10 @@ 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.") - dat += "

OK...

" if(emagged) to_chat(user, "You're never going to make it to Orion...") - user.death() emagged = 0 //removes the emagged status after you lose playing = 0 //also a new game @@ -451,11 +448,9 @@ 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?") - 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...") - M.take_organ_damage(30) playsound(loc, 'sound/weapons/genhit2.ogg', 100, 1) if(ORION_TRAIL_ILLNESS) @@ -463,14 +458,11 @@ if(severity == 1) to_chat(M, "You suddenly feel slightly nauseous.")//got off lucky - if(severity == 2) to_chat(usr, "You suddenly feel extremely nauseous and hunch over until it passes.") - M.Stun(3) 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.") - M.Stun(5) sleep(30) atom_say("[M] violently throws up!") @@ -487,7 +479,6 @@ playsound(src.loc, 'sound/weapons/Genhit.ogg', 100, 1) else to_chat(M, "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(src.loc, 'sound/effects/bang.ogg', 100, 1) @@ -967,7 +958,6 @@ /obj/machinery/computer/arcade/orion_trail/emag_act(mob/user) if(!emagged) to_chat(user, "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() @@ -1007,11 +997,9 @@ return if(!active) to_chat(user, "There's a little switch on the bottom. It's flipped down.") - else to_chat(user, "There's a little switch on the bottom. It's flipped up.") - /obj/item/weapon/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) return @@ -1020,7 +1008,6 @@ log_game("[key_name(usr)] primed an explosive Orion ship for detonation.") to_chat(user, "You flip the switch on the underside of [src].") - active = 1 visible_message("[src] softly beeps and whirs to life!") playsound(src.loc, 'sound/machines/defib_SaftyOn.ogg', 25, 1) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 8262c5819e3..b128b06bf49 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -305,7 +305,6 @@ return else to_chat(user, "DERP! BUG! Report this (And what you were doing to cause it) to Agouri") - return /obj/item/weapon/circuitboard/rdconsole/attackby(obj/item/I as obj, mob/user as mob, params) @@ -338,10 +337,8 @@ id = 5 to_chat(user, "Access protocols set to [console_choice].") - else to_chat(user, "Access Denied") - return /obj/structure/computerframe/attackby(obj/item/P as obj, mob/user as mob, params) @@ -351,20 +348,17 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You wrench the frame into place.") - src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You deconstruct the frame.") - new /obj/item/stack/sheet/metal( src.loc, 5 ) qdel(src) if(1) @@ -372,7 +366,6 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You unfasten the frame.") - src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) @@ -380,24 +373,20 @@ if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "\blue You place the circuit board inside the frame.") - src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else to_chat(user, "\red This frame does not accept circuit boards of this type!") - if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You screw the circuit board into place.") - src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the circuit board.") - src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -406,7 +395,6 @@ if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You unfasten the circuit board.") - src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -417,14 +405,12 @@ P:amount -= 5 if(!P:amount) qdel(P) to_chat(user, "\blue You add cables to the frame.") - src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "\blue You remove the cables.") - src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -437,21 +423,18 @@ if(P) P:use(2) to_chat(user, "\blue You put in the glass panel.") - src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the glass panel.") - src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You connect the monitor.") - var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -476,20 +459,17 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You wrench the frame into place.") - src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You deconstruct the frame.") - new /obj/item/stack/sheet/mineral/bananium( src.loc, 5 ) qdel(src) if(1) @@ -497,7 +477,6 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You unfasten the frame.") - src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) @@ -505,24 +484,20 @@ if(B.board_type == "honkcomputer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "\blue You place the circuit board inside the frame.") - src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else to_chat(user, "\red This frame does not accept circuit boards of this type!") - if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You screw the circuit board into place.") - src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the circuit board.") - src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -531,7 +506,6 @@ if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You unfasten the circuit board.") - src.state = 1 src.icon_state = "1" if(istype(P, /obj/item/stack/cable_coil)) @@ -542,14 +516,12 @@ P:amount -= 5 if(!P:amount) qdel(P) to_chat(user, "\blue You add cables to the frame.") - src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "\blue You remove the cables.") - src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -562,21 +534,18 @@ if(P) P:use(2) to_chat(user, "\blue You put in the glass panel.") - src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the glass panel.") - src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You connect the monitor.") - var/B = new src.circuit.build_path ( src.loc ) if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index aa061a53a4f..0311ac200fb 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -62,7 +62,6 @@ if(!emagged) emagged = 1 to_chat(user, "\blue You have authorized full network access!") - ui_interact(user) else ui_interact(user) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 62828afa084..44fe97e0915 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -56,7 +56,6 @@ else to_chat(user, "The console is already in use!") - /mob/camera/aiEye/remote name = "Inactive Camera Eye" var/sprint = 10 diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 91b5092db88..7af28cc4f73 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -102,21 +102,18 @@ var/time_last_changed_position = 0 if(scan) to_chat(usr, "You remove \the [scan] from \the [src].") - scan.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(scan) scan = null else if(modify) to_chat(usr, "You remove \the [modify] from \the [src].") - modify.loc = get_turf(src) if(!usr.get_active_hand()) usr.put_in_hands(modify) modify = null else to_chat(usr, "There is nothing to remove from the console.") - return /obj/machinery/computer/card/attackby(obj/item/weapon/card/id/id_card, mob/user, params) @@ -326,7 +323,6 @@ var/time_last_changed_position = 0 break if(!jobdatum) to_chat(usr, "\red No log exists for this job: [t1]") - return access = jobdatum.get_access() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 1252d1617f3..4e51c1e1dad 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -88,7 +88,6 @@ W.loc = src src.diskette = W to_chat(user, "You insert [W].") - nanomanager.update_uis(src) return else if(istype(W, /obj/item/device/multitool)) @@ -100,7 +99,6 @@ P.connected = src P.name = "[initial(P.name)] #[pods.len]" to_chat(user, "You connect [P] to [src].") - else ..() return @@ -330,7 +328,6 @@ return to_chat(selected, 'sound/machines/chime.ogg')//probably not the best sound but I think it's reasonable - var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod.growclone(C)) temp = "Initiating cloning cycle..." diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 4973d4cb32b..90b415c99bf 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -48,7 +48,6 @@ else if(message) to_chat(user, "Access denied.") - return 0 /obj/machinery/computer/communications/Topic(href, href_list) @@ -57,13 +56,11 @@ if ((!(src.z in config.station_levels) && !(src.z in config.admin_levels))) to_chat(usr, "Unable to establish a connection: You're too far away from the station!") - return 1 if(href_list["login"]) if(!ishuman(usr)) to_chat(usr, "Access denied.") - return var/mob/living/carbon/human/M = usr var/obj/item/card = M.get_active_hand() @@ -100,7 +97,6 @@ if("newalertlevel") if(isAI(usr) || isrobot(usr)) to_chat(usr, "Firewalls prevent you from changing the alert level.") - nanomanager.update_uis(src) return 1 tmp_alertlevel = text2num(href_list["level"]) @@ -129,18 +125,15 @@ tmp_alertlevel = 0 else to_chat(usr, "You are not authorized to do this.") - tmp_alertlevel = 0 setMenuState(usr,COMM_SCREEN_MAIN) else to_chat(usr, "You need to swipe your ID.") - if("announce") if(is_authenticated(usr) == 2) if(message_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements.") - nanomanager.update_uis(src) return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") @@ -166,7 +159,6 @@ if("cancelshuttle") if(isAI(usr) || isrobot(usr)) to_chat(usr, "Firewalls prevent you from recalling the shuttle.") - nanomanager.update_uis(src) return 1 var/response = alert("Are you sure you wish to recall the shuttle?", "Confirm", "Yes", "No") @@ -224,7 +216,6 @@ if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please enter the reason for requesting the nuclear self-destruct codes. Misuse of the nuclear request system will not be tolerated under any circumstances. Transmission does not guarantee a response.", "Self Destruct Code Request.","") as text|null @@ -233,7 +224,6 @@ return Nuke_request(input, usr) to_chat(usr, "Request sent.") - log_say("[key_name(usr)] has requested the nuclear codes from Centcomm") priority_announcement.Announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/AI/commandreport.ogg') centcomm_message_cooldown = 1 @@ -245,7 +235,6 @@ if(is_authenticated(usr) == 2) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -254,7 +243,6 @@ return Centcomm_announce(input, usr) to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -266,7 +254,6 @@ if((is_authenticated(usr) == 2) && (src.emagged)) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - nanomanager.update_uis(src) return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") as text|null @@ -275,7 +262,6 @@ return Syndicate_announce(input, usr) to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -284,7 +270,6 @@ if("RestoreBackup") to_chat(usr, "Backup routing data restored!") - src.emagged = 0 setMenuState(usr,COMM_SCREEN_MAIN) @@ -295,7 +280,6 @@ if(!emagged) src.emagged = 1 to_chat(user, "You scramble the communication routing circuits!") - nanomanager.update_uis(src) /obj/machinery/computer/communications/attack_ai(var/mob/user as mob) @@ -310,7 +294,6 @@ if (!(src.z in list(ZLEVEL_STATION, ZLEVEL_CENTCOMM))) to_chat(user, "Unable to establish a connection: You're too far away from the station!") - return ui_interact(user) @@ -415,22 +398,18 @@ /proc/call_shuttle_proc(var/mob/user, var/reason) if(sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") - return if(shuttle_master.emergencyNoEscape) to_chat(user, "The emergency shuttle may not be sent at this time. Please try again later.") - return if(shuttle_master.emergency.mode > SHUTTLE_ESCAPE) to_chat(user, "The emergency shuttle may not be called while returning to Central Command.") - return if(ticker.mode.name == "blob") to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") - return shuttle_master.requestEvac(user, reason) @@ -444,22 +423,18 @@ if(!force) if(shuttle_master.emergencyNoEscape) to_chat(user, "Central Command does not currently have a shuttle available in your sector. Please try again later.") - return if(sent_strike_team == 1) to_chat(user, "Central Command will not allow the shuttle to be called. Consider all contracts terminated.") - return if(world.time < 54000) // 30 minute grace period to let the game get going to_chat(user, "The shuttle is refueling. Please wait another [round((54000-world.time)/600)] minutes before trying again.") - return if(ticker.mode.name == "epidemic") to_chat(user, "Under directive 7-10, [station_name()] is quarantined until further notice.") - return if(seclevel2num(get_security_level()) >= SEC_LEVEL_RED) // There is a serious threat we gotta move no time to give them five minutes. diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm index 9d503300cb0..8524cd85754 100644 --- a/code/game/machinery/computer/computer.dm +++ b/code/game/machinery/computer/computer.dm @@ -121,13 +121,11 @@ C.loc = src.loc if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - new /obj/item/weapon/shard(loc) A.state = 3 A.icon_state = "3" else to_chat(user, "\blue You disconnect the monitor.") - A.state = 4 A.icon_state = "4" qdel(src) diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index ab0c29a35aa..8ccd36fc780 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -22,7 +22,6 @@ return 1 if (!(src.z in config.station_levels)) to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") - return usr.set_machine(src) @@ -48,14 +47,12 @@ if(src.authenticated==1) if(message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - return var/input = stripped_input(usr, "Please choose a message to transmit to your HONKbrothers on the homeworld. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !(usr in view(1,src))) return HONK_announce(input, usr) to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made a HONKplanet announcement: [input]") message_cooldown = 1 spawn(6000)//10 minute cooldown @@ -68,13 +65,11 @@ src.emagged = 1 to_chat(user, "You scramble the login circuits, allowing anyone to use the console!") - /obj/machinery/computer/HONKputer/attack_hand(var/mob/user as mob) if(..()) return if (src.z > 6) to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") - return user.set_machine(src) @@ -82,7 +77,6 @@ if (istype(user, /mob/living/silicon)) to_chat(user, "This console is not networked to the rest of the grid.") - return switch(src.state) @@ -111,13 +105,11 @@ C.loc = src.loc if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - new /obj/item/weapon/shard( src.loc ) A.state = 3 A.icon_state = "3" else to_chat(user, "\blue You disconnect the monitor.") - A.state = 4 A.icon_state = "4" qdel(src) diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 5c0a8774183..c84690cfa64 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -23,17 +23,14 @@ opened = !opened if(opened) to_chat(usr, "\blue The access panel is now open.") - else to_chat(usr, "\blue The access panel is now closed.") - return attackby(obj/item/weapon/O as obj, mob/user as mob, params) if (user.z > 6) to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") - return if(istype(O, /obj/item/weapon/aiModule)) var/datum/game_mode/nations/mode = get_nations_mode() @@ -43,7 +40,6 @@ else if(mode.kickoff) to_chat(user, "You have been locked out from modifying the AI's laws!") - else ..() @@ -51,21 +47,17 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(src.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return src.current = select_active_ai(user) if (!src.current) to_chat(usr, "No active AIs detected.") - else to_chat(usr, "[src.current.name] selected for law changes.") - return attack_ghost(user as mob) @@ -88,7 +80,6 @@ else if(mode.kickoff) to_chat(user, "You have been locked out from modifying the borg's laws!") - else return ..() @@ -96,21 +87,17 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(src.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return src.current = freeborg() if (!src.current) to_chat(usr, "No free cyborgs detected.") - else to_chat(usr, "[src.current.name] selected for law changes.") - return attack_ghost(user as mob) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index 89e0a8badb2..a56fe597b13 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -46,7 +46,6 @@ if(isscrewdriver(O) && emag) //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!") - return ..() @@ -75,7 +74,6 @@ else to_chat(user, "A no server error appears on the screen.") - /obj/machinery/computer/message_monitor/update_icon() if(emag || hacking) icon_screen = hack_icon @@ -299,11 +297,9 @@ /obj/machinery/computer/message_monitor/proc/BruteForce(mob/user as mob) if(isnull(linkedServer)) to_chat(user, "Could not complete brute-force: Linked Server Disconnected!") - else var/currentKey = src.linkedServer.decryptkey to_chat(user, "Brute-force completed! The key is '[currentKey]'.") - src.hacking = 0 src.icon_screen = normal_icon src.screen = 0 // Return the screen back to normal @@ -524,7 +520,6 @@ // to_chat(usr, href_list["select"]) - if (href_list["back"]) src.screen = 0 // View chat room list diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 5c07b2ed14e..38e6c139f2e 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -277,7 +277,6 @@ /obj/machinery/computer/pod/old/syndicate/attack_hand(var/mob/user as mob) if(!allowed(user)) to_chat(user, "Access Denied") - return else ..() diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index d20a23d2de1..7ae15a086f2 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -93,7 +93,6 @@ inserted_id = I else to_chat(usr, "\red No valid ID.") - if("1") inserted_id.loc = get_step(src,get_turf(usr)) inserted_id = null @@ -121,7 +120,6 @@ else to_chat(usr, "Unauthorized access.") - else if(href_list["warn"]) var/warning = sanitize(copytext(input(usr,"Message:","Enter your message here!",""),1,MAX_MESSAGE_LEN)) if(!warning) return @@ -130,7 +128,6 @@ var/mob/living/carbon/R = I.imp_in to_chat(R, "You hear a voice in your head saying: '[warning]'") - src.add_fingerprint(usr) src.updateUsrDialog() return diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index f6ea30cc353..ccdd9b3f276 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -28,7 +28,6 @@ to_chat(user, "You have been locked out from this console!") - /obj/machinery/computer/robotics/proc/is_authenticated(var/mob/user as mob) if(isobserver(user) && check_rights(R_ADMIN, 0, user)) return 1 @@ -61,7 +60,6 @@ var/mob/user = usr if(!is_authenticated(user)) to_chat(user, "Access denied.") - return // Destroys the cyborg @@ -71,12 +69,10 @@ return if(isAI(user) && (target.connected_ai != user)) to_chat(user, "Access Denied. This robot is not linked to you.") - return // Cyborgs may blow up themselves via the console if(isrobot(user) && user != target) to_chat(user, "Access Denied.") - return var/choice = input("Really detonate [target.name]?") in list ("Yes", "No") if(choice != "Yes") @@ -87,16 +83,13 @@ // Antagonistic cyborgs? Left here for downstream if(target.mind && target.mind.special_role && target.emagged) to_chat(target, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") - target.ResetSecurityCodes() else message_admins("[key_name_admin(usr)] detonated [key_name_admin(target)] (JMP)!") log_game("\[key_name(usr)] detonated [key_name(target)]!") to_chat(target, "Self-destruct command received.") - if(target.connected_ai) to_chat(target.connected_ai, "

ALERT - Cyborg detonation detected: [target.name]
") - spawn(10) target.self_destruct() @@ -108,12 +101,10 @@ if(isAI(user) && (target.connected_ai != user)) to_chat(user, "Access Denied. This robot is not linked to you.") - return if(isrobot(user)) to_chat(user, "Access Denied.") - return var/choice = input("Really [target.lockcharge ? "unlock" : "lockdown"] [target.name] ?") in list ("Yes", "No") @@ -128,11 +119,9 @@ target.canmove = !target.canmove target.lockcharge = !target.lockcharge to_chat(target, "[!target.lockcharge ? "Your lockdown has been lifted!" : "You have been locked down!"]") - if(target.connected_ai) to_chat(target.connected_ai, "[!target.lockcharge ? "NOTICE - Cyborg lockdown lifted" : "ALERT - Cyborg lockdown detected"]: [target.name]
") - // Remotely hacks the cyborg. Only antag AIs can do this and only to linked cyborgs. else if (href_list["hack"]) var/mob/living/silicon/robot/target = get_cyborg_by_name(href_list["hack"]) @@ -142,17 +131,14 @@ // Antag AI checks if(!istype(user, /mob/living/silicon/ai) || !(user.mind.special_role && user.mind.original == user)) to_chat(user, "Access Denied.") - return if(target.connected_ai != user) to_chat(user, "Access Denied. This robot is not linked to you.") - return if(target.emagged) to_chat(user, "Robot is already hacked.") - return var/choice = input("Really hack [target.name]? This cannot be undone.") in list("Yes", "No") @@ -167,27 +153,22 @@ target.emagged = 1 to_chat(target, "Failsafe protocols overriden. New tools available.") - // Arms the emergency self-destruct system else if(href_list["arm"]) if(istype(user, /mob/living/silicon)) to_chat(user, "Access Denied.") - return safety = !safety to_chat(user, "You [safety ? "disarm" : "arm"] the emergency self destruct.") - // Destroys all accessible cyborgs if safety is disabled else if(href_list["nuke"]) if(istype(user, /mob/living/silicon)) to_chat(user, "Access Denied") - return if(safety) to_chat(user, "Self-destruct aborted - safety active") - return message_admins("[key_name_admin(usr)] detonated all cyborgs!") @@ -200,10 +181,8 @@ if(R.scrambledcodes) continue to_chat(R, "Self-destruct command received.") - if(R.connected_ai) to_chat(R.connected_ai, "

ALERT - Cyborg detonation detected: [R.name]
") - spawn(10) R.self_destruct() diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index ffbef848e08..c0693c810d3 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -47,7 +47,6 @@ /obj/machinery/computer/salvage_ship/attack_hand(mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied") - return user.set_machine(src) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index e7fc19e9a3c..2a074a9880b 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -32,7 +32,6 @@ O.loc = src scan = O to_chat(user, "You insert [O].") - ..() /obj/machinery/computer/secure_data/attack_ai(mob/user as mob) @@ -44,7 +43,6 @@ return if (src.z > 6) to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") - return var/dat diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index c273102481d..d2f44de6011 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -31,7 +31,6 @@ O.loc = src scan = O to_chat(user, "You insert [O].") - ..() /obj/machinery/computer/skills/attack_ai(mob/user as mob) @@ -43,7 +42,6 @@ return if (src.z > 6) to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") - return var/dat diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index be2531b76d0..d74e27bc702 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -91,7 +91,6 @@ var/specops_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "\red You have arrived at Central Command. Operation has ended!") - specops_shuttle_at_station = 0 for(var/obj/machinery/computer/specops_shuttle/S in world) @@ -139,7 +138,6 @@ var/specops_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Special Operations shuttle is unable to leave.") - return //Begin Marauder launchpad. @@ -235,7 +233,6 @@ var/specops_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "\red You have arrived to [station_name]. Commence operation!") - for(var/obj/machinery/computer/specops_shuttle/S in world) S.specops_shuttle_timereset = world.time + SPECOPS_RETURN_DELAY @@ -251,26 +248,22 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer/specops_shuttle/attack_ai(var/mob/user as mob) to_chat(user, "\red Access Denied.") - return 1 /obj/machinery/computer/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else return attack_hand(user) /obj/machinery/computer/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied.") - return //Commented out so admins can do shenanigans at their leisure. Also makes the force-spawned admin ERTs able to use the shuttle. // if (sent_strike_team == 0 && send_emergency_team == 0) // to_chat(usr, "\red The strike team has not yet deployed.") - // return if(..()) @@ -302,18 +295,14 @@ var/specops_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return yet.") - if(world.timeofday <= specops_shuttle_timereset) if (((world.timeofday - specops_shuttle_timereset)/10) > 60) to_chat(usr, "\blue [-((world.timeofday - specops_shuttle_timereset)/10)/60] minutes remain!") - to_chat(usr, "\blue [-(world.timeofday - specops_shuttle_timereset)/10] seconds remain!") - return to_chat(usr, "\blue The Special Operations shuttle will arrive at Central Command in [(SPECOPS_MOVETIME/10)] seconds.") - temp += "Shuttle departing.

OK" updateUsrDialog() @@ -327,12 +316,10 @@ var/specops_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Special Operations shuttle is unable to leave.") - return to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") - temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/store.dm b/code/game/machinery/computer/store.dm index 1c2bb4e52c9..c8ae8741288 100644 --- a/code/game/machinery/computer/store.dm +++ b/code/game/machinery/computer/store.dm @@ -141,9 +141,7 @@ td.cost.toomuch { return if(!centcomm_store.PlaceOrder(usr,itemID)) to_chat(usr, "\red Unable to charge your account.") - else to_chat(usr, "\blue You've successfully purchased the item. It should be in your hands or on the floor.") - src.updateUsrDialog() return diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 97dbc32a7ac..16de635b0e7 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -61,7 +61,6 @@ var/syndicate_elite_shuttle_timeleft = 0 if (!syndicate_elite_can_move()) to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") - return sleep(600) @@ -175,7 +174,6 @@ var/syndicate_elite_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "\red You have arrived to [station_name]. Commence operation!") - /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 else return 1 @@ -185,25 +183,21 @@ var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer/syndicate_elite_shuttle/attack_ai(var/mob/user as mob) to_chat(user, "\red Access Denied.") - return 1 /obj/machinery/computer/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/weapon/card/emag)) to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else return attack_hand(user) /obj/machinery/computer/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied.") - return // if (sent_syndicate_strike_team == 0) // to_chat(usr, "\red The strike team has not yet deployed.") - // return if(..()) @@ -234,7 +228,6 @@ var/syndicate_elite_shuttle_timeleft = 0 if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.") - return else if (href_list["sendtostation"]) @@ -242,12 +235,10 @@ var/syndicate_elite_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") - return to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") - temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 38d5c359e2d..cc5934d9808 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -35,7 +35,6 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F if(uplinkholder) to_chat(user, "The [src] already has an uplink in it.") - return if(O.hidden_uplink) @@ -51,7 +50,6 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F - /obj/machinery/computer/telecrystals/uplinker/update_icon() overlays.Cut() ..() diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index ecedaa9b6ce..8886c865722 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -60,7 +60,6 @@ /obj/machinery/constructable_frame/machine_frame/attackby(obj/item/P as obj, mob/user as mob, params) if(P.crit_fail) to_chat(user, "This part is faulty, you cannot add this to the machine!") - return switch(state) if(1) @@ -69,27 +68,22 @@ if(C.amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You start to add cables to the frame.") - if(do_after(user, 20, target = src)) if(C.amount >= 5 && state == 1) C.use(5) to_chat(user, "You add cables to the frame.") - state = 2 icon_state = "box_1" else to_chat(user, "You need five length of cable to wire the frame.") - return else if(istype(P, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = P if(G.amount<5) to_chat(user, "\red You do not have enough glass to build a display case.") - return G.use(5) to_chat(user, "\blue You add the glass to the frame.") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/displaycase_frame(src.loc) qdel(src) @@ -98,7 +92,6 @@ if(istype(P, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) to_chat(user, "You dismantle the frame.") - new /obj/item/stack/sheet/metal(src.loc, 5) qdel(src) if(2) @@ -107,7 +100,6 @@ if(B.board_type == "machine") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "You add the circuit board to the frame.") - circuit = P user.drop_item() P.loc = src @@ -119,11 +111,9 @@ update_req_desc() else to_chat(user, "This frame does not accept circuit boards of this type!") - if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "You remove the cables.") - state = 1 icon_state = "box_0" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil(src.loc,5) @@ -137,10 +127,8 @@ circuit = null if(components.len == 0) to_chat(user, "You remove the circuit board.") - else to_chat(user, "You remove the circuit board and other components.") - for(var/obj/item/I in components) I.loc = src.loc desc = initial(desc) @@ -190,7 +178,6 @@ for(var/obj/item/weapon/stock_parts/part in added_components) components += part to_chat(user, "[part.name] applied.") - replacer.play_rped_sound() update_req_desc() @@ -221,7 +208,6 @@ return 1 if(!success) to_chat(user, "You cannot add that to the machine!") - return 0 //Machine Frame Circuit Boards @@ -260,7 +246,6 @@ to destroy them and players will be able to make replacements. build_path = typepath name = "circuit board ([names_paths[build_path]] Vendor)" to_chat(user, "You set the board to [names_paths[build_path]].") - req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) /obj/item/weapon/circuitboard/smes @@ -320,13 +305,11 @@ to destroy them and players will be able to make replacements. build_path = /obj/machinery/atmospherics/unary/heat_reservoir/heater name = "circuit board (Heater)" to_chat(user, "You set the board to heating.") - else build_path = /obj/machinery/atmospherics/unary/cold_sink/freezer name = "circuit board (Freezer)" to_chat(user, "You set the board to cooling.") - /obj/item/weapon/circuitboard/biogenerator name = "circuit board (Biogenerator)" build_path = /obj/machinery/biogenerator diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 3b8c594ac4c..6a1f0721253 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -98,19 +98,16 @@ return if(occupant) to_chat(user, "\blue The cryo cell is already occupied!") - return var/mob/living/L = O if(!istype(L) || L.buckled) return if(L.abiotic()) to_chat(user, "\red Subject cannot have abiotic items on.") - return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) to_chat(usr, "[L.name] will not fit into the cryo cell because they have a slime latched onto their head.") - return if(put_mob(L)) if(L == user) @@ -165,7 +162,6 @@ if(panel_open) to_chat(usr, "\blue Close the maintenance panel first.") - return ui_interact(user) @@ -278,11 +274,9 @@ if(istype(G, /obj/item/weapon/reagent_containers/glass)) if(beaker) to_chat(user, "\red A beaker is already loaded into the machine.") - return if(!user.drop_item()) to_chat(user, "The [G] is stuck to you!") - return G.forceMove(src) beaker = G @@ -292,7 +286,6 @@ if (istype(G, /obj/item/weapon/screwdriver)) if(occupant || on) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "pod0-o", "pod0", G) return @@ -305,14 +298,12 @@ if(istype(G, /obj/item/weapon/grab)) if(panel_open) to_chat(user, "\blue Close the maintenance panel first.") - return if(!ismob(G:affecting)) return for(var/mob/living/carbon/slime/M in range(1,G:affecting)) if(M.Victim == G:affecting) to_chat(usr, "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head.") - return var/mob/M = G:affecting if(put_mob(M)) @@ -434,19 +425,15 @@ /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob) if (!istype(M)) to_chat(usr, "\red The cryo cell cannot handle such a lifeform!") - return if (occupant) to_chat(usr, "\red The cryo cell is already occupied!") - return if (M.abiotic()) to_chat(usr, "\red Subject may not have abiotic items on.") - return if(!node) to_chat(usr, "\red The cell is not correctly connected to its pipe network!") - return if (M.client) M.client.perspective = EYE_PERSPECTIVE @@ -455,7 +442,6 @@ M.forceMove(src) if(M.health > -100 && (M.health < 0 || M.sleeping)) to_chat(M, "\blue You feel a cold liquid surround you. Your skin starts to freeze up.") - occupant = M // M.metabslow = 1 add_fingerprint(usr) @@ -471,7 +457,6 @@ if (usr.stat == 2)//and he's not dead.... return to_chat(usr, "\blue Release sequence activated. This will take two minutes.") - sleep(600) if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already return @@ -490,7 +475,6 @@ for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) to_chat(usr, "You're too busy getting your life sucked out of you.") - return if (usr.stat != 0 || stat & (NOPOWER|BROKEN)) return diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index f47b17c7589..8de2f1baf60 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -95,13 +95,11 @@ else if(href_list["item"]) if(!allowed(user)) to_chat(user, "Access Denied.") - return if(!allow_items) return if(frozen_items.len == 0) to_chat(user, "There is nothing to recover from storage.") - return var/obj/item/I = input(usr, "Please choose which object to retrieve.","Object recovery",null) as null|anything in frozen_items @@ -110,7 +108,6 @@ if(!(I in frozen_items)) to_chat(user, "\The [I] is no longer in storage.") - return visible_message("The console beeps happily as it disgorges \the [I].") @@ -121,13 +118,11 @@ else if(href_list["allitems"]) if(!allowed(user)) to_chat(user, "Access Denied.") - return if(!allow_items) return if(frozen_items.len == 0) to_chat(user, "There is nothing to recover from storage.") - return visible_message("The console beeps happily as it disgorges the desired objects.") @@ -369,7 +364,6 @@ if(O.target == occupant.mind) if(O.owner && O.owner.current) to_chat(O.owner.current, "You get the feeling your target is no longer within your reach. Time for Plan [pick(list("A","B","C","D","X","Y","Z"))]...") - O.target = null spawn(1) //This should ideally fire after the occupant is deleted. if(!O) return @@ -442,7 +436,6 @@ if(occupant) to_chat(user, "\The [src] is in use.") - return if(!ismob(G:affecting)) @@ -456,7 +449,6 @@ if(!istype(M) || M.stat == DEAD) to_chat(user, "Dead people can not be put into cryo.") - return if(M.client) @@ -475,7 +467,6 @@ if(src.occupant) to_chat(user, "\The [src] is in use.") - return M.loc = src @@ -486,7 +477,6 @@ else //because why the fuck would you keep going if the mob isn't in the pod to_chat(user, "You stop putting [M] into the cryopod.") - return if(orient_right) @@ -495,10 +485,8 @@ icon_state = occupied_icon_state to_chat(M, "[on_enter_occupant_message]") - to_chat(M, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") - occupant = M time_entered = world.time @@ -509,7 +497,6 @@ if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever to_chat(Gh, "Warning: Your body has entered cryostorage.") - // Book keeping! log_admin("[key_name(M)] has entered a stasis pod.") message_admins("[key_name_admin(user)] has entered a stasis pod. (JMP)") @@ -538,7 +525,6 @@ return if(occupant) to_chat(user, "\blue The cryo pod is already occupied!") - return @@ -548,13 +534,11 @@ if(L.stat == DEAD) to_chat(user, "Dead people can not be put into cryo.") - return for(var/mob/living/carbon/slime/M in range(1,L)) if(M.Victim == L) to_chat(usr, "[L.name] will not fit into the cryo pod because they have a slime latched onto their head.") - return @@ -578,7 +562,6 @@ if(src.occupant) to_chat(user, "\The [src] is in use.") - return L.loc = src @@ -587,7 +570,6 @@ L.client.eye = src else to_chat(user, "You stop [L == user ? "climbing into the cryo pod." : "putting [L] into the cryo pod."]") - return if(orient_right) @@ -596,9 +578,7 @@ icon_state = occupied_icon_state to_chat(L, "[on_enter_occupant_message]") - to_chat(L, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") - occupant = L time_entered = world.time @@ -609,7 +589,6 @@ if(Gh.client && Gh.client.holder) //just in case someone has a byond name with @ at the start, which I don't think is even possible but whatever to_chat(Gh, "Warning: Your body has entered cryostorage.") - // Book keeping! log_admin("[key_name_admin(L)] has entered a stasis pod. (JMP)") message_admins("[key_name_admin(L)] has entered a stasis pod.") @@ -629,7 +608,6 @@ if(usr != occupant) to_chat(usr, "The cryopod is in use and locked!") - return if(orient_right) @@ -661,13 +639,11 @@ if(src.occupant) to_chat(usr, "\The [src] is in use.") - return for(var/mob/living/carbon/slime/M in range(1,usr)) if(M.Victim == usr) to_chat(usr, "You're too busy getting your life sucked out of you.") - return visible_message("[usr] starts climbing into \the [src].") @@ -679,7 +655,6 @@ if(src.occupant) to_chat(usr, "\The [src] is in use.") - return usr.stop_pulling() @@ -694,9 +669,7 @@ icon_state = occupied_icon_state to_chat(usr, "[on_enter_occupant_message]") - to_chat(usr, "If you ghost, log out or close your client now, your character will shortly be permanently removed from the round.") - occupant = usr time_entered = world.time diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a5d849814df..df7d3319c06 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -181,11 +181,9 @@ for reference: src.icon_state = "barrier[src.locked]" if ((src.locked == 1.0) && (src.emagged < 2.0)) to_chat(user, "Barrier lock toggled on.") - return else if ((src.locked == 0.0) && (src.emagged < 2.0)) to_chat(user, "Barrier lock toggled off.") - return else var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -223,7 +221,6 @@ for reference: emagged = 1 req_access = null to_chat(user, "You break the ID authentication lock on the [src].") - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() @@ -231,7 +228,6 @@ for reference: else if (src.emagged == 1) src.emagged = 2 to_chat(user, "You short out the anchoring mechanism on the [src].") - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 1, src) s.start() diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 6623e673269..d2172bd9294 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -37,7 +37,6 @@ else to_chat(user, "Error, no route to host.") - /obj/machinery/door_control/attackby(obj/item/weapon/W, mob/user as mob, params) /* For later implementation if (istype(W, /obj/item/weapon/screwdriver)) @@ -71,7 +70,6 @@ if(!allowed(user) && (wires & 1)) to_chat(user, "\red Access Denied") - flick("doorctrl-denied",src) return @@ -152,7 +150,6 @@ playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30, target = src)) to_chat(user, "You detach \the [src] from the wall.") - new/obj/item/mounted/frame/driver_button(get_turf(src)) qdel(src) return 1 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index ec9b80c26de..1df75829613 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -299,7 +299,6 @@ ..(user) else to_chat(user, "You do not know how to operate this airlock's mechanism.") - return /obj/machinery/door/airlock/alien/attackby(C as obj, mob/user as mob, params) @@ -307,7 +306,6 @@ ..(C, user) else to_chat(user, "You do not know how to operate this airlock's mechanism.") - return @@ -354,7 +352,6 @@ About the new airlock wires panel: return else if(user.hallucination > 50 && prob(10) && src.operating == 0) to_chat(user, "\red You feel a powerful shock course through your body!") - user.adjustStaminaLoss(50) user.AdjustStunned(5) return @@ -468,7 +465,6 @@ About the new airlock wires panel: if(feedback && message) to_chat(usr, message) - // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise // The preceding comment was borrowed from the grille's shock script @@ -572,54 +568,42 @@ About the new airlock wires panel: spawn(20) //TODO: Make this take a minute to_chat(user, "Airlock AI control has been blocked. Beginning fault-detection.") - sleep(50) if(src.canAIControl()) to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") - src.aiHacking=0 return else if(!src.canAIHack(user)) to_chat(user, "We've lost our connection! Unable to hack airlock.") - src.aiHacking=0 return to_chat(user, "Fault confirmed: airlock control wire disabled or cut.") - sleep(20) to_chat(user, "Attempting to hack into airlock. This may take some time.") - sleep(200) if(src.canAIControl()) to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") - src.aiHacking=0 return else if(!src.canAIHack(user)) to_chat(user, "We've lost our connection! Unable to hack airlock.") - src.aiHacking=0 return to_chat(user, "Upload access confirmed. Loading control program into airlock software.") - sleep(170) if(src.canAIControl()) to_chat(user, "Alert cancelled. Airlock control has been restored without our assistance.") - src.aiHacking=0 return else if(!src.canAIHack(user)) to_chat(user, "We've lost our connection! Unable to hack airlock.") - src.aiHacking=0 return to_chat(user, "Transfer complete. Forcing airlock to execute program.") - sleep(50) //disable blocked control src.aiControlDisabled = 2 to_chat(user, "Receiving control information from airlock.") - sleep(10) //bring up airlock dialog src.aiHacking = 0 @@ -669,7 +653,6 @@ About the new airlock wires panel: if(operating < 0) //emagged to_chat(user, "Unable to interface: Internal error.") - return STATUS_CLOSE if(!src.canAIControl()) if(src.canAIHack(user)) @@ -677,10 +660,8 @@ About the new airlock wires panel: else if (src.isAllPowerLoss()) //don't really like how this gets checked a second time, but not sure how else to do it. to_chat(user, "Unable to interface: Connection timed out.") - else to_chat(user, "Unable to interface: Connection refused.") - return STATUS_CLOSE return ..() @@ -694,15 +675,12 @@ About the new airlock wires panel: if("idscan") if(src.isWireCut(AIRLOCK_WIRE_IDSCAN)) to_chat(usr, "The IdScan wire has been cut - IdScan feature permanently disabled.") - else if(activate && src.aiDisabledIdScanner) src.aiDisabledIdScanner = 0 to_chat(usr, "IdScan feature has been enabled.") - else if(!activate && !src.aiDisabledIdScanner) src.aiDisabledIdScanner = 1 to_chat(usr, "IdScan feature has been disabled.") - if("main_power") if(!main_power_lost_until) src.loseMainPower() @@ -712,48 +690,37 @@ About the new airlock wires panel: if("bolts") if(src.isWireCut(AIRLOCK_WIRE_DOOR_BOLTS)) to_chat(usr, "The door bolt control wire has been cut - Door bolts permanently dropped.") - else if(activate && src.lock()) to_chat(usr, "The door bolts have been dropped.") - else if(!activate && src.unlock()) to_chat(usr, "The door bolts have been raised.") - if("electrify_temporary") if(activate && src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) to_chat(usr, text("The electrification wire is cut - Door permanently electrified.")) - else if(!activate && electrified_until != 0) to_chat(usr, "The door is now un-electrified.") - electrify(0) else if(activate) //electrify door for 30 seconds shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") to_chat(usr, "The door is now electrified for thirty seconds.") - electrify(30) if("electrify_permanently") if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY)) to_chat(usr, text("The electrification wire is cut - Cannot electrify the door.")) - else if(!activate && electrified_until != 0) to_chat(usr, "The door is now un-electrified.") - electrify(0) else if(activate) shockedby += text("\[[time_stamp()]\][usr](ckey:[usr.ckey])") usr.attack_log += text("\[[time_stamp()]\] Electrified the [name] at [x] [y] [z]") to_chat(usr, "The door is now electrified.") - electrify(-1) if("open") if(src.welded) to_chat(usr, text("The airlock has been welded shut!")) - else if(src.locked) to_chat(usr, text("The door bolts are down!")) - else if(activate && density) open() else if(!activate && !density) @@ -762,7 +729,6 @@ About the new airlock wires panel: // Safeties! We don't need no stinking safeties! if (src.isWireCut(AIRLOCK_WIRE_SAFETY)) to_chat(usr, text("The safety wire is cut - Cannot secure the door.")) - else if (activate && src.safe) safe = 0 else if (!activate && !src.safe) @@ -771,7 +737,6 @@ About the new airlock wires panel: // Door speed control if(src.isWireCut(AIRLOCK_WIRE_SPEED)) to_chat(usr, text("The timing wire is cut - Cannot alter timing.")) - else if (activate && src.normalspeed) normalspeed = 0 else if (!activate && !src.normalspeed) @@ -780,32 +745,26 @@ About the new airlock wires panel: // Bolt lights if(src.isWireCut(AIRLOCK_WIRE_LIGHT)) to_chat(usr, "The bolt lights wire has been cut - The door bolt lights are permanently disabled.") - else if (!activate && src.lights) lights = 0 to_chat(usr, "The door bolt lights have been disabled.") - else if (activate && !src.lights) lights = 1 to_chat(usr, "The door bolt lights have been enabled.") - if("emergency") // Emergency access if (src.emergency) emergency = 0 to_chat(usr, "Emergency access has been disabled.") - else emergency = 1 to_chat(usr, "Emergency access has been enabled.") - update_icon() return 1 /obj/machinery/door/airlock/attackby(C as obj, mob/user as mob, params) // to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -851,7 +810,6 @@ About the new airlock wires panel: if(do_after(user,40, target = src)) to_chat(user, "\blue You removed the airlock electronics!") - var/obj/structure/door_assembly/da = new assembly_type(src.loc) da.anchored = 1 if(mineral) @@ -885,10 +843,8 @@ About the new airlock wires panel: return else if(arePowerSystemsOn()) to_chat(user, "\blue The airlock's motors resist your efforts to force it.") - else if(locked) to_chat(user, "\blue The airlock's bolts prevent it from being forced.") - else if( !welded && !operating ) if(density) if(beingcrowbarred == 0) //being fireaxe'd @@ -897,7 +853,6 @@ About the new airlock wires panel: spawn(0) open(1) else to_chat(user, "\red You need to be wielding \the [C] to do that.") - else spawn(0) open(1) else @@ -907,7 +862,6 @@ About the new airlock wires panel: spawn(0) close(1) else to_chat(user, "\red You need to be wielding \the [C] to do that.") - else spawn(0) close(1) else @@ -1035,7 +989,6 @@ About the new airlock wires panel: /obj/machinery/door/airlock/hatch/gamma/attackby(C as obj, mob/user as mob, params) // to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) @@ -1045,12 +998,10 @@ About the new airlock wires panel: if(istype(C, /obj/item/weapon/c4)) to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!") - return if(istype(C, /obj/item/mecha_parts/mecha_equipment/tool/rcd) || istype(C, /obj/item/weapon/rcd)) to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.") - return src.add_fingerprint(user) @@ -1071,7 +1022,6 @@ About the new airlock wires panel: /obj/machinery/door/airlock/highsecurity/red/attackby(C as obj, mob/user as mob, params) // to_chat(world, text("airlock attackby src [] obj [] mob []", src, C, user)) - if(!istype(usr, /mob/living/silicon)) if(src.isElectrified()) if(src.shock(user, 75)) diff --git a/code/game/machinery/doors/airlock_control.dm b/code/game/machinery/doors/airlock_control.dm index 23616877584..5f55eb26fc2 100644 --- a/code/game/machinery/doors/airlock_control.dm +++ b/code/game/machinery/doors/airlock_control.dm @@ -262,7 +262,6 @@ obj/machinery/access_button/attack_hand(mob/user) if(!allowed(user)) to_chat(user, "\red Access Denied") - else if(radio_connection) var/datum/signal/signal = new signal.transmission_method = 1 //radio signal diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 856bba62002..09f4885dc07 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -80,7 +80,6 @@ if(blocked) to_chat(user, "\red \The [src] is welded solid!") - return var/area/A = get_area_master(src) @@ -144,12 +143,10 @@ if(user.stat || user.stunned || user.weakened || user.paralysis || get_dist(src, user) > 1) to_chat(user, "Sorry, you must remain able bodied and close to \the [src] in order to use it.") - return if(alarmed && density && !access_granted) to_chat(user, "Access denied. Please wait for authorities to arrive, or for the alert to clear.") - return else @@ -182,7 +179,6 @@ if(blocked) to_chat(user, "\red \The [src] is welded solid!") - return var/area/A = get_area_master(src) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index b3520b18d61..39ed81b3360 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -261,12 +261,10 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(src.density || src.operating) to_chat(user, "You need to open the door to access the maintenance panel.") - return playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) src.p_open = !( src.p_open ) to_chat(user, "You [p_open ? "open":"close"] the maintenance panel of the [src.name].") - return if(istype(I, /obj/item/weapon/crowbar)) @@ -297,13 +295,11 @@ if(emagged) to_chat(user, "You discard the damaged electronics.") - qdel(src) return to_chat(user, "You removed the airlock electronics!") - var/obj/item/weapon/airlock_electronics/ae if(!electronics) ae = new/obj/item/weapon/airlock_electronics( src.loc ) diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 4fe4d4a70da..cbb9aabd20f 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -25,12 +25,10 @@ var/list/doppler_arrays = list() anchored = 1 power_change() to_chat(user, "You fasten [src].") - else if(anchored) anchored = 0 power_change() to_chat(user, "You unfasten [src].") - playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) /obj/machinery/doppler_array/verb/rotate() diff --git a/code/game/machinery/drying_rack.dm b/code/game/machinery/drying_rack.dm index 4ea0b2fc242..9ec3974483f 100644 --- a/code/game/machinery/drying_rack.dm +++ b/code/game/machinery/drying_rack.dm @@ -38,7 +38,6 @@ user.unEquip(W) del(W) to_chat(user, "You add the meat to the drying rack.") - src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -52,7 +51,6 @@ user.unEquip(W) del(W) to_chat(user, "You add the grapes to the drying rack.") - src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -66,7 +64,6 @@ user.unEquip(W) del(W) to_chat(user, "You add the green grapes to the drying rack.") - src.running = 1 use_power = 2 icon_state = "drying_rack_on" @@ -82,7 +79,6 @@ var/obj/item/weapon/reagent_containers/food/snacks/grown/B = W B.reagents.trans_to(src, B.reagents.total_volume) to_chat(user, "You add the [W] to the drying rack.") - user.unEquip(W) del(W) src.running = 1 @@ -92,7 +88,6 @@ icon_state = "drying_rack" var/obj/item/weapon/reagent_containers/food/snacks/grown/D = new J(src.loc) to_chat(user, "\blue You finish drying the [D]") - D.icon_state = "[D.icon_state]_dry" D.dry = 1 D.reagents.remove_any(50) @@ -102,12 +97,9 @@ return else to_chat(user, "\red That has already been dried!") - else to_chat(user, "\red Please wait until the last item has dried.") - else to_chat(user, "\red You cannot add that to the drying rack.") - diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 1ec59676410..0ffb9c3d7dc 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -141,22 +141,15 @@ /datum/computer/file/embedded_program/docking/proc/print_state() to_chat(world, "id_tag: [id_tag]") - to_chat(world, "dock_state: [dock_state]") - to_chat(world, "control_mode: [control_mode]") - to_chat(world, "tag_target: [tag_target]") - to_chat(world, "response_sent: [response_sent]") - /datum/computer/file/embedded_program/docking/post_signal(datum/signal/signal, comm_line) to_chat(world, "Program [id_tag] sent a message!") - print_state() to_chat(world, "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") - ..(signal) /obj/machinery/embedded_controller/radio/airlock/docking_port/verb/view_state() diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index 5fd89767ca4..f7ca5b1339a 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -114,22 +114,15 @@ /datum/computer/file/embedded_program/docking/multi/proc/print_state() to_chat(world, "id_tag: [id_tag]") - to_chat(world, "dock_state: [dock_state]") - to_chat(world, "control_mode: [control_mode]") - to_chat(world, "tag_target: [tag_target]") - to_chat(world, "response_sent: [response_sent]") - /datum/computer/file/embedded_program/docking/multi/post_signal(datum/signal/signal, comm_line) to_chat(world, "Program [id_tag] sent a message!") - print_state() to_chat(world, "[id_tag] sent command \"[signal.data["command"]]\" to \"[signal.data["recipient"]]\"") - ..(signal) /obj/machinery/embedded_controller/radio/docking_port_multi/verb/view_state() diff --git a/code/game/machinery/embedded_controller/docking_program.dm b/code/game/machinery/embedded_controller/docking_program.dm index 12c05170c13..aa938c663bc 100644 --- a/code/game/machinery/embedded_controller/docking_program.dm +++ b/code/game/machinery/embedded_controller/docking_program.dm @@ -240,7 +240,6 @@ /datum/computer/file/embedded_program/docking/proc/force_undock() // to_chat(world, "[id_tag]: forcing undock") - if (tag_target) send_docking_command(tag_target, "dock_error") reset() diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 553422a33cd..3426023f13c 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -90,7 +90,6 @@ FIRE ALARM else if(istype(W, /obj/item/weapon/wirecutters)) // cutting the wires out to_chat(user, "You cut the wires!") - playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) var/obj/item/stack/cable_coil/new_coil = new /obj/item/stack/cable_coil() new_coil.amount = 5 @@ -102,17 +101,14 @@ FIRE ALARM var/obj/item/stack/cable_coil/coil = W if(!coil.use(5)) to_chat(user, "You cut the wires!") - return buildstage = 2 to_chat(user, "You wire \the [src]!") - update_icon() else if(istype(W, /obj/item/weapon/crowbar)) to_chat(user, "You pry out the circuit!") - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) spawn(20) var/obj/item/weapon/firealarm_electronics/circuit = new /obj/item/weapon/firealarm_electronics() @@ -122,14 +118,12 @@ FIRE ALARM if(0) if(istype(W, /obj/item/weapon/firealarm_electronics)) to_chat(user, "You insert the circuit!") - qdel(W) buildstage = 1 update_icon() else if(istype(W, /obj/item/weapon/wrench)) to_chat(user, "You remove the fire alarm assembly from the wall!") - new /obj/item/mounted/frame/firealarm(get_turf(user)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) qdel(src) diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm index b13dfc3bb07..7c5e152529f 100644 --- a/code/game/machinery/floodlight.dm +++ b/code/game/machinery/floodlight.dm @@ -48,14 +48,12 @@ src.cell = null to_chat(user, "You remove the power cell") - updateicon() return if(on) on = 0 to_chat(user, "\blue You turn off the light") - set_light(0) else if(!cell) @@ -64,7 +62,6 @@ return on = 1 to_chat(user, "\blue You turn on the light") - set_light(brightness_on) updateicon() @@ -91,34 +88,28 @@ if(unlocked) unlocked = 0 to_chat(user, "You screw the battery panel in place.") - else unlocked = 1 to_chat(user, "You unscrew the battery panel.") - if (istype(W, /obj/item/weapon/crowbar)) if(unlocked) if(open) open = 0 overlays = null to_chat(user, "You crowbar the battery panel in place.") - else if(unlocked) open = 1 to_chat(user, "You remove the battery panel.") - if (istype(W, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) to_chat(user, "There is a power cell already installed.") - else user.drop_item() W.loc = src cell = W to_chat(user, "You insert the power cell.") - updateicon() diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 02797bc44b5..b63307c3db8 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -20,18 +20,13 @@ ..(user) if (world.time < expiration_time) to_chat(user, "This pass expires at [worldtime2text(expiration_time)].") - else to_chat(user, "It expired at [worldtime2text(expiration_time)].") - to_chat(user, "It grants access to following areas:") - for (var/A in temp_access) to_chat(user, "[get_access_desc(A)].") - to_chat(user, "Issuing reason: [reason].") - ///////////////////////////////////////////// //Guest pass terminal//////////////////////// ///////////////////////////////////////////// @@ -63,7 +58,6 @@ else to_chat(user, "There is already ID card inside.") - /obj/machinery/computer/guestpass/attack_ai(var/mob/user as mob) return attack_hand(user) @@ -125,7 +119,6 @@ duration = dur else to_chat(usr, "Invalid duration.") - if ("access") var/A = text2num(href_list["access"]) if (A in accesses) @@ -158,7 +151,6 @@ for (var/entry in internal_log) dat += "[entry]
" // to_chat(usr, "Printing the log, standby...") - //sleep(50) var/obj/item/weapon/paper/P = new/obj/item/weapon/paper( loc ) playsound(loc, "sound/goonstation/machines/printer_dotmatrix.ogg", 50, 1) @@ -185,6 +177,5 @@ pass.name = "guest pass #[number]" else to_chat(usr, "\red Cannot issue pass without issuing ID.") - updateUsrDialog() return \ No newline at end of file diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 384168c119f..c8e16257858 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -73,16 +73,13 @@ var/const/HOLOPAD_MODE = 0 if(last_request + 200 < world.time) //don't spam the AI with requests you jerk! last_request = world.time to_chat(user, "You request an AI's presence.") - var/area/area = get_area(src) for(var/mob/living/silicon/ai/AI in living_mob_list) if(!AI.client) continue to_chat(AI, "Your presence is requested at \the [area].") - else to_chat(user, "A request for AI presence was already sent recently.") - /obj/machinery/hologram/holopad/attack_ai(mob/living/silicon/ai/user) if (!istype(user)) return @@ -104,10 +101,8 @@ var/const/HOLOPAD_MODE = 0 src.visible_message("A holographic image of [user] flicks to life right before your eyes!") else to_chat(user, "\red ERROR: \black Image feed in progress.") - else to_chat(user, "\red ERROR: \black Unable to project hologram.") - return /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. @@ -258,7 +253,6 @@ Holographic project of everything else. hologram.icon = flat_icon to_chat(world, "Your icon should appear now.") - return */ diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 45f9e2e84b7..5caff96d4ea 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -61,19 +61,16 @@ if (istype(W, /obj/item/weapon/reagent_containers)) if(!isnull(src.beaker)) to_chat(user, "There is already a reagent container loaded!") - return if(user.drop_item()) W.forceMove(src) src.beaker = W to_chat(user, "You attach \the [W] to \the [src].") - src.update_icon() return else to_chat(user, "\The [W] is stuck to you!") - else return ..() @@ -150,7 +147,6 @@ if(!istype(usr, /mob/living)) to_chat(usr, "\red You can't do that.") - return if(usr.stat) @@ -159,24 +155,18 @@ mode = !mode to_chat(usr, "The IV drip is now [mode ? "injecting" : "taking blood"].") - /obj/machinery/iv_drip/examine(mob/user) ..(user) if (!(user in view(2)) && usr != src.loc) return to_chat(usr, "The IV drip is [mode ? "injecting" : "taking blood"].") - if(beaker) if(beaker.reagents && beaker.reagents.reagent_list.len) to_chat(user, "\blue Attached is \a [beaker] with [beaker.reagents.total_volume] units of liquid.") - else to_chat(user, "\blue Attached is an empty [beaker].") - else to_chat(user, "\blue No chemicals are attached.") - to_chat(user, "\blue [attached ? attached : "No one"] is attached.") - diff --git a/code/game/machinery/kitchen/gibber.dm b/code/game/machinery/kitchen/gibber.dm index 2de6678f35d..4c271a08f44 100644 --- a/code/game/machinery/kitchen/gibber.dm +++ b/code/game/machinery/kitchen/gibber.dm @@ -64,12 +64,10 @@ if(operating) to_chat(user, "The gibber is locked and running, wait for it to finish.") - return if(locked) to_chat(user, "Wait for [occupant.name] to finish being loaded!") - return else @@ -80,7 +78,6 @@ var/obj/item/weapon/grab/G = P if(G.state < 2) to_chat(user, "You need a better grip to do that!") - return move_into_gibber(user,G.affecting) qdel(G) @@ -114,22 +111,18 @@ /obj/machinery/gibber/proc/move_into_gibber(var/mob/user,var/mob/living/victim) if(occupant) to_chat(user, "The gibber is full, empty it first!") - return if(operating) to_chat(user, "The gibber is locked and running, wait for it to finish.") - return if(!ishuman(victim) || issmall(victim)) to_chat(user, "This is not suitable for the gibber!") - return if(victim.abiotic(1)) to_chat(user, "Subject may not have abiotic items on.") - return user.visible_message("[user] starts to put [victim] into the gibber!") diff --git a/code/game/machinery/kitchen/icecream_vat.dm b/code/game/machinery/kitchen/icecream_vat.dm index 8619b0689be..a5e1cc1eafb 100644 --- a/code/game/machinery/kitchen/icecream_vat.dm +++ b/code/game/machinery/kitchen/icecream_vat.dm @@ -108,25 +108,19 @@ var/list/ingredients_source = list( I.reagents.add_reagent("sugar", 10 - I.reagents.total_volume) else to_chat(user, "There is not enough [flavour_name] flavouring left! Insert more of the required ingredients.") - else to_chat(user, "There is not enough icecream left! Insert more milk and ice.") - else to_chat(user, "[O] already has icecream in it.") - else if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(held_container) to_chat(user, "You must remove [held_container] from [src] first.") - else if(!user.drop_item()) to_chat(user, "\The [O] is stuck to your hand!") - return O.forceMove(src) to_chat(user, "You insert [O] into [src].") - held_container = O else var/obj/item/weapon/reagent_containers/R = O @@ -158,7 +152,6 @@ var/list/ingredients_source = list( src.visible_message("[user] cooks up some waffle cones.") else to_chat(user, "You require sugar and flour to make waffle cones.") - if(CONE_CHOC) if(ingredients[FLAVOUR_CHOCOLATE] > 0 && ingredients[CONE_WAFFLE] > 0) var/amount = min(ingredients[CONE_WAFFLE], ingredients[FLAVOUR_CHOCOLATE]) @@ -168,7 +161,6 @@ var/list/ingredients_source = list( src.visible_message("[user] cooks up some chocolate cones.") else to_chat(user, "You require waffle cones and chocolate flavouring to make chocolate cones.") - if(ICECREAM_VANILLA) if(ingredients[INGR_ICE] > 0 && ingredients[INGR_MILK] > 0) var/amount = min(ingredients[INGR_ICE], ingredients[INGR_MILK]) @@ -178,7 +170,6 @@ var/list/ingredients_source = list( src.visible_message("[user] whips up some vanilla icecream.") else to_chat(user, "You require milk and ice to make vanilla icecream.") - updateDialog() /obj/machinery/icecream_vat/Topic(href, href_list) @@ -201,7 +192,6 @@ var/list/ingredients_source = list( src.visible_message("[usr] dispenses a crunchy [cone_name] cone from [src].") else to_chat(usr, "There are no [cone_name] cones left!") - updateDialog() if(href_list["make"]) diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index def4500bb3c..7b25e683941 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -43,7 +43,6 @@ else if(!user.unEquip(O)) to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return 0 O.forceMove(src) beaker = O @@ -53,11 +52,9 @@ return 0 if (!is_type_in_list(O, allowed_items)) to_chat(user, "It doesn't look like that contains any juice.") - return 1 if(!user.unEquip(O)) to_chat(user, "\the [O] is stuck to your hand, you cannot put it in \the [src]") - return 0 O.forceMove(src) src.updateUsrDialog() diff --git a/code/game/machinery/kitchen/kitchen_machine.dm b/code/game/machinery/kitchen/kitchen_machine.dm index 8161d18e017..5c584d0468b 100644 --- a/code/game/machinery/kitchen/kitchen_machine.dm +++ b/code/game/machinery/kitchen/kitchen_machine.dm @@ -69,12 +69,10 @@ if(anchored) anchored = 0 to_chat(user, "\The [src] can now be moved.") - return else if(!anchored) anchored = 1 to_chat(user, "\The [src] is now secured.") - return default_deconstruction_crowbar(O) @@ -107,7 +105,6 @@ src.flags = OPENCONTAINER else to_chat(user, "It's broken!") - return 1 else if(src.dirty==100) // The machine is all dirty so can't be used! if(istype(O, /obj/item/weapon/reagent_containers/spray/cleaner) || istype(O, /obj/item/weapon/soap)) // If they're trying to clean it then let them @@ -126,12 +123,10 @@ src.flags = OPENCONTAINER else //Otherwise bad luck!! to_chat(user, "It's dirty!") - return 1 else if(is_type_in_list(O,acceptable_items)) if (contents.len>=max_n_of_items) to_chat(user, "This [src] is full of ingredients, you cannot put more.") - return 1 if (istype(O,/obj/item/stack) && O:amount>1) new O.type (src) @@ -142,7 +137,6 @@ else if(!user.drop_item()) to_chat(user, "\The [O] is stuck to your hand, you cannot put it in \the [src]") - return 0 O.forceMove(src) @@ -158,17 +152,14 @@ for (var/datum/reagent/R in O.reagents.reagent_list) if (!(R.id in acceptable_reagents)) to_chat(user, "Your [O] contains components unsuitable for cookery.") - return 1 //G.reagents.trans_to(src,G.amount_per_transfer_from_this) else if(istype(O,/obj/item/weapon/grab)) var/obj/item/weapon/grab/G = O to_chat(user, "This is ridiculous. You can not fit \the [G.affecting] in this [src].") - return 1 else to_chat(user, "You have no idea what you can cook with this [O].") - return 1 src.updateUsrDialog() @@ -353,7 +344,6 @@ src.dirty++ src.reagents.clear_reagents() to_chat(usr, "You dispose of \the [src]'s contents.") - src.updateUsrDialog() /obj/machinery/kitchen_machine/proc/muck_start() diff --git a/code/game/machinery/kitchen/monkeyrecycler.dm b/code/game/machinery/kitchen/monkeyrecycler.dm index 4d2cbca7974..d41558c161e 100644 --- a/code/game/machinery/kitchen/monkeyrecycler.dm +++ b/code/game/machinery/kitchen/monkeyrecycler.dm @@ -54,12 +54,10 @@ if(issmall(target)) if(target.stat == 0) to_chat(user, "The monkey is struggling far too much to put it in the recycler.") - else user.drop_item() qdel(target) to_chat(user, "You stuff the monkey in 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 @@ -68,13 +66,10 @@ sleep(50) pixel_x = initial(pixel_x) to_chat(user, "The machine now has [grinded] monkey\s worth of material stored.") - else to_chat(user, "The machine only accepts monkeys!") - else to_chat(user, "The machine only accepts monkeys!") - return /obj/machinery/monkey_recycler/attack_hand(var/mob/user as mob) @@ -82,14 +77,11 @@ return if(grinded >= required_grind) to_chat(user, "The machine hisses loudly as it condenses the grinded monkey meat. After a moment, it dispenses a brand new monkey cube.") - playsound(src.loc, 'sound/machines/hiss.ogg', 50, 1) grinded -= required_grind for(var/i = 0, i < cube_production, i++) // Forgot to fix this bit the first time through new /obj/item/weapon/reagent_containers/food/snacks/monkeycube(src.loc) to_chat(user, "The machine's display flashes that it has [grinded] monkey\s worth of material left.") - else // I'm not sure if the \s macro works with a word in between; I'll play it safe to_chat(user, "The machine needs at least [required_grind] monkey\s worth of material to compress [cube_production] monkey\s. It only has [grinded].") - return \ No newline at end of file diff --git a/code/game/machinery/kitchen/processor.dm b/code/game/machinery/kitchen/processor.dm index a3adc7cbae0..0b739e2b269 100644 --- a/code/game/machinery/kitchen/processor.dm +++ b/code/game/machinery/kitchen/processor.dm @@ -136,7 +136,6 @@ if(src.processing) to_chat(user, "\the [src] is already processing something!") - return 1 if(default_deconstruction_screwdriver(user, "processor1", "processor", O)) @@ -160,7 +159,6 @@ if (!P) to_chat(user, "That probably won't blend.") - return 1 user.visible_message("\the [user] puts \the [what] into \the [src].", \ @@ -177,12 +175,10 @@ if(src.processing) to_chat(user, "\the [src] is already processing something!") - return 1 if(src.contents.len == 0) to_chat(user, "\the [src] is empty.") - return 1 src.processing = 1 user.visible_message("[user] turns on [src].", \ diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 0cc3e5ce688..7978aee0c0a 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -195,7 +195,6 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -217,18 +216,15 @@ if(stat & NOPOWER) to_chat(user, "\The [src] is unpowered and useless.") - return if(accept_check(O)) if(contents.len >= max_n_of_items) to_chat(user, "\The [src] is full.") - return 1 else if(!user.drop_item()) to_chat(user, "\The [O] is stuck to you!") - return O.forceMove(src) @@ -247,7 +243,6 @@ if(accept_check(G)) if(contents.len >= max_n_of_items) to_chat(user, "\The [src] is full.") - return 1 else P.remove_from_storage(G,src) @@ -262,12 +257,10 @@ if(P.contents.len > 0) to_chat(user, "Some items are refused.") - nanomanager.update_uis(src) else to_chat(user, "\The [src] smartly refuses [O].") - return 1 /obj/machinery/smartfridge/attack_ai(mob/user as mob) @@ -289,7 +282,6 @@ if(stat & NOPOWER) to_chat(user, "\The [src] is unpowered and useless.") - return var/obj/item/weapon/storage/box/pillbottles/P = over_object @@ -298,7 +290,6 @@ if(accept_check(G)) if(contents.len >= max_n_of_items) to_chat(user, "\The [src] is full.") - return 1 else P.remove_from_storage(G,src) @@ -313,7 +304,6 @@ "You empty \the [P] into \the [src].") if(P.contents.len > 0) to_chat(user, "Some items are refused.") - nanomanager.update_uis(src) /obj/machinery/smartfridge/secure/emag_act(user as mob) @@ -321,7 +311,6 @@ locked = -1 to_chat(user, "You short out the product lock on [src].") - /******************* * SmartFridge Menu ********************/ @@ -420,7 +409,6 @@ if(usr.contents.Find(src) || (in_range(src, usr) && istype(loc, /turf))) if(!allowed(usr) && !emagged && locked != -1 && href_list["vend"]) to_chat(usr, "Access denied.") - nanomanager.update_uis(src) return 0 return ..() \ No newline at end of file diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 55c78bb1a17..f83a92ff3e7 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -42,7 +42,6 @@ to_chat(user, "A light switch. It is [on? "on" : "off"].") - /obj/machinery/light_switch/attack_hand(mob/user) on = !on diff --git a/code/game/machinery/machinery.dm b/code/game/machinery/machinery.dm index e2735942c79..11fa7f71393 100644 --- a/code/game/machinery/machinery.dm +++ b/code/game/machinery/machinery.dm @@ -223,7 +223,6 @@ Class Procs: return 1 if(!(href_list["set_tag"] in vars)) to_chat(usr, "Something went wrong: Unable to find [href_list["set_tag"]] in vars!") - return 1 var/current_tag = src.vars[href_list["set_tag"]] var/newid = copytext(reject_bad_text(input(usr, "Specify the new value", src, current_tag) as null|text),1,MAX_MESSAGE_LEN) @@ -241,15 +240,12 @@ Class Procs: return 1 if(!canLink(O)) to_chat(usr, "\red You can't link with that device.") - return 1 if(unlinkFrom(usr, O)) to_chat(usr, "\blue A green light flashes on \the [P], confirming the link was removed.") - else to_chat(usr, "\red A red light flashes on \the [P]. It appears something went wrong when unlinking the two devices.") - update_mt_menu=1 if("link" in href_list) @@ -258,30 +254,24 @@ Class Procs: return 1 if(!canLink(O,href_list)) to_chat(usr, "\red You can't link with that device.") - return 1 if (isLinkedWith(O)) to_chat(usr, "\red A red light flashes on \the [P]. The two devices are already linked.") - return 1 if(linkWith(usr, O, href_list)) to_chat(usr, "\blue A green light flashes on \the [P], confirming the link was added.") - else to_chat(usr, "\red A red light flashes on \the [P]. It appears something went wrong when linking the two devices.") - update_mt_menu=1 if("buffer" in href_list) P.buffer = src to_chat(usr, "\blue A green light flashes, and the device appears in the multitool buffer.") - update_mt_menu=1 if("flush" in href_list) to_chat(usr, "\blue A green light flashes, and the device disappears from the multitool buffer.") - P.buffer = null update_mt_menu=1 @@ -349,7 +339,6 @@ Class Procs: if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 1 if (ishuman(user)) @@ -359,7 +348,6 @@ Class Procs: return 1 else if(prob(H.getBrainLoss())) to_chat(user, "You momentarily forget how to use [src].") - return 1 if(panel_open) @@ -404,12 +392,10 @@ Class Procs: panel_open = 1 icon_state = icon_state_open to_chat(user, "You open the maintenance hatch of [src].") - else panel_open = 0 icon_state = icon_state_closed to_chat(user, "You close the maintenance hatch of [src].") - return 1 return 0 @@ -418,18 +404,15 @@ Class Procs: playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) dir = turn(dir,-90) to_chat(user, "You rotate [src].") - return 1 return 0 /obj/machinery/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) if(istype(W)) to_chat(user, "Now [anchored ? "un" : ""]securing [name].") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, time, target = src)) to_chat(user, "You've [anchored ? "un" : ""]secured [name].") - anchored = !anchored playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) return 1 @@ -468,7 +451,6 @@ Class Procs: component_parts += B B.loc = null to_chat(user, "[A.name] replaced with [B.name].") - shouldplaysound = 1 break RefreshParts() @@ -482,11 +464,9 @@ Class Procs: /obj/machinery/proc/display_parts(mob/user) to_chat(user, "Following parts detected in the machine:") - for(var/obj/item/C in component_parts) to_chat(user, "\icon[C] [C.name]") - /obj/machinery/examine(mob/user) ..(user) if(user.research_scanner && component_parts) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index c87ecc345b5..0bd5fff9fba 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -22,7 +22,6 @@ if(istype(W, /obj/item/weapon/screwdriver)) to_chat(user, "You begin to unscrew the bolts off the [src]...") - playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) if(do_after(user, 30, target = src)) var/obj/machinery/mass_driver_frame/F = new(get_turf(src)) @@ -71,7 +70,6 @@ if(!emagged) emagged = 1 to_chat(user, "You hack the Mass Driver, radically increasing the force at which it'll throw things. Better not stand in its way.") - return 1 return -1 @@ -107,24 +105,19 @@ var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) to_chat(user, "You begin to cut the frame apart...") - if(do_after(user, 30, target = src) && (build == 0)) to_chat(user, "You detach the plasteel sheets from each others.") - new /obj/item/stack/sheet/plasteel(get_turf(src),3) qdel(src) return 1 if(istype(W, /obj/item/weapon/wrench)) to_chat(user, "You begin to anchor \the [src] on the floor.") - playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 10, target = src) && (build == 0)) to_chat(user, "You anchor \the [src]!") - anchored = 1 build++ update_icon() @@ -132,27 +125,22 @@ if(1) // Fixed to the floor if(istype(W, /obj/item/weapon/wrench)) to_chat(user, "You begin to de-anchor \the [src] from the floor.") - playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 10, target = src) && (build == 1)) build-- update_icon() anchored = 0 to_chat(user, "You de-anchored \the [src]!") - return 1 if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) to_chat(user, "You begin to weld \the [src] to the floor...") - if(do_after(user, 40, target = src) && (build == 1)) to_chat(user, "You welded \the [src] to the floor.") - build++ update_icon() return 1 @@ -161,55 +149,45 @@ var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return 1 playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) to_chat(user, "You begin to unweld \the [src] to the floor...") - if(do_after(user, 40, target = src) && (build == 2)) to_chat(user, "You unwelded \the [src] to the floor.") - build-- update_icon() if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C=W to_chat(user, "You start adding cables to \the [src]...") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src) && (C.amount >= 3) && (build == 2)) C.use(3) to_chat(user, "You've added cables to \the [src].") - build++ update_icon() if(3) // Wired if(istype(W, /obj/item/weapon/wirecutters)) to_chat(user, "You begin to remove the wiring from \the [src].") - if(do_after(user, 10, target = src) && (build == 3)) new /obj/item/stack/cable_coil(loc,3) playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "You've removed the cables from \the [src].") - build-- update_icon() return 1 if(istype(W, /obj/item/stack/rods)) var/obj/item/stack/rods/R=W to_chat(user, "You begin to complete \the [src]...") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 20, target = src) && (R.amount >= 3) && (build == 3)) R.use(3) to_chat(user, "You've added the grille to \the [src].") - build++ update_icon() return 1 if(4) // Grille in place if(istype(W, /obj/item/weapon/crowbar)) to_chat(user, "You begin to pry off the grille from \the [src]...") - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user, 30, target = src) && (build == 4)) new /obj/item/stack/rods(loc,2) @@ -218,7 +196,6 @@ return 1 if(istype(W, /obj/item/weapon/screwdriver)) to_chat(user, "You finalize the Mass Driver...") - playsound(get_turf(src), 'sound/items/Screwdriver.ogg', 50, 1) var/obj/machinery/mass_driver/M = new(get_turf(src)) M.dir = src.dir diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index ef0a6475972..79579e1bb66 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -91,14 +91,11 @@ if (src.allowed(user)) src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked" : "unlocked"].") - else to_chat(user, "Access denied.") - updateDialog() else to_chat(user, "You must open the cover first!") - return /obj/machinery/navbeacon/attack_ai(mob/user) @@ -117,7 +114,6 @@ 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!") - return diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index 133affefb22..d991e7c5235 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -711,7 +711,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co /obj/machinery/newscaster/attackby(obj/item/I as obj, mob/living/user as mob, params) if(istype(I, /obj/item/weapon/wrench)) to_chat(user, "Now [anchored ? "un" : ""]securing [name]") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 60, target = src)) new /obj/item/mounted/frame/newscaster_frame(loc) @@ -741,7 +740,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co playsound(src.loc, 'sound/effects/Glasshit.ogg', 100, 1) else to_chat(user, "This does nothing.") - src.update_icon() /obj/machinery/newscaster/proc/AttachPhoto(mob/user as mob) @@ -868,7 +866,6 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co to_chat(user, "The paper is full of intelligible symbols!") - obj/item/weapon/newspaper/Topic(href, href_list) var/mob/living/U = usr ..() @@ -905,7 +902,6 @@ obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob, pa if(istype(W, /obj/item/weapon/pen)) if(src.scribble_page == src.curr_page) to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") - else var/s = strip_html( input(user, "Write something", "Newspaper", "") ) s = sanitize(copytext(s, 1, MAX_MESSAGE_LEN)) diff --git a/code/game/machinery/overview.dm b/code/game/machinery/overview.dm index 59930a57883..2b56b71fc43 100644 --- a/code/game/machinery/overview.dm +++ b/code/game/machinery/overview.dm @@ -33,7 +33,6 @@ // to_chat(world, "[icount] images in list") - for(var/wx = 1 ; wx <= world.maxx; wx++) for(var/wy = 1; wy <= world.maxy; wy++) @@ -148,14 +147,12 @@ var/ry = ((wy*2+yoff)%32) + 1 // to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") - var/icon/I = imap[1+(ix + icx*iy)*2] var/icon/I2 = imap[2+(ix + icx*iy)*2] // to_chat(world, "icon: \icon[I]") - I.DrawBox(colour, rx, ry, rx+1, ry+1) I2.DrawBox(colour2, rx, ry, rx+1, ry+1) @@ -173,7 +170,6 @@ // to_chat(world, "\icon[I] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/HI = new/icon @@ -285,13 +281,11 @@ var/ry = ((wy*2+yoff)%32) + 1 // to_chat(world, "trying [ix],[iy] : [ix+icx*iy]") - var/icon/I = imap[1+(ix + icx*iy)] // to_chat(world, "icon: \icon[I]") - I.DrawBox(colour, rx, ry, rx, ry) @@ -307,7 +301,6 @@ // to_chat(world, "\icon[I] at [H.screen_loc]") - H.name = (i==0)?"maprefresh":"map" var/icon/I = imap[i+1] diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index c20c5b56beb..ad54eb2e8e9 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -435,7 +435,6 @@ for(var/obj/machinery/atmospherics/M in src.loc) if((M.initialize_directions & pipe_dir) && M.check_connect_types_construction(M,src)) // matches at least one direction on either type of pipe to_chat(user, "There is already a pipe of the same type at this location.") - return 1 switch(pipe_type) //What kind of heartless person thought of doing this? @@ -621,12 +620,10 @@ return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) to_chat(user, "\red You need to fasten it to a pipe") - return 1 new/obj/machinery/meter( src.loc ) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You have fastened the meter to the pipe") - qdel(src) /obj/item/pipe_gsensor @@ -644,7 +641,6 @@ new/obj/machinery/air_sensor( src.loc ) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You have fastened the gas sensor") - qdel(src) #undef PIPE_SIMPLE_STRAIGHT diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 4e7347fdfe0..9214178e9e4 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -101,7 +101,6 @@ src.add_fingerprint(usr) if (istype(W, /obj/item/pipe) || istype(W, /obj/item/pipe_meter) || istype(W, /obj/item/pipe_gsensor)) to_chat(usr, "\blue You put [W] back to [src].") - user.drop_item() qdel(W) return @@ -109,7 +108,6 @@ if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to unfasten \the [src] from the floor...") - if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ @@ -123,7 +121,6 @@ else /*if (unwrenched==1)*/ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to fasten \the [src] to the floor...") - if (do_after(user, 20, target = src)) user.visible_message( \ "[user] fastens \the [src].", \ diff --git a/code/game/machinery/podmen.dm b/code/game/machinery/podmen.dm index 47068c97e9a..54585c0eb26 100644 --- a/code/game/machinery/podmen.dm +++ b/code/game/machinery/podmen.dm @@ -33,7 +33,6 @@ Growing it to term with nothing injected will grab a ghost from the observers. * to_chat(user, "You inject the contents of the syringe into the seeds.") - var/datum/reagent/blood/B //Find a blood sample to inject. @@ -44,7 +43,6 @@ Growing it to term with nothing injected will grab a ghost from the observers. * if(B) source = B.data["donor"] to_chat(user, "The strange, sluglike seeds quiver gently and swell with blood.") - if(!source.client && source.mind) for(var/mob/O in respawnable_list) if(O.mind == source.mind && config.revival_pod_plants) @@ -54,11 +52,9 @@ Growing it to term with nothing injected will grab a ghost from the observers. * return if("No") to_chat(user, "The seeds seem to reject the blood, returning to their original size as they stop quivering.") - return else to_chat(user, "Nothing happens.") - return if (!istype(source)) @@ -81,7 +77,6 @@ Growing it to term with nothing injected will grab a ghost from the observers. * if(beingharvested) to_chat(user, ("\red You can only harvest the pod once!")) - else user.visible_message("\blue [user] carefully begins to open the pod...","\blue You carefully begin to open the pod...") beingharvested = 1 @@ -129,15 +124,11 @@ Growing it to term with nothing injected will grab a ghost from the observers. * // -- End mode specific stuff to_chat(podman, "\green You awaken slowly, feeling your sap stir into sluggish motion as the warm air caresses your bark.") - if(source && ckey && podman.ckey == ckey) to_chat(podman, "Memories of a life as [source] drift oddly through a mind unsuited for them, like a skin of oil over a fathomless lake.") - to_chat(podman, "You are now one of the Dionaea, a race of drifting interstellar plantlike creatures that sometimes share their seeds with human traders.") - to_chat(podman, "Too much darkness will send you into shock and starve you, but light will help you heal.") - else new /mob/living/carbon/monkey/diona(parent.loc) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index ac9eb4c6793..b7f1f41b356 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -23,7 +23,6 @@ if(!emagged) //If it is not already emagged, emag it. to_chat(user, "You disable \the [src]'s temperature safeguards.")//Inform the mob of what emagging does. - emagged = 1 //Set the emag var to true. /obj/machinery/poolcontroller/attackby(obj/item/P as obj, mob/user as mob, params) //Proc is called when a user hits the pool controller with something. @@ -31,13 +30,11 @@ if(emagged) //Check the emag status to_chat(user, "You re-enable \the [src]'s temperature safeguards.")//Inform the user that they have just fixed the safeguards. - emagged = 0 //Set the emagged var to false. else to_chat(user, "Nothing happens.")//If not emagged, don't do anything, and don't tell the user that it can be emagged. - else //If it's not a multitool, defer to /obj/machinery/attackby ..() @@ -72,25 +69,21 @@ M.bodytemperature = min(500, M.bodytemperature + 35) //heat mob at 35k(elvin) per cycle to_chat(M, "The water is searing hot!") - if("warm") //Gently warm the mob. M.bodytemperature = min(330, M.bodytemperature + 10) //Heats up mobs to just over normal, not enough to burn if(prob(50)) //inform the mob of warm water half the time to_chat(M, "The water is quite warm.")//Inform the mob it's warm water. - if("cool") //Gently cool the mob. M.bodytemperature = max(290, M.bodytemperature - 10) //Cools mobs to just below normal, not enough to burn if(prob(50)) //inform the mob of cold water half the time to_chat(M, "The water is chilly.")//Inform the mob it's chilly water. - if("frigid") //Freeze the mob. M.bodytemperature = max(80, M.bodytemperature - 35) //cool mob at -35k per cycle to_chat(M, "The water is freezing!") - return /obj/machinery/poolcontroller/proc/handleDrowning(var/mob/living/carbon/human/drownee) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 1c1a8a237b6..59a34b56436 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -175,12 +175,10 @@ var/list/turret_icons /obj/machinery/porta_turret/proc/isLocked(mob/user) if(ailock && (isrobot(user) || isAI(user))) to_chat(user, "There seems to be a firewall preventing you from accessing this device.") - return 1 if(locked && !(isrobot(user) || isAI(user) || isobserver(user))) to_chat(user, "Access denied.") - return 1 return 0 @@ -246,7 +244,6 @@ var/list/turret_icons /obj/machinery/porta_turret/CanUseTopic(var/mob/user) if(HasController()) to_chat(user, "Turrets can only be controlled using the assigned turret controller.") - return STATUS_CLOSE if(isLocked(user)) @@ -254,7 +251,6 @@ var/list/turret_icons if(!anchored) to_chat(usr, "\The [src] has to be secured first!") - return STATUS_CLOSE return ..() @@ -334,11 +330,9 @@ var/list/turret_icons //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.") - if(do_after(user, 20, target = src)) if(prob(70)) to_chat(user, "You remove the turret and salvage some components.") - if(installation) var/obj/item/weapon/gun/energy/Gun = new installation(loc) Gun.power_supply.charge = gun_charge @@ -349,21 +343,17 @@ var/list/turret_icons new /obj/item/device/assembly/prox_sensor(loc) else to_chat(user, "You remove the turret but did not manage to salvage anything.") - qdel(src) // qdel else if((istype(I, /obj/item/weapon/wrench))) if(enabled || raised) to_chat(user, "You cannot unsecure an active turret!") - return if(wrenching) to_chat(user, "Someone is already [anchored ? "un" : ""]securing the turret!") - return if(!anchored && isinspace()) to_chat(user, "Cannot secure turrets in space!") - return user.visible_message( \ @@ -379,12 +369,10 @@ var/list/turret_icons anchored = 1 update_icon() to_chat(user, "You secure the exterior bolts on the turret.") - else if(anchored) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) anchored = 0 to_chat(user, "You unsecure the exterior bolts on the turret.") - update_icon() wrenching = 0 @@ -392,12 +380,10 @@ var/list/turret_icons if(allowed(user)) locked = !locked to_chat(user, "Controls are now [locked ? "locked" : "unlocked"].") - updateUsrDialog() else to_chat(user, "Access denied.") - else //if the turret was attacked with the intention of harming it: user.changeNext_move(CLICK_CD_MELEE) @@ -422,7 +408,6 @@ var/list/turret_icons take_damage(M.melee_damage_upper) else to_chat(M, "That object is useless to you.") - return /obj/machinery/porta_turret/attack_alien(mob/living/carbon/alien/humanoid/M) @@ -434,7 +419,6 @@ var/list/turret_icons take_damage(15) else to_chat(M, "That object is useless to you.") - return /obj/machinery/porta_turret/emag_act(user as mob) @@ -443,7 +427,6 @@ var/list/turret_icons //the turret shoot much, much faster. if(user) to_chat(user, "You short out [src]'s threat assessment circuits.") - visible_message("[src] hums oddly...") emagged = 1 iconholder = 1 @@ -784,7 +767,6 @@ var/list/turret_icons if(istype(I, /obj/item/weapon/wrench) && !anchored) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "You secure the external bolts.") - anchored = 1 build_step = 1 return @@ -792,7 +774,6 @@ var/list/turret_icons else if(istype(I, /obj/item/weapon/crowbar) && !anchored) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) to_chat(user, "You dismantle the turret construction.") - new /obj/item/stack/sheet/metal( loc, 5) qdel(src) // qdel return @@ -802,18 +783,15 @@ var/list/turret_icons var/obj/item/stack/sheet/metal/M = I if(M.use(2)) to_chat(user, "You add some metal armor to the interior frame.") - build_step = 2 icon_state = "turret_frame2" else to_chat(user, "You need two sheets of metal to continue construction.") - return else if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) to_chat(user, "You unfasten the external bolts.") - anchored = 0 build_step = 0 return @@ -823,7 +801,6 @@ var/list/turret_icons if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "You bolt the metal armor into place.") - build_step = 3 return @@ -833,7 +810,6 @@ var/list/turret_icons return if(WT.get_fuel() < 5) //uses up 5 fuel. to_chat(user, "You need more fuel to complete this task.") - return playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) @@ -841,7 +817,6 @@ var/list/turret_icons if(!src || !WT.remove_fuel(5, user)) return build_step = 1 to_chat(user, "You remove the turret's interior metal armor.") - new /obj/item/stack/sheet/metal( loc, 2) return @@ -854,13 +829,11 @@ var/list/turret_icons var/obj/item/weapon/gun/energy/E = I //typecasts the item to an energy gun if(!user.unEquip(I)) to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") - return installation = I.type //installation becomes I.type gun_charge = E.power_supply.charge //the gun's charge is stored in gun_charge to_chat(user, "You add [I] to the turret.") - if(istype(installation, /obj/item/weapon/gun/energy/laser/bluetag) || istype(installation, /obj/item/weapon/gun/energy/laser/redtag)) target_type = /obj/machinery/porta_turret/tag else @@ -873,7 +846,6 @@ var/list/turret_icons else if(istype(I, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "You remove the turret's metal armor bolts.") - build_step = 2 return @@ -881,12 +853,10 @@ var/list/turret_icons if(isprox(I)) if(!user.unEquip(I)) to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") - return build_step = 5 qdel(I) // qdel to_chat(user, "You add the prox sensor to the turret.") - return //attack_hand() removes the gun @@ -896,7 +866,6 @@ var/list/turret_icons playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 6 to_chat(user, "You close the internal access hatch.") - return //attack_hand() removes the prox sensor @@ -906,18 +875,15 @@ var/list/turret_icons var/obj/item/stack/sheet/metal/M = I if(M.use(2)) to_chat(user, "You add some metal armor to the exterior frame.") - build_step = 7 else to_chat(user, "You need two sheets of metal to continue construction.") - return else if(istype(I, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) build_step = 5 to_chat(user, "You open the internal access hatch.") - return if(7) @@ -927,7 +893,6 @@ var/list/turret_icons if(WT.get_fuel() < 5) to_chat(user, "You need more fuel to complete this task.") - playsound(loc, pick('sound/items/Welder.ogg', 'sound/items/Welder2.ogg'), 50, 1) if(do_after(user, 30, target = src)) if(!src || !WT.remove_fuel(5, user)) @@ -935,7 +900,6 @@ var/list/turret_icons build_step = 8 to_chat(user, "You weld the turret's armor down.") - //The final step: create a full turret var/obj/machinery/porta_turret/Turret = new target_type(loc) Turret.name = finish_name @@ -949,7 +913,6 @@ var/list/turret_icons else if(istype(I, /obj/item/weapon/crowbar)) playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) to_chat(user, "You pry off the turret's exterior armor.") - new /obj/item/stack/sheet/metal(loc, 2) build_step = 6 return @@ -981,10 +944,8 @@ var/list/turret_icons gun_charge = 0 to_chat(user, "You remove [Gun] from the turret frame.") - if(5) to_chat(user, "You remove the prox sensor from the turret frame.") - new /obj/item/device/assembly/prox_sensor(loc) build_step = 4 diff --git a/code/game/machinery/programmable_unloader.dm b/code/game/machinery/programmable_unloader.dm index 02c6bdea07b..f061f9906e6 100644 --- a/code/game/machinery/programmable_unloader.dm +++ b/code/game/machinery/programmable_unloader.dm @@ -200,7 +200,6 @@ if (unwrenched==0) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to unfasten \the [src] from the floor...") - if (do_after(user, 40, target = src)) user.visible_message( \ "[user] unfastens \the [src].", \ @@ -214,7 +213,6 @@ else /* unwrenched */ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, "\blue You begin to fasten \the [src] to the floor...") - if (do_after(user, 20, target = src)) user.visible_message( \ "[user] fastens \the [src].", \ @@ -233,19 +231,15 @@ if(!unwrenched && !circuit_removed) src.stat &= ~MAINT to_chat(user, "You close \the [src]'s maintenance panel.") - else open = 1 src.stat |= MAINT to_chat(user, "You open \the [src]'s maintenance panel.") - if(istype(I,/obj/item/weapon/crowbar)) if(open) to_chat(user, "\blue You begin to pry out the [src]'s circuits.") - if(do_after(user,40, target = src)) to_chat(user, "\blue You remove the circuitboard.") - circuit_removed = 1 use_power = 0 on = 0 @@ -267,11 +261,9 @@ if(istype(I,/obj/item/weapon/circuitboard/programmable)) if(!open) to_chat(user, "You have to open the machine first!") - return if(!circuit_removed) to_chat(user, "There is already a circuitboard present!") - return circuit_removed = 0 I.loc = src @@ -281,7 +273,6 @@ if(emagged) return to_chat(user, "You swipe the unloader with your card. After a moment's grinding, it beeps in a sinister fashion.") - playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0) emagged = 1 overrides += emag_overrides @@ -310,7 +301,6 @@ M.client.perspective = MOB_PERSPECTIVE to_chat(M, "\blue The machine turns off, and you fall out.") - return //Normal output reaction @@ -509,7 +499,6 @@ var/newsleep = 0 if(H.loc != input) to_chat(H, "The boxing machine refuses to acknowledge you unless you face it head on!") - return var/damage = 0 if(H.a_intent != I_HARM) @@ -597,27 +586,22 @@ hacking = (hacking?0:1) if(hacking) to_chat(user, "You unlock the data port on the board. You can now use a PDA to alter its data.") - else to_chat(user, "You relock the data port.") - if(istype(I,/obj/item/device/pda)) if(!hacking) to_chat(user, "It looks like you can't access the board's data port. You'll have to open it with a multitool.") - else user.set_machine(src) interact(user) if(istype(I,/obj/item/weapon/card/emag) && !emagged) if(!hacking) to_chat(user, "There seems to be a data port on the card, but it's locked. A multitool could open it.") - else emagged = 1 overrides += emag_overrides to_chat(user, "You swipe the card in the card's data port. The lights flicker, then flash once.") - proc/format(var/datum/cargoprofile/P,var/level) // PROFILE=0 OVERRIDE=1 MAIN=2 if(P == null) diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 8eebb024633..be126aec5ff 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -19,7 +19,6 @@ if(!user.canUnEquip(G, 0)) to_chat(user, "[G] is stuck to your hand, you can't put it in [src]!") - return if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G,/obj/item/device/laptop) || istype(G, /obj/item/weapon/rcs)) @@ -30,25 +29,21 @@ var/area/a = get_area(src) if(!isarea(a)) to_chat(user, "\red The [name] blinks red as you try to insert the item!") - return if(a.power_equip == 0 && a.requires_power) to_chat(user, "\red The [name] blinks red as you try to insert the item!") - return if (istype(G, /obj/item/weapon/gun/energy)) var/obj/item/weapon/gun/energy/E = G if(!E.can_charge) to_chat(user, "Your gun has no external power connector.") - return if(istype(G, /obj/item/device/laptop)) var/obj/item/device/laptop/L = G if(!L.stored_computer.battery) to_chat(user, "There's no battery in it!") - return user.drop_item() @@ -59,11 +54,9 @@ else if(istype(G, /obj/item/weapon/wrench)) if(charging) to_chat(user, "\red Remove the weapon first!") - return anchored = !anchored to_chat(user, "You [anchored ? "attached" : "detached"] the recharger.") - playsound(loc, 'sound/items/Ratchet.ogg', 75, 1) /obj/machinery/recharger/attack_hand(mob/user as mob) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 6434b350830..5b5a532efdb 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -90,7 +90,6 @@ if (istype(P, /obj/item/weapon/screwdriver)) if(src.occupant) to_chat(user, "The maintenance panel is locked.") - return default_deconstruction_screwdriver(user, "borgdecon2", "borgcharger0", P) return @@ -219,12 +218,10 @@ if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) to_chat(usr, "They are too far away to put inside") - return if (panel_open) to_chat(usr, "Close the maintenance panel first.") - return var/can_accept_user @@ -236,11 +233,9 @@ return if(occupant) to_chat(R, "The cell is already occupied!") - return if(!R.cell) to_chat(R, "Without a power cell, you can't be recharged.") - //Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO return can_accept_user = 1 @@ -252,7 +247,6 @@ return if(occupant) to_chat(H, "The cell is already occupied!") - return if(!H.get_int_organ(/obj/item/organ/internal/cell)) return @@ -260,7 +254,6 @@ if(!can_accept_user) to_chat(user, "Only non-organics may enter the recharger!") - return user.stop_pulling() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 582a842f15e..9bcf3de53a8 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -46,12 +46,9 @@ var/const/SAFETY_COOLDOWN = 100 /obj/machinery/recycler/examine(mob/user) ..(user) to_chat(user, "The power light is [(stat & NOPOWER) ? "off" : "on"].") - to_chat(user, "The safety-mode light is [safety_mode ? "on" : "off"].") - to_chat(user, "The safety-sensors status light is [emagged ? "off" : "on"].") - /obj/machinery/recycler/power_change() ..() update_icon() @@ -83,7 +80,6 @@ var/const/SAFETY_COOLDOWN = 100 playsound(src.loc, "sparks", 75, 1, -1) to_chat(user, "You use the cryptographic sequencer on the [src.name].") - /obj/machinery/recycler/update_icon() ..() var/is_powered = !(stat & (BROKEN|NOPOWER)) @@ -200,11 +196,9 @@ var/const/SAFETY_COOLDOWN = 100 return if (src.anchored) to_chat(usr, "[src] is fastened to the floor!") - return 0 eat_dir = turn(eat_dir, 270) to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].") - return 1 /obj/machinery/recycler/verb/rotateccw() @@ -218,11 +212,9 @@ var/const/SAFETY_COOLDOWN = 100 return if (src.anchored) to_chat(usr, "[src] is fastened to the floor!") - return 0 eat_dir = turn(eat_dir, 90) to_chat(user, "[src] will now accept items from [dir2text(eat_dir)].") - return 1 /obj/item/weapon/paper/recycler diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 70b70e554a8..bfd4939dc3b 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -228,7 +228,6 @@ var/list/obj/machinery/requests_console/allConsoles = list() else to_chat(user, "You can't do much with that.")*/ - if (istype(O, /obj/item/weapon/card/id)) if(inoperable(MAINT)) return if(screen == RCS_MESSAUTH) @@ -243,7 +242,6 @@ var/list/obj/machinery/requests_console/allConsoles = list() else reset_message() to_chat(user, "You are not authorized to send announcements.") - updateUsrDialog() if (istype(O, /obj/item/weapon/stamp)) if(inoperable(MAINT)) return diff --git a/code/game/machinery/robot_fabricator.dm b/code/game/machinery/robot_fabricator.dm index a6d9dfc3293..44455884bd8 100644 --- a/code/game/machinery/robot_fabricator.dm +++ b/code/game/machinery/robot_fabricator.dm @@ -29,13 +29,11 @@ qdel(O) to_chat(user, "You insert [count] metal sheet\s into the fabricator.") - src.overlays -= "fab-load-metal" updateDialog() else to_chat(user, "The robot part maker is full. Please remove metal from the robot part maker in order to insert more.") - /obj/machinery/robotic_fabricator/power_change() if (powered()) stat &= ~NOPOWER diff --git a/code/game/machinery/seed_extractor.dm b/code/game/machinery/seed_extractor.dm index acf030b9ddc..dbff4722cad 100644 --- a/code/game/machinery/seed_extractor.dm +++ b/code/game/machinery/seed_extractor.dm @@ -45,7 +45,6 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob if(new_seed_type) to_chat(user, "You extract some seeds from [O].") - var/produce = rand(1,4) for(var/i = 0;i<=produce;i++) var/obj/item/seeds/seeds = new(get_turf(src)) @@ -54,14 +53,12 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob else to_chat(user, "[O] doesn't seem to have any usable seeds inside it.") - qdel(O) //Grass. else if(istype(O, /obj/item/stack/tile/grass)) var/obj/item/stack/tile/grass/S = O to_chat(user, "You extract some seeds from the [S.name].") - S.use(1) new /obj/item/seeds/grassseed(loc) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 41c5e1a13ae..323937075ad 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -209,11 +209,9 @@ /obj/machinery/shieldgen/attack_hand(mob/user as mob) if(locked) to_chat(user, "The machine is locked, you are unable to use it.") - return if(is_open) to_chat(user, "The panel must be closed before operating this machine.") - return if (src.active) @@ -229,7 +227,6 @@ src.shields_up() else to_chat(user, "The device must first be secured to the floor.") - return /obj/machinery/shieldgen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) @@ -241,17 +238,14 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) if(is_open) to_chat(user, "\blue You close the panel.") - is_open = 0 else to_chat(user, "\blue You open the panel and expose the wiring.") - is_open = 1 else if(istype(W, /obj/item/stack/cable_coil) && malfunction && is_open) var/obj/item/stack/cable_coil/coil = W to_chat(user, "\blue You begin to replace the wires.") - //if(do_after(user, min(60, round( ((maxhealth/health)*10)+(malfunction*10) ), target = src)) //Take longer to repair heavier damage if(do_after(user, 30, target = src)) if(!src || !coil) return @@ -259,28 +253,23 @@ health = max_health malfunction = 0 to_chat(user, "\blue You repair the [src]!") - update_icon() else if(istype(W, /obj/item/weapon/wrench)) if(locked) to_chat(user, "The bolts are covered, unlocking this would retract the covers.") - return if(anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue You unsecure the [src] from the floor!") - if(active) to_chat(user, "\blue The [src] shuts off!") - src.shields_down() anchored = 0 else if(istype(get_turf(src), /turf/space)) return //No wrenching these in space! playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue You secure the [src] to the floor!") - anchored = 1 @@ -288,11 +277,9 @@ if(src.allowed(user)) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") - else to_chat(user, "\red Access denied.") - else ..() @@ -360,15 +347,12 @@ /obj/machinery/shieldwallgen/attack_hand(mob/user as mob) if(state != 1) to_chat(user, "\red The shield generator needs to be firmly secured to the floor first.") - return 1 if(src.locked && !istype(user, /mob/living/silicon)) to_chat(user, "\red The controls are locked!") - return 1 if(power != 1) to_chat(user, "\red The shield generator needs to be powered by wire underneath.") - return 1 if(src.active >= 1) @@ -469,14 +453,12 @@ if(istype(W, /obj/item/weapon/wrench)) if(active) to_chat(user, "Turn off the field generator first.") - return else if(state == 0) state = 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) to_chat(user, "You secure the external reinforcing bolts to the floor.") - src.anchored = 1 return @@ -484,7 +466,6 @@ state = 0 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) to_chat(user, "You undo the external reinforcing bolts.") - src.anchored = 0 return @@ -492,11 +473,9 @@ if (src.allowed(user)) src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") - else to_chat(user, "\red Access denied.") - else add_fingerprint(user) ..() diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index cac66fb2871..6ba798cebee 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -29,15 +29,12 @@ /obj/machinery/space_heater/examine(mob/user) ..(user) to_chat(user, "The heater is [on ? "on" : "off"] and the hatch is [open ? "open" : "closed"].") - if(open) to_chat(user, "The power cell is [cell ? "installed" : "missing"].") - else to_chat(user, "The charge meter reads [cell ? round(cell.percent(),1) : 0]%") - /obj/machinery/space_heater/emp_act(severity) if(stat & (BROKEN|NOPOWER)) ..(severity) @@ -51,7 +48,6 @@ if(open) if(cell) to_chat(user, "There is already a power cell inside.") - return else // insert cell @@ -65,7 +61,6 @@ user.visible_message("\blue [user] inserts a power cell into [src].", "\blue You insert the power cell into [src].") else to_chat(user, "The hatch must be open to insert a power cell.") - return else if(istype(I, /obj/item/weapon/screwdriver)) open = !open diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 9c531ca2c20..e73dbaf5dbd 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -136,7 +136,6 @@ if(mode != STATUS_DISPLAY_BLANK && mode != STATUS_DISPLAY_ALERT) to_chat(user, "The display says:
\t[sanitize(message1)]
\t[sanitize(message2)]") - /obj/machinery/status_display/proc/set_message(m1, m2) if(m1) index1 = (length(m1) > CHARS_PER_LINE) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f4e1337b8ea..9cb2c7db4d6 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -249,16 +249,13 @@ if(!protected) playsound(src.loc, "sparks", 75, 1, -1) to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") - return*/ else //welp, the guy is protected, we can continue if(src.issuperUV) to_chat(user, "You slide the dial back towards \"185nm\".") - src.issuperUV = 0 else to_chat(user, "You crank the dial all the way up to \"15nm\".") - src.issuperUV = 1 return @@ -278,11 +275,9 @@ if(!protected) playsound(src.loc, "sparks", 75, 1, -1) to_chat(user, "You try to touch the controls but you get zapped. There must be a short circuit somewhere.") - return*/ else to_chat(user, "You push the button. The coloured LED next to it changes.") - src.safetieson = !src.safetieson @@ -332,7 +327,6 @@ /obj/machinery/suit_storage_unit/proc/toggle_open(mob/user as mob) if(src.islocked || src.isUV) to_chat(user, "Unable to open unit.") - return if(src.OCCUPANT) src.eject_occupant(user) @@ -344,7 +338,6 @@ /obj/machinery/suit_storage_unit/proc/toggle_lock(mob/user as mob) if(src.OCCUPANT && src.safetieson) to_chat(user, "The Unit's safety protocols disallow locking when a biological form is detected inside its compartments.") - return if(src.isopen) return @@ -357,14 +350,11 @@ return if(src.OCCUPANT && src.safetieson) to_chat(user, "WARNING: Biological entity detected in the confines of the Unit's storage. Cannot initiate cycle.") - return if(!src.HELMET && !src.MASK && !src.SUIT && !src.OCCUPANT ) //shit's empty yo to_chat(user, "Unit storage bays empty. Nothing to disinfect -- Aborting.") - return to_chat(user, "You start the Unit's cauterisation cycle.") - src.cycletime_left = 20 src.isUV = 1 if(src.OCCUPANT && !src.islocked) @@ -427,11 +417,9 @@ if(src.issuperUV) OCCUPANT.take_organ_damage(0,40) to_chat(user, "Test. You gave him 40 damage") - else OCCUPANT.take_organ_damage(0,8) to_chat(user, "Test. You gave him 8 damage") - return*/ @@ -453,11 +441,9 @@ if (src.OCCUPANT.client) if(user != OCCUPANT) to_chat(OCCUPANT, "The machine kicks you out!") - if(user.loc != src.loc) to_chat(OCCUPANT, "You leave the not-so-cozy confines of the SSU.") - src.OCCUPANT.client.eye = src.OCCUPANT.client.mob src.OCCUPANT.client.perspective = MOB_PERSPECTIVE src.OCCUPANT.loc = src.loc @@ -491,15 +477,12 @@ return if (!src.isopen) to_chat(usr, "The unit's doors are shut.") - return if (!src.ispowered || src.isbroken) to_chat(usr, "The unit is not operational.") - return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) to_chat(usr, "It's too cluttered inside for you to fit in!") - return visible_message("[usr] starts squeezing into the suit storage unit!") if(do_after(usr, 10, target = usr)) @@ -530,7 +513,6 @@ src.panelopen = !src.panelopen playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) to_chat(user, text("You [] the unit's maintenance panel.",(src.panelopen ? "open up" : "close") )) - src.updateUsrDialog() return if ( istype(I, /obj/item/weapon/grab) ) @@ -539,15 +521,12 @@ return if (!src.isopen) to_chat(usr, "The unit's doors are shut.") - return if (!src.ispowered || src.isbroken) to_chat(usr, "The unit is not operational.") - return if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty to_chat(user, "The unit's storage area is too cluttered.") - return visible_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.") if(do_after(user, 20, target = G:affecting)) @@ -574,10 +553,8 @@ var/obj/item/clothing/suit/space/S = I if(src.SUIT) to_chat(user, "The unit already contains a suit.") - return to_chat(user, "You load the [S.name] into the storage compartment.") - user.drop_item() S.loc = src src.SUIT = S @@ -590,10 +567,8 @@ var/obj/item/clothing/head/helmet/H = I if(src.HELMET) to_chat(user, "The unit already contains a helmet.") - return to_chat(user, "You load the [H.name] into the storage compartment.") - user.drop_item() H.loc = src src.HELMET = H @@ -606,10 +581,8 @@ var/obj/item/clothing/mask/M = I if(src.MASK) to_chat(user, "The unit already contains a mask.") - return to_chat(user, "You load the [M.name] into the storage compartment.") - user.drop_item() M.loc = src src.MASK = M @@ -706,12 +679,10 @@ if(locked) to_chat(user, "\red The suit cycler is locked.") - return if(src.contents.len > 0) to_chat(user, "\red There is no room inside the cycler for [G.affecting.name].") - return visible_message("[user] starts putting [G.affecting.name] into the suit cycler.") @@ -735,7 +706,6 @@ panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - src.updateUsrDialog() return @@ -743,16 +713,13 @@ if(locked) to_chat(user, "\red The suit cycler is locked.") - return if(helmet) to_chat(user, "The cycler already contains a helmet.") - return to_chat(user, "You fit \the [I] into the suit cycler.") - user.drop_item() I.loc = src helmet = I @@ -765,28 +732,23 @@ if(locked) to_chat(user, "\red The suit cycler is locked.") - return if(suit) to_chat(user, "The cycler already contains a hardsuit.") - return var/obj/item/clothing/suit/space/rig/S = I if(S.helmet) to_chat(user, "\The [S] will not fit into the cycler with a helmet attached.") - return if(S.boots) to_chat(user, "\The [S] will not fit into the cycler with boots attached.") - return to_chat(user, "You fit \the [I] into the suit cycler.") - user.drop_item() I.loc = src suit = I @@ -800,12 +762,10 @@ /obj/machinery/suit_cycler/emag_act(user as mob) if(emagged) to_chat(user, "\red The cycler has already been subverted.") - return //Clear the access reqs, disable the safeties, and open up all paintjobs. to_chat(user, "\red You run the sequencer across the interface, corrupting the operating protocols.") - departments = list("Engineering","Mining","Medical","Security","Atmos","^%###^%$") emagged = 1 safeties = 0 @@ -926,16 +886,13 @@ if(src.allowed(usr)) locked = !locked to_chat(usr, "You [locked ? "" : "un"]lock \the [src].") - else to_chat(usr, "\red Access denied.") - else if(href_list["begin_decontamination"]) if(safeties && occupant) to_chat(usr, "\red The cycler has detected an occupant. Please remove the occupant before commencing the decontamination cycle.") - return active = 1 @@ -956,7 +913,6 @@ var/twire = text2num(href_list["cutwire"]) if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) )) to_chat(usr, "You need wirecutters!") - return if (src.isWireColorCut(twire)) src.mend(twire) @@ -967,11 +923,9 @@ var/twire = text2num(href_list["pulsewire"]) if (!istype(usr.get_active_hand(), /obj/item/device/multitool)) to_chat(usr, "You need a multitool!") - return if (src.isWireColorCut(twire)) to_chat(usr, "You can't pulse a cut wire.") - return else src.pulse(twire)*/ @@ -1038,7 +992,6 @@ if(locked || active) to_chat(user, "\red The cycler is locked.") - return if (!occupant) diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 4feba8ac8f8..7790cf10ebc 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -87,13 +87,11 @@ to_chat(M, "You have joined the ranks of the Syndicate and become a traitor to the station!") - message_admins("[key_name_admin(N)] has accepted a traitor objective from a syndicate beacon.") var/obj_count = 1 for(var/datum/objective/OBJ in M.mind.objectives) to_chat(M, "Objective #[obj_count]: [OBJ.explanation_text]") - obj_count++ src.add_fingerprint(usr) @@ -129,7 +127,6 @@ if(surplus() < 1500) if(user) to_chat(user, "The connected wire doesn't have enough current.") - return for(var/obj/singularity/singulo in singularities) if(singulo.z == z) @@ -141,7 +138,6 @@ to_chat(user, "You activate the beacon.") - /obj/machinery/power/singularity_beacon/proc/Deactivate(mob/user = null) for(var/obj/singularity/singulo in world) if(singulo.target == src) @@ -152,7 +148,6 @@ to_chat(user, "You deactivate the beacon.") - /obj/machinery/power/singularity_beacon/attack_ai(mob/user as mob) return @@ -162,7 +157,6 @@ return active ? Deactivate(user) : Activate(user) else to_chat(user, "You need to screw the beacon to the floor first!") - return @@ -170,23 +164,19 @@ if(istype(W,/obj/item/weapon/screwdriver)) if(active) to_chat(user, "You need to deactivate the beacon first!") - return if(anchored) anchored = 0 to_chat(user, "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 cable.") - return anchored = 1 to_chat(user, "You screw the beacon to the floor and attach the cable.") - return ..() return diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 509371b0b95..fe443662616 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -49,7 +49,6 @@ ..(user) to_chat(user, "A digital display on it reads \"[timer]\".") - /obj/machinery/syndicatebomb/update_icon() icon_state = "[initial(icon_state)][active ? "-active" : "-inactive"][open_panel ? "-wires" : ""]" @@ -58,31 +57,25 @@ if(!anchored) if(!isturf(src.loc) || istype(src.loc, /turf/space)) to_chat(user, "The bomb must be placed on solid ground to attach it") - else to_chat(user, "You firmly wrench the bomb to the floor") - playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 1 if(active) to_chat(user, "The bolts lock in place") - else if(!active) to_chat(user, "You wrench the bomb from the floor") - playsound(loc, 'sound/items/ratchet.ogg', 50, 1) anchored = 0 else to_chat(user, "The bolts are locked down!") - else if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel update_icon() to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") - else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) if(open_panel) wires.Interact(user) @@ -91,28 +84,22 @@ if(open_panel && isWireCut(WIRE_BOOM) && isWireCut(WIRE_UNBOLT) && isWireCut(WIRE_DELAY) && isWireCut(WIRE_PROCEED) && isWireCut(WIRE_ACTIVATE)) if(payload) to_chat(user, "You carefully pry out [payload].") - payload.loc = user.loc payload = null else to_chat(user, "There isn't anything in here to remove!") - else if (open_panel) to_chat(user, "The wires conneting the shell to the explosives are holding it down!") - else to_chat(user, "The cover is screwed on, it won't pry off!") - else if(istype(I, /obj/item/weapon/bombcore)) if(!payload) payload = I to_chat(user, "You place [payload] into [src].") - user.drop_item() payload.loc = src else to_chat(user, "[payload] is already loaded into [src], you'll have to remove it first.") - else ..() @@ -132,7 +119,6 @@ return else if(anchored) to_chat(user, "The bomb is bolted to the floor!") - return /obj/machinery/syndicatebomb/proc/settings(var/mob/user) @@ -325,7 +311,6 @@ existant++ playsound(user, 'sound/machines/click.ogg', 20, 1) to_chat(user, "[existant] found, [detonated] triggered.") - if(detonated) var/turf/T = get_turf(src) var/area/A = get_area(T) diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index 4b36ab9d370..4bbdb4966c1 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -185,7 +185,6 @@ if(!src.allowed(usr) && !emagged) to_chat(usr, "\red ACCESS DENIED.") - return if(SelectedServer) @@ -224,7 +223,6 @@ if(do_after(user, 20, target = src)) if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) @@ -237,7 +235,6 @@ qdel(src) else to_chat(user, "\blue You disconnect the monitor.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A ) for (var/obj/C in src) @@ -255,4 +252,3 @@ playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "\blue You you disable the security protocols") - diff --git a/code/game/machinery/telecomms/machine_interactions.dm b/code/game/machinery/telecomms/machine_interactions.dm index 671b1c993eb..da9fe5a046e 100644 --- a/code/game/machinery/telecomms/machine_interactions.dm +++ b/code/game/machinery/telecomms/machine_interactions.dm @@ -24,30 +24,25 @@ if(0) if(istype(P, /obj/item/weapon/screwdriver)) to_chat(user, "You unfasten the bolts.") - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op++ if(1) if(istype(P, /obj/item/weapon/screwdriver)) to_chat(user, "You fasten the bolts.") - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) construct_op-- if(istype(P, /obj/item/weapon/wrench)) to_chat(user, "You dislodge the external plating.") - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op++ if(2) if(istype(P, /obj/item/weapon/wrench)) to_chat(user, "You secure the external plating.") - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) construct_op-- if(istype(P, /obj/item/weapon/wirecutters)) playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "You remove the cables.") - construct_op++ var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( user.loc ) A.amount = 5 @@ -57,7 +52,6 @@ var/obj/item/stack/cable_coil/A = P if(A.amount >= 5) to_chat(user, "You insert the cables.") - A.amount -= 5 if(A.amount <= 0) user.drop_item() @@ -66,12 +60,10 @@ stat &= ~BROKEN // the machine's not borked anymore! if(istype(P, /obj/item/weapon/crowbar)) to_chat(user, "You begin prying out the circuit board other components...") - playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) if(do_after(user,60, target = src)) to_chat(user, "You finish prying out the components.") - // Drop all the component stuff if(component_parts) for(var/obj/I in component_parts) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index f9d62fbcc02..9d9481aba04 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -40,7 +40,6 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list() if(!on) return // to_chat(world, "[src] ([src.id]) - [signal.debug_print()]") - var/send_count = 0 diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm index e0cc2f550f1..16528b73d0e 100644 --- a/code/game/machinery/telecomms/telemonitor.dm +++ b/code/game/machinery/telecomms/telemonitor.dm @@ -132,7 +132,6 @@ if(do_after(user, 20, target = src)) if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) @@ -145,7 +144,6 @@ qdel(src) else to_chat(user, "\blue You disconnect the monitor.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_monitor/M = new /obj/item/weapon/circuitboard/comm_monitor( A ) for (var/obj/C in src) @@ -163,4 +161,3 @@ playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "\blue You you disable the security protocols") - diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 2871cf473ba..a5ee6631037 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -194,7 +194,6 @@ if(!allowed(user) && !emagged) to_chat(user, "Access Denied.") - return 0 switch(href_list["choice"]) @@ -345,7 +344,6 @@ if(do_after(user, 20, target = src)) if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard(loc) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) @@ -358,7 +356,6 @@ qdel(src) else to_chat(user, "\blue You disconnect the monitor.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A ) for (var/obj/C in src) @@ -377,7 +374,6 @@ emagged = 1 to_chat(user, "\blue You you disable the security protocols") - /obj/machinery/computer/telecomms/traffic/proc/canAccess(var/mob/user) if(issilicon(user) || in_range(user, src)) return 1 diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 74124f22e9b..1933c022e16 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -44,12 +44,10 @@ if(L.locked_location && !(stat & (NOPOWER|BROKEN))) if(!user.unEquip(L)) to_chat(user, "\the [I] is stuck to your hand, you cannot put it in \the [src]") - return L.loc = src locked = L to_chat(user, "You insert the GPS device into the [name]'s slot.") - else ..() return @@ -58,7 +56,6 @@ if(!emagged) emagged = 1 to_chat(user, "\blue The teleporter can now lock on to Syndicate beacons!") - else ui_interact(user) @@ -107,12 +104,10 @@ if(!check_hub_connection()) to_chat(usr, "Error: Unable to detect hub.") - nanomanager.update_uis(src) return if(calibrating) to_chat(usr, "Error: Calibration in progress. Stand by.") - nanomanager.update_uis(src) return @@ -137,12 +132,10 @@ if(href_list["calibrate"]) if(!target) to_chat(usr, "Error: No target set to calibrate to.") - nanomanager.update_uis(src) return if(power_station.teleporter_hub.calibrated || power_station.teleporter_hub.accurate >= 3) to_chat(usr, "Hub is already calibrated.") - nanomanager.update_uis(src) return src.visible_message("Processing hub calibration to target...") @@ -226,7 +219,6 @@ var/list/S = power_station.linked_stations if(!S.len) to_chat(user, "No connected stations located.") - return for(var/obj/machinery/teleport/station/R in S) var/turf/T = get_turf(R) @@ -327,7 +319,6 @@ /obj/machinery/teleport/hub/Bumped(M as mob|obj) if(z == ZLEVEL_CENTCOMM) to_chat(M, "You can't use this here.") - if(power_station && power_station.engaged && !panel_open) //--FalseIncarnate //Prevents AI cores from using the teleporter, prints out failure messages for clarity @@ -340,7 +331,6 @@ "\red External firewalls prevent you from utilizing this machine!", "\red Your AI core's anti-bluespace failsafes trigger and prevent teleportation!") to_chat(T, "[pick(TPError)]") - return else teleport(M) @@ -446,10 +436,8 @@ linked_stations.Add(M.buffer) M.buffer = null to_chat(user, "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.") - if(default_deconstruction_screwdriver(user, "controller-o", "controller", W)) update_icon() return @@ -464,12 +452,10 @@ var/obj/item/device/multitool/M = W M.buffer = src to_chat(user, "You download the data to the [W.name]'s buffer.") - return if(istype(W, /obj/item/weapon/wirecutters)) link_console_and_hub() to_chat(user, "You reconnect the station to nearby machinery.") - return /obj/machinery/teleport/station/attack_ai() @@ -481,13 +467,11 @@ else to_chat(user, "Close the maintenance panel first.") - /obj/machinery/teleport/station/proc/toggle(mob/user) if (stat & (BROKEN|NOPOWER) || !teleporter_hub || !teleporter_console) return if (teleporter_hub.panel_open) to_chat(user, "Close the hub's maintenance panel first.") - return if (teleporter_console.target) src.engaged = !src.engaged diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index f71a4223d31..d117961ff88 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -132,7 +132,6 @@ do_transform_mime(AM) else to_chat(AM, "Only items can be greyscaled.") - return /obj/machinery/transformer/proc/do_transform_mime(var/obj/item/I) diff --git a/code/game/machinery/turntable.dm b/code/game/machinery/turntable.dm index a32ff6260d6..bb69783db22 100644 --- a/code/game/machinery/turntable.dm +++ b/code/game/machinery/turntable.dm @@ -44,7 +44,6 @@ if( href_list["on1"] ) if(src.playing == 0) // to_chat(world, "Should be working...") - var/sound/S = sound('sound/turntable/TestLoop1.ogg') S.repeat = 1 S.channel = 10 @@ -54,9 +53,7 @@ //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) // to_chat(world, "Found the song...") - // to_chat(M, S) - // M.music = 1 var/area/A = src.loc.loc @@ -67,22 +64,18 @@ for(var/mob/M in world) if((M.loc.loc in A) && M.music == 0) // to_chat(world, "Found the song...") - to_chat(M, S) - M.music = 1 else if(!(M.loc.loc in A) && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 to_chat(M, Soff) - M.music = 0 sleep(10) return if( href_list["on2"] ) if(src.playing == 0) // to_chat(world, "Should be working...") - var/sound/S = sound('sound/turntable/TestLoop2.ogg') S.repeat = 1 S.channel = 10 @@ -92,9 +85,7 @@ //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) // to_chat(world, "Found the song...") - // to_chat(M, S) - // M.music = 1 var/area/A = src.loc.loc for(var/obj/machinery/party/lasermachine/L in A) @@ -104,22 +95,18 @@ for(var/mob/M in world) if(M.loc.loc == src.loc.loc && M.music == 0) // to_chat(world, "Found the song...") - to_chat(M, S) - M.music = 1 else if(M.loc.loc != src.loc.loc && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 to_chat(M, Soff) - M.music = 0 sleep(10) return if( href_list["on3"] ) if(src.playing == 0) // to_chat(world, "Should be working...") - var/sound/S = sound('sound/turntable/TestLoop3.ogg') S.repeat = 1 S.channel = 10 @@ -129,9 +116,7 @@ //for(var/mob/M in world) // if(M.loc.loc == src.loc.loc && M.music == 0) // to_chat(world, "Found the song...") - // to_chat(M, S) - // M.music = 1 var/area/A = src.loc.loc for(var/obj/machinery/party/lasermachine/L in A) @@ -141,15 +126,12 @@ for(var/mob/M in world) if(M.loc.loc == src.loc.loc && M.music == 0) // to_chat(world, "Found the song...") - to_chat(M, S) - M.music = 1 else if(M.loc.loc != src.loc.loc && M.music == 1) var/sound/Soff = sound(null) Soff.channel = 10 to_chat(M, Soff) - M.music = 0 sleep(10) return @@ -162,7 +144,6 @@ S.wait = 1 for(var/mob/M in world) to_chat(M, S) - M.music = 0 playing = 0 var/area/A = src.loc.loc diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 9b703f5478d..0deb0d947a3 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -66,12 +66,10 @@ /obj/machinery/turretid/proc/isLocked(mob/user) if(ailock && (isrobot(user) || isAI(user))) to_chat(user, "There seems to be a firewall preventing you from accessing this device.") - return 1 if(locked && !(isrobot(user) || isAI(user) || isobserver(user))) to_chat(user, "Access denied.") - return 1 return 0 @@ -90,18 +88,15 @@ if(src.allowed(usr)) if(emagged) to_chat(user, "The turret control is unresponsive.") - else locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] the panel.") - return return ..() /obj/machinery/turretid/emag_act(user as mob) if(!emagged) to_chat(user, "You short out the turret controls' access analysis module.") - emagged = 1 locked = 0 ailock = 0 diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 7c4a48c3b3e..ef5db5f833b 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -185,7 +185,6 @@ if(cur_target) //if it's found, proceed // to_chat(world, "[cur_target]") - if(!isPopping()) if(isDown()) popUp() @@ -338,7 +337,6 @@ src.die() else to_chat(M, "That object is useless to you.") - return @@ -355,7 +353,6 @@ src.die() else to_chat(M, "\green That object is useless to you.") - return @@ -366,7 +363,6 @@ if (src.locked) if (!istype(usr, /mob/living/silicon)) to_chat(usr, "Control panel is locked!") - return if (href_list["toggleOn"]) src.enabled = !src.enabled diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index c1271b11cc5..8266c2a0ee8 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -189,7 +189,6 @@ if(machine_content.amount != machine_content.max_amount) if(user) to_chat(user, "[machine_content.max_amount - machine_content.amount] of [machine_content.product_name]") - machine_content.amount = machine_content.max_amount refill.charges -= to_restock total = to_restock @@ -205,7 +204,6 @@ if(restock) if(user) to_chat(user, "[restock] of [machine_content.product_name]") - if(refill.charges == 0) //due to rounding, we ran out of refill charges, exit. break return total @@ -237,7 +235,6 @@ playsound(loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - overlays.Cut() if(panel_open) overlays += image(icon, "[initial(icon_state)]-panel") @@ -263,38 +260,31 @@ coin = W categories |= CAT_COIN to_chat(user, "\blue You insert the [W] into the [src]") - nanomanager.update_uis(src) return else if(istype(W, refill_canister) && refill_canister != null) if(stat & (BROKEN|NOPOWER)) to_chat(user, "It does nothing.") - else if(panel_open) //if the panel is open we attempt to refill the machine var/obj/item/weapon/vending_refill/canister = W if(canister.charges == 0) to_chat(user, "This [canister.name] is empty!") - else var/transfered = refill_inventory(canister,product_records,user) if(transfered) to_chat(user, "You loaded [transfered] items in \the [name].") - else to_chat(user, "The [name] is fully stocked.") - return; else to_chat(user, "You should probably unscrew the service panel first.") - else ..() /obj/machinery/vending/emag_act(user as mob) emagged = 1 to_chat(user, "You short out the product lock on [src]") - return /** @@ -307,7 +297,6 @@ // This is not a status display message, since it's something the character // themselves is meant to see BEFORE putting the money in to_chat(usr, "\icon[cashmoney] That is not enough money.") - return 0 // Bills (banknotes) cannot really have worth different than face value, @@ -466,13 +455,11 @@ if(href_list["remove_coin"] && !istype(usr,/mob/living/silicon)) if(!coin) to_chat(usr, "There is no coin in this machine.") - return usr.put_in_hands(coin) coin = null to_chat(usr, "\blue You remove the [coin] from the [src]") - categories &= ~CAT_COIN if (href_list["pay"]) @@ -498,13 +485,11 @@ if(issilicon(usr) && !isrobot(usr)) to_chat(usr, "The vending machine refuses to interface with you, as you are not in its target demographic!") - return if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Access denied.")//Unless emagged of course - flick(icon_deny,src) return @@ -539,12 +524,10 @@ if((!allowed(usr)) && !emagged && scan_id) //For SECURE VENDING MACHINES YEAH to_chat(usr, "Access denied.")//Unless emagged of course - flick(src.icon_deny,src) return if(!R.amount) to_chat(user, "\red The vending machine has ran out of that product.") - return src.vend_ready = 0 //One thing at a time!! src.status_message = "Vending..." @@ -554,15 +537,12 @@ if (R.category & CAT_COIN) if(!coin) to_chat(user, "\blue You need to insert a coin to get this item.") - return if(coin.string_attached) if(prob(50)) to_chat(user, "\blue You successfully pull the coin out before the [src] could swallow it.") - else to_chat(user, "\blue You weren't able to pull the coin out fast enough, the machine ate it, string and all.") - coin = null qdel(coin) categories &= ~CAT_COIN @@ -592,7 +572,6 @@ /obj/machinery/vending/proc/stock(var/datum/data/vending_product/R, var/mob/user) if(src.panel_open) to_chat(user, "\blue You stock the [src] with \a [R.product_name]") - R.amount++ src.updateUsrDialog() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index d89fddfd69f..6889cf67c42 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -33,7 +33,6 @@ if( state != 4 ) to_chat(usr, "The washing machine cannot run in this state.") - return if( locate(/mob,contents) ) @@ -201,7 +200,6 @@ /*if(istype(W,/obj/item/weapon/screwdriver)) panel = !panel to_chat(user, "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel")*/ - if(istype(W,/obj/item/toy/crayon) ||istype(W,/obj/item/weapon/stamp)) if( state in list( 1, 3, 6 ) ) if(!crayon) @@ -233,59 +231,45 @@ //YES, it's hardcoded... saves a var/can_be_washed for every single clothing item. if ( istype(W,/obj/item/clothing/suit/space ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/suit/syndicatefake ) ) to_chat(user, "This item does not fit.") - return // if ( istype(W,/obj/item/clothing/suit/powered ) ) // to_chat(user, "This item does not fit.") - // return if ( istype(W,/obj/item/clothing/suit/cyborg_suit ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/suit/bomb_suit ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/suit/armor ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/suit/armor ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/mask/gas ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/mask/cigarette ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/head/syndicatefake ) ) to_chat(user, "This item does not fit.") - return // if ( istype(W,/obj/item/clothing/head/powered ) ) // to_chat(user, "This item does not fit.") - // return if ( istype(W,/obj/item/clothing/head/helmet ) ) to_chat(user, "This item does not fit.") - return if ( istype(W,/obj/item/clothing/gloves/furgloves ) ) to_chat(user, "This item does not fit.") - return if(W.flags & NODROP) //if "can't drop" item to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!") - return if(contents.len < 5) @@ -295,10 +279,8 @@ state = 3 else to_chat(user, "\blue You can't put the item in right now.") - else to_chat(user, "\blue The washing machine is full.") - else ..() update_icon() @@ -321,7 +303,6 @@ state = 1 if(5) to_chat(user, "\red The [src] is busy.") - if(6) state = 7 if(7) diff --git a/code/game/machinery/wishgranter.dm b/code/game/machinery/wishgranter.dm index f0bc8c1e58e..217b1e70165 100644 --- a/code/game/machinery/wishgranter.dm +++ b/code/game/machinery/wishgranter.dm @@ -21,22 +21,18 @@ if(!istype(user, /mob/living/carbon/human)) to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") - return if(is_special_character(user)) to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") - return if(inuse) to_chat(user, "Someone is already communing with the Wish Granter.") - return to_chat(user, "The power of the Wish Granter have turned you into the superhero the station deserves. You are a masked vigilante, and answer to no man. Will you use your newfound strength to protect the innocent, or will you hunt the guilty?") - inuse = 1 var/wish if(types.len == 1) @@ -56,7 +52,6 @@ //Remove the wishgranter or teleport it randomly on the station if(!types.len) to_chat(user, "The wishgranter slowly fades into mist...") - qdel(src) return else diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index b06d02efc41..0d7676d75b7 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -151,7 +151,6 @@ if(zoom) src.occupant.client.view = 12 to_chat(src.occupant, sound('sound/mecha/imag_enh.ogg',volume=50)) - else src.occupant.client.view = world.view//world.view - default mob view size return diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index 75efc280354..1967f1e6645 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -53,10 +53,8 @@ chassis.log_append_to_last("[src] is destroyed.",1) if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon)) to_chat(chassis.occupant, sound('sound/mecha/weapdestr.ogg',volume=50)) - else to_chat(chassis.occupant, sound('sound/mecha/critdestr.ogg',volume=50)) - chassis = null return ..() diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 0ab84bd842b..98db55e0f25 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -546,7 +546,6 @@ chassis.log_message("Attacked by [W]. Attacker - [user]") if(prob(chassis.deflect_chance*deflect_coeff)) to_chat(user, "\red The [W] bounces off [chassis] armor.") - chassis.log_append_to_last("Armor saved.") else chassis.occupant_message("[user] hits [chassis] with [W].") @@ -934,7 +933,6 @@ user.visible_message("[user] tries to shove [weapon_name] into [src], but \the [src] rejects it.","[fuel_name] traces in target minimal. [weapon_name] cannot be used as fuel.") else if(!result) to_chat(user, "Unit is full.") - else user.visible_message("[user] loads [src] with \the [weapon_name].","[result] unit\s of [fuel_name] successfully loaded.") return diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index d1e537fd877..d95cbaff799 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -141,7 +141,6 @@ if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) continue to_chat(M, "HONK") - M.sleeping = 0 M.stuttering = 20 M.ear_deaf = 30 diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 9d527750470..562e30d834d 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -294,7 +294,6 @@ return 1 if(!allowed(user) && !isobserver(user)) to_chat(user, "Access denied.") - return 1 return interact(user) @@ -507,7 +506,6 @@ return 1 else to_chat(user, "You can't load \the [name] while it's opened.") - return 1 if(istype(W, /obj/item/stack)) @@ -536,11 +534,9 @@ if(being_built) to_chat(user, "\The [src] is currently processing. Please wait until completion.") - return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator to_chat(user, "\The [src] [material2name(material)] storage is full.") - return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -551,13 +547,11 @@ resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) to_chat(user, "You insert [transfer_amount] [sname] sheet\s into \the [src].") - sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else to_chat(user, "\The [src] cannot hold any more [sname] sheet\s.") - return /obj/machinery/mecha_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 7a563b2b35c..ceeca47f72e 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -170,25 +170,18 @@ switch(integrity) if(85 to 100) to_chat(user, "It's fully intact.") - if(65 to 85) to_chat(user, "It's slightly damaged.") - if(45 to 65) to_chat(user, "It's badly damaged.") - if(25 to 45) to_chat(user, "It's heavily damaged.") - else to_chat(user, "It's falling apart.") - if(equipment && equipment.len) to_chat(user, "It's equipped with:") - for(var/obj/item/mecha_parts/mecha_equipment/ME in equipment) to_chat(user, "\icon[ME] [ME]") - return @@ -308,7 +301,6 @@ if(user != src.occupant) //While not "realistic", this piece is player friendly. user.forceMove(get_turf(src)) to_chat(user, "You climb out from [src]") - return 0 if(connected_port) if(world.time - last_message > 20) @@ -467,7 +459,6 @@ pr_internal_damage.start() log_append_to_last("Internal damage of type [int_dam_flag].",1) to_chat(occupant, sound('sound/machines/warning-buzzer.ogg',wait=0)) - diag_hud_set_mechstat() return @@ -537,13 +528,11 @@ src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "\red You slash at the armored suit!") - visible_message("\red The [user] slashes at [src.name]'s armor!") else src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "\green Your claws had no effect!") - src.occupant_message("\blue The [user]'s claws are stopped by the armor.") visible_message("\blue The [user] rebounds off [src.name]'s armor!") return @@ -711,7 +700,6 @@ src.check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST)) playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) to_chat(user, "\red You smash at the armored suit!") - for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) V.show_message("\red The [user] smashes against [src.name]'s armor!", 1) @@ -719,7 +707,6 @@ src.log_append_to_last("Armor saved.") playsound(src.loc, 'sound/effects/blobattack.ogg', 50, 1, -1) to_chat(user, "\green Your attack had no effect!") - src.occupant_message("\blue The [user]'s attack is stopped by the armor.") for (var/mob/V in viewers(src)) if(V.client && !(V.blinded)) @@ -753,7 +740,6 @@ user.do_attack_animation(src) if(prob(src.deflect_chance)) to_chat(user, "\red The [W] bounces off [src.name] armor.") - src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -776,10 +762,8 @@ if(istype(W, /obj/item/device/mmi) || istype(W, /obj/item/device/mmi/posibrain)) if(mmi_move_inside(W,user)) to_chat(user, "[src]-MMI interface initialized successfuly") - else to_chat(user, "[src]-MMI interface initialization failed.") - return if(istype(W, /obj/item/mecha_parts/mecha_equipment)) @@ -791,7 +775,6 @@ user.visible_message("[user] attaches [W] to [src]", "You attach [W] to [src]") else to_chat(user, "You were unable to attach [W] to [src]") - return if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) if(add_req_access || maint_access) @@ -806,34 +789,27 @@ return else to_chat(user, "\red Invalid ID: Access denied.") - else to_chat(user, "\red Maintenance protocols disabled by operator.") - else if(istype(W, /obj/item/weapon/wrench)) if(state==1) state = 2 to_chat(user, "You undo the securing bolts.") - else if(state==2) state = 1 to_chat(user, "You tighten the securing bolts.") - return else if(istype(W, /obj/item/weapon/crowbar)) if(state==2) state = 3 to_chat(user, "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") - else if(state==4 && pilot_is_mmi()) // Since having maint protocols available is controllable by the MMI, I see this as a consensual way to remove an MMI without destroying the mech user.visible_message("[user] begins levering out the MMI from the [src].", "You begin to lever out the MMI from the [src].") to_chat(occupant, "[user] is prying you out of the exosuit!") - if(do_after(user,80,target=src)) user.visible_message("[user] pries the MMI out of the [src]!", "You finish removing the MMI from the [src]!") go_out() @@ -847,41 +823,34 @@ CC.use(2) clearInternalDamage(MECHA_INT_SHORT_CIRCUIT) to_chat(user, "You replace the fused wires.") - else to_chat(user, "There's not enough wire to finish the task.") - return else if(istype(W, /obj/item/weapon/screwdriver)) if(hasInternalDamage(MECHA_INT_TEMP_CONTROL)) clearInternalDamage(MECHA_INT_TEMP_CONTROL) to_chat(user, "You repair the damaged temperature controller.") - else if(state==3 && src.cell) src.cell.forceMove(src.loc) src.cell = null state = 4 to_chat(user, "You unscrew and pry out the powercell.") - src.log_message("Powercell removed") else if(state==4 && src.cell) state=3 to_chat(user, "You screw the cell in place") - return else if(istype(W, /obj/item/weapon/stock_parts/cell)) if(state==4) if(!src.cell) to_chat(user, "You install the powercell") - user.drop_item() W.forceMove(src) src.cell = W src.log_message("Powercell installed") else to_chat(user, "There's already a powercell installed.") - return else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != I_HARM) @@ -890,22 +859,18 @@ if (hasInternalDamage(MECHA_INT_TANK_BREACH)) clearInternalDamage(MECHA_INT_TANK_BREACH) to_chat(user, "\blue You repair the damaged gas tank.") - else return if(src.health\the [W] is stuck to your hand, you cannot put it in \the [src]") - return W.forceMove(src) user.visible_message("[user] attaches [W] to [src].", "You attach [W] to [src]") @@ -915,7 +880,6 @@ if(occupant) to_chat(user, "You can't customize a mech while someone is piloting it - that would be unsafe!") - return var/obj/item/weapon/paintkit/P = W @@ -928,7 +892,6 @@ if(!found) to_chat(user, "That kit isn't meant for use on this class of exosuit.") - return user.visible_message("[user] opens [P] and spends some quality time customising [src].") @@ -947,7 +910,6 @@ src.log_message("Attacked by [W]. Attacker - [user]") if(prob(src.deflect_chance)) to_chat(user, "\red The [W] bounces off [src.name] armor.") - src.log_append_to_last("Armor saved.") /* for (var/mob/V in viewers(src)) @@ -969,12 +931,10 @@ if(istype(src, /obj/mecha/working/ripley) && emagged == 0) emagged = 1 to_chat(usr, "\blue You slide the card through the [src]'s ID slot.") - playsound(src.loc, "sparks", 100, 1) src.desc += "
\red The mech's equipment slots spark dangerously!" else to_chat(usr, "\red The [src]'s ID slot rejects the card.") - return @@ -991,13 +951,10 @@ var/obj/item/mecha_parts/mecha_tracking/B = locate(/obj/item/mecha_parts/mecha_tracking) in src if(B) //Beacons give the AI more detailed mech information. to_chat(user, "Warning: Tracking Beacon detected. Enter at your own risk. Beacon Data:") - to_chat(user, "[B.get_mecha_info()]") - //Nothing like a big, red link to make the player feel powerful! to_chat(user, "ASSUME DIRECT CONTROL?
") - /obj/mecha/transfer_ai(var/interaction, mob/user, var/mob/living/silicon/ai/AI, var/obj/item/device/aicard/card) if(!..()) return @@ -1007,16 +964,13 @@ if(AI_TRANS_TO_CARD) //Upload AI from mech to AI card. if(!maint_access) //Mech must be in maint mode to allow carding. to_chat(user, "[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.") - return if (AI.mind.special_role == "malfunction") //Malf AIs cannot leave mechs. Except through death. to_chat(user, "ACCESS DENIED.") - return AI.aiRestorePowerRoutine = 0//So the AI initially has power. AI.control_disabled = 1 @@ -1027,17 +981,13 @@ 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.") - if(AI_MECH_HACK) //Called by Malf AI mob on the mech. new /obj/structure/AIcore/deactivated(AI.loc) 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!") - go_out(1) //IT IS MINE, NOW. SUCK IT, RD! ai_enter_mech(AI, interaction) @@ -1045,20 +995,16 @@ AI = locate(/mob/living/silicon/ai) in card if(!AI) to_chat(user, "There is no AI currently installed on this device.") - return else if(AI.stat || !AI.client) to_chat(user, "[AI.name] is currently unresponsive, and cannot be uploaded.") - return else if(occupant || dna) //Normal AIs cannot steal mechs! to_chat(user, "Access denied. [name] is [occupant ? "currently occupied" : "secured with a DNA lock"].") - return AI.control_disabled = 0 AI.aiRadio.disabledAi = 0 to_chat(user, "Transfer successful: [AI.name] ([rand(1000,9999)].exe) installed and executed successfully. Local copy has been removed.") - ai_enter_mech(AI, interaction) //Hack and From Card interactions share some code, so leave that here for both to use. @@ -1070,7 +1016,6 @@ playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) to_chat(occupant, sound('sound/mecha/nominal.ogg',volume=50)) - AI.cancel_camera() AI.controlled_mech = src AI.remote_control = src @@ -1080,7 +1025,6 @@ : "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.") - ///////////////////////////////////// //////// Atmospheric stuff //////// ///////////////////////////////////// @@ -1233,7 +1177,6 @@ src.log_message("[user] tries to move in.") if (src.occupant) to_chat(usr, "The [src.name] is already occupied!") - src.log_append_to_last("Permission denied.") return var/passed @@ -1245,13 +1188,11 @@ passed = 1 if(!passed) to_chat(user, "Access denied.") - src.log_append_to_last("Permission denied.") return for(var/mob/living/carbon/slime/S in range(1,user)) if(S.Victim == user) to_chat(user, "You're too busy getting your life sucked out of you.") - return visible_message("[user] starts to climb into [src.name]") @@ -1261,10 +1202,8 @@ moved_inside(user) else if(src.occupant!=user) to_chat(user, "[src.occupant] was faster. Try better next time, loser.") - else to_chat(user, "You stop entering the exosuit.") - return /obj/mecha/proc/moved_inside(var/mob/living/carbon/human/H as mob) @@ -1285,7 +1224,6 @@ playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) if(!hasInternalDamage()) to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) - return 1 else return 0 @@ -1293,24 +1231,19 @@ /obj/mecha/proc/mmi_move_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected.") - return 0 else if(mmi_as_oc.brainmob.stat) to_chat(user, "Beta-rhythm below acceptable level.") - return 0 else if(occupant) to_chat(user, "Occupant detected.") - return 0 else if(dna && dna!=mmi_as_oc.brainmob.dna.unique_enzymes) to_chat(user, "Stop it!") - return 0 //Added a message here since people assume their first click failed or something./N // to_chat(user, "Installing MMI, please stand by.") - visible_message("\blue [usr] starts to insert an MMI into [src.name]") if(enter_after(40,user)) @@ -1318,25 +1251,20 @@ return mmi_moved_inside(mmi_as_oc,user) else to_chat(user, "Occupant detected.") - else to_chat(user, "You stop inserting the MMI.") - return 0 /obj/mecha/proc/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob) if(mmi_as_oc && user in range(1)) if(!mmi_as_oc.brainmob || !mmi_as_oc.brainmob.client) to_chat(user, "Consciousness matrix not detected.") - return 0 else if(mmi_as_oc.brainmob.stat) to_chat(user, "Beta-rhythm below acceptable level.") - return 0 if(!user.unEquip(mmi_as_oc)) to_chat(user, "\the [mmi_as_oc] is stuck to your hand, you cannot put it in \the [src]") - return 0 var/mob/brainmob = mmi_as_oc.brainmob brainmob.reset_view(src) @@ -1357,7 +1285,6 @@ src.log_message("[mmi_as_oc] moved in as pilot.") if(!hasInternalDamage()) to_chat(src.occupant, sound('sound/mecha/nominal.ogg',volume=50)) - return 1 else return 0 @@ -1441,7 +1368,6 @@ occupant.SetStunned(5) occupant.SetWeakened(5) to_chat(occupant, "You were blown out of the mech!") - */ src.log_message("[mob_container] moved out.") occupant.reset_view() @@ -1718,7 +1644,6 @@ if(message) if(src.occupant && src.occupant.client) to_chat(src.occupant, "\icon[src] [message]") - return /obj/mecha/proc/log_message(message as text,red=null) @@ -1831,11 +1756,9 @@ if(state==0) state = 1 to_chat(user, "The securing bolts are now exposed.") - else if(state==1) state = 0 to_chat(user, "The securing bolts are now hidden.") - output_maintenance_dialog(filter.getObj("id_card"),user) return if(href_list["set_internal_tank_valve"] && state >=1) @@ -1846,7 +1769,6 @@ if(new_pressure) internal_tank_valve = new_pressure to_chat(user, "The internal pressure valve has been set to [internal_tank_valve]kPa.") - if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card")) if(!in_range(src, usr)) return operation_req_access += filter.getNum("add_req_access") @@ -1868,7 +1790,6 @@ return if(src.occupant && !iscarbon(src.occupant)) to_chat(src.occupant, "You do not have any DNA!") - return src.dna = src.occupant.dna.unique_enzymes src.occupant_message("You feel a prick as the needle takes your DNA sample.") diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index 7be280bd2b5..f6d627cc505 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -24,13 +24,11 @@ playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else to_chat(user, ("There's not enough cable to finish the task.")) - return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) to_chat(user, ("There's not enough material in this stack.")) - return 0 else S.use(5) @@ -58,13 +56,11 @@ playsound(holder, 'sound/items/Deconstruct.ogg', 50, 1) else to_chat(user, ("There's not enough cable to finish the task.")) - return 0 else if(istype(used_atom, /obj/item/stack)) var/obj/item/stack/S = used_atom if(S.amount < 5) to_chat(user, ("There's not enough material in this stack.")) - return 0 else S.use(5) diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm index 2198c472f93..8da0f916425 100644 --- a/code/game/mecha/mecha_wreckage.dm +++ b/code/game/mecha/mecha_wreckage.dm @@ -44,7 +44,6 @@ else if (isemptylist(welder_salvage)) to_chat(user, "What's left on the [src] cannot be removed with a welder, besides the frame itself") - else if(WT.remove_fuel(0,user)) var/type = prob(70)?pick(welder_salvage):null if(type) @@ -55,14 +54,11 @@ salvage_num-- else to_chat(user, "You failed to salvage anything valuable from [src].") - else to_chat(user, "\blue You need more welding fuel to complete this task.") - else if(istype(W, /obj/item/weapon/wirecutters)) if(salvage_num <= 0) to_chat(user, "You don't see anything that can be cut with [W].") - return else if(!isemptylist(wirecutters_salvage)) var/type = prob(70)?pick(wirecutters_salvage):null @@ -72,7 +68,6 @@ salvage_num-- else to_chat(user, "You failed to salvage anything valuable from [src].") - else if(istype(W, /obj/item/weapon/crowbar)) if(!isemptylist(crowbar_salvage)) var/obj/S = pick(crowbar_salvage) @@ -82,7 +77,6 @@ user.visible_message("[user] pries [S] from [src].", "You pry [S] from [src].") else to_chat(user, "You don't see anything that can be pried with [W].") - else ..() return diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 502a738ae31..7616df4c119 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -37,10 +37,8 @@ if (isslime(M) || isAI(M)) if(M == usr) to_chat(M, "You are unable to buckle yourself to the [src]!") - else to_chat(usr, "You are unable to buckle [M] to the [src]!") - return 0 M.buckled = src diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm index 16ebeb9a100..320ec09a2ee 100644 --- a/code/game/objects/effects/aliens.dm +++ b/code/game/objects/effects/aliens.dm @@ -319,22 +319,18 @@ switch(status) if(BURST) to_chat(user, "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.") - return if(GROWN) to_chat(user, "You retrieve the child.") - Burst(0) return else to_chat(user, "It feels slimy.") - user.changeNext_move(CLICK_CD_MELEE) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index 05a1ec2ea67..2b044b588e1 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -36,7 +36,6 @@ if(istype(I, /obj/item/device/analyzer)) to_chat(user, "Analyzing... [src]'s unstable field is fluctuating along frequency [aSignal.code]:[format_frequency(aSignal.frequency)].") - /////////////////////// /obj/effect/anomaly/grav diff --git a/code/game/objects/effects/datacore-effect.dm b/code/game/objects/effects/datacore-effect.dm index a6913f25087..ce970c31916 100644 --- a/code/game/objects/effects/datacore-effect.dm +++ b/code/game/objects/effects/datacore-effect.dm @@ -51,7 +51,6 @@ else isactive[name] = t.fields["p_stat"] // to_chat(world, "[name]: [rank]") - //cael - to prevent multiple appearances of a player/job combination, add a continue after each line var/department = 0 if(real_rank in command_positions) diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm index 3cda01717c5..b11ad6bf633 100644 --- a/code/game/objects/effects/decals/Cleanable/humans.dm +++ b/code/game/objects/effects/decals/Cleanable/humans.dm @@ -93,7 +93,6 @@ var/global/list/image/splatter_cache=list() var/taken = rand(1,amount) amount -= taken to_chat(user, "You get some of \the [src] on your hands.") - if (!user.blood_DNA) user.blood_DNA = list() user.blood_DNA |= blood_DNA.Copy() @@ -142,7 +141,6 @@ var/global/list/image/splatter_cache=list() ..(user) to_chat(user, "It reads: \"[message]\"") - /obj/effect/decal/cleanable/blood/gibs name = "gibs" desc = "They look bloody and gruesome." diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm index 6fc90b31628..6e8c591399d 100644 --- a/code/game/objects/effects/decals/Cleanable/tracks.dm +++ b/code/game/objects/effects/decals/Cleanable/tracks.dm @@ -79,7 +79,6 @@ var/global/list/image/fluidtrack_cache=list() // Process 4 bits for(var/bi=0;bi<4;bi++) to_chat(b=1, bi) - // COMING BIT // If setting if(comingdir&b) diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm index e05dd1c074a..446f1f39e89 100644 --- a/code/game/objects/effects/decals/cleanable.dm +++ b/code/game/objects/effects/decals/cleanable.dm @@ -15,14 +15,11 @@ if(src.reagents && W.reagents && !noscoop) if(!src.reagents.total_volume) to_chat(user, "There isn't enough [src] to scoop up!") - return if(W.reagents.total_volume >= W.reagents.maximum_volume) to_chat(user, "[W] is full!") - return to_chat(user, "You scoop the [src] into [W]!") - reagents.trans_to(W, reagents.total_volume) if(!reagents.total_volume && !noclear) //scooped up all of it qdel(src) @@ -34,7 +31,6 @@ src.reagents.handle_reactions() to_chat(user, "You heat [src] with [W]!") - /obj/effect/decal/cleanable/ex_act() if(reagents) for(var/datum/reagent/R in reagents.reagent_list) diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm index 52f4af032ed..6658838a5d3 100644 --- a/code/game/objects/effects/decals/contraband.dm +++ b/code/game/objects/effects/decals/contraband.dm @@ -60,7 +60,6 @@ if(check) to_chat(user, "The wall is far too cluttered to place a poster!") - return resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster @@ -312,11 +311,9 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) if(ruined) to_chat(user, "You remove the remnants of the poster.") - qdel(src) else to_chat(user, "You carefully remove the poster from the wall.") - roll_and_drop(user.loc) return @@ -358,18 +355,15 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff if(istype(O,/obj/structure/sign)) to_chat(user, "The wall is far too cluttered to place a poster!") - return stuff_on_wall++ if(stuff_on_wall >= 4) to_chat(user, "The wall is far too cluttered to place a poster!") - return to_chat(user, "You start placing the poster on the wall...")//Looks like it's uncluttered enough. Place the poster. - //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster var/obj/structure/sign/poster/D = P.resulting_poster @@ -390,7 +384,6 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) D.pixel_y = 0 else to_chat(user, "You cannot reach the wall from here!") - return flick("poster_being_set",D) @@ -404,7 +397,6 @@ obj/structure/sign/poster/attackby(obj/item/I, mob/user, params) if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc) //Let's check if everything is still there to_chat(user, "You place the poster!") - else D.roll_and_drop(temp_loc) return diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm index 59b13eb3be1..744edcd7711 100644 --- a/code/game/objects/effects/effect_system.dm +++ b/code/game/objects/effects/effect_system.dm @@ -1094,7 +1094,6 @@ steam.start() -- spawns the effect else to_chat(user, "You hit the metal foam but bounce off it.") - /obj/structure/foamedmetal/attackby(var/obj/item/I, var/mob/user, params) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) @@ -1112,7 +1111,6 @@ steam.start() -- spawns the effect else to_chat(user, "You hit the metal foam to no effect.") - /obj/structure/foamedmetal/attack_animal(mob/living/simple_animal/M) M.do_attack_animation(src) if(M.melee_damage_upper == 0) @@ -1159,11 +1157,9 @@ steam.start() -- spawns the effect for(var/mob/M in viewers(5, location)) to_chat(M, "\red The solution violently explodes.") - for(var/mob/M in viewers(1, location)) if (prob (50 * amount)) to_chat(M, "\red The explosion knocks you down.") - M.Weaken(rand(1,5)) return else @@ -1188,7 +1184,6 @@ steam.start() -- spawns the effect for(var/mob/M in viewers(8, location)) to_chat(M, "\red The solution violently explodes.") - explosion(location, devastation, heavy, light, flash) proc/holder_damage(var/atom/holder) diff --git a/code/game/objects/effects/gibs.dm b/code/game/objects/effects/gibs.dm index a630ca27106..a9e165666fc 100644 --- a/code/game/objects/effects/gibs.dm +++ b/code/game/objects/effects/gibs.dm @@ -26,7 +26,6 @@ proc/Gib(atom/location, var/list/viruses = list(), var/datum/dna/MobDNA = null) if(gibtypes.len != gibamounts.len || gibamounts.len != gibdirections.len) to_chat(world, "\red Gib list length mismatch!") - return var/obj/effect/decal/cleanable/blood/gibs/gib = null diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 0c3ee5d99ab..6e54e69cf92 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -22,7 +22,6 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) to_chat(O, "[M] triggered the \icon[src] [src]") - triggered = 1 call(src,triggerproc)(M) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 2d1510bbf16..f87e97f9cb0 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -66,7 +66,6 @@ else if(istype(mover, /mob/living)) if(prob(50)) to_chat(mover, "You get stuck in \the [src] for a moment.") - return 0 else if(istype(mover, /obj/item/projectile)) return prob(30) @@ -209,7 +208,6 @@ S.key = C.key if(master_commander) to_chat(S, "You are a spider who is loyal to [master_commander], obey [master_commander]'s every order and assist them in completing their goals at any cost.") - qdel(src) /obj/effect/decal/cleanable/spiderling_remains diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 159fed83a2f..6bf7b8dac11 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -17,7 +17,6 @@ for(var/mob/M in range(heavy_range, epicenter)) to_chat(M, 'sound/effects/EMPulse.ogg') - for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) if(distance < 0) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index 98e14266aa8..d21767cb4c0 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -75,7 +75,6 @@ if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) to_chat(M, 'sound/effects/explosionfar.ogg') - if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() E.set_up(epicenter) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 4fc9eb3a1ba..8c4bf753108 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -165,7 +165,6 @@ to_chat(user, msg) - /obj/item/attack_hand(mob/user as mob) if (!user) return 0 if (hasorgans(user)) @@ -175,11 +174,9 @@ temp = H.organs_by_name["l_hand"] if(!temp) to_chat(user, "You try to use your hand, but it's missing!") - return 0 if(temp && !temp.is_usable()) to_chat(user, "You try to move your [temp.name], but cannot!") - return 0 if (istype(src.loc, /obj/item/weapon/storage)) @@ -211,7 +208,6 @@ if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) to_chat(user, "Your claws aren't capable of such fine manipulation.") - return if (istype(src.loc, /obj/item/weapon/storage)) @@ -239,7 +235,6 @@ if(src in A.contents) // To stop Aliens having items stuck in their pockets A.unEquip(src) to_chat(user, "Your claws aren't capable of such fine manipulation.") - return attack_hand(A) @@ -274,14 +269,11 @@ S.handle_item_insertion(I, 1) //The 1 stops the "You put the [src] into [S]" insertion message from being displayed. if(success && !failure) to_chat(user, "You put everything in [S].") - else if(success) to_chat(user, "You put some things in [S].") - else to_chat(user, "You fail to pick anything up with [S].") - else if(S.can_be_inserted(src)) S.handle_item_insertion(src) @@ -352,27 +344,21 @@ return if((!istype(usr, /mob/living/carbon)) || (istype(usr, /mob/living/carbon/brain)))//Is humanoid, and is not a brain to_chat(usr, "\red You can't pick things up!") - return if( usr.stat || usr.restrained() )//Is not asleep/dead and is not restrained to_chat(usr, "\red You can't pick things up!") - return if(src.anchored) //Object isn't anchored to_chat(usr, "\red You can't pick that up!") - return if(!usr.hand && usr.r_hand) //Right hand is not full to_chat(usr, "\red Your right hand is full.") - return if(usr.hand && usr.l_hand) //Left hand is not full to_chat(usr, "\red Your left hand is full.") - return if(!istype(src.loc, /turf)) //Object is on a turf to_chat(usr, "\red You can't pick that up!") - return //All checks are done, time to pick it up! usr.UnarmedAttack(src) @@ -407,12 +393,10 @@ )) // you can't stab someone in the eyes wearing a mask! to_chat(user, "You're going to need to remove that mask/helmet/glasses first!") - return if(istype(M, /mob/living/carbon/alien) || istype(M, /mob/living/carbon/slime))//Aliens don't have eyes./N slimes also don't have eyes! to_chat(user, "You cannot locate any eyes on this creature!") - return if(!iscarbon(user)) @@ -447,11 +431,9 @@ if(M.stat != 2) if(!(eyes.status & ORGAN_ROBOT) || !(eyes.status & ORGAN_ASSISTED)) //robot eyes bleeding might be a bit silly to_chat(M, "Your eyes start to bleed profusely!") - if(prob(50)) if(M.stat != 2) to_chat(M, "You drop what you're holding and clutch at your eyes!") - M.drop_item() M.eye_blurry += 10 M.Paralyse(1) @@ -459,7 +441,6 @@ if (eyes.damage >= eyes.min_broken_damage) if(M.stat != 2) to_chat(M, "You go blind!") - var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting.take_damage(7)) H.UpdateDamageIcon() @@ -536,7 +517,6 @@ if(flags & ABSTRACT) //Abstract items like grabs won't wash. No-drop items will though because it's still technically an item in your hand. return to_chat(user, "You start washing [src]...") - if(!do_after(user, 40, target = source)) return clean_blood() diff --git a/code/game/objects/items/ashtray.dm b/code/game/objects/items/ashtray.dm index 3eedff16d93..0e977fc5ead 100644 --- a/code/game/objects/items/ashtray.dm +++ b/code/game/objects/items/ashtray.dm @@ -20,7 +20,6 @@ if (istype(W,/obj/item/weapon/cigbutt) || istype(W,/obj/item/clothing/mask/cigarette) || istype(W, /obj/item/weapon/match)) if (contents.len >= max_butts) to_chat(user, "This ashtray is full.") - return user.unEquip(W) W.loc = src @@ -36,7 +35,6 @@ else if (cig.lit == 0) to_chat(user, "You place [cig] in [src] without even smoking it. Why would you do that?") - src.visible_message("[user] places [W] in [src].") user.update_inv_l_hand() user.update_inv_r_hand() @@ -50,7 +48,6 @@ else health = max(0,health - W.force) to_chat(user, "You hit [src] with [W].") - if (health < 1) die() return diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 1d145d2319f..6dd269176b3 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -133,15 +133,12 @@ switch(res) if(ROOM_ERR_SPACE) to_chat(usr, "The new area must be completely airtight.") - return if(ROOM_ERR_TOOLARGE) to_chat(usr, "The new area is too large.") - return else to_chat(usr, "Error! Please notify administration.") - return var/list/turf/turfs = res var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", "", MAX_NAME_LEN)) @@ -149,14 +146,12 @@ return if(length(str) > 50) to_chat(usr, "The given name is too long. The area remains undefined.") - return var/area/A = new A.name = str //var/ma //ma = A.master ? "[A.master]" : "(null)" // to_chat(world, "DEBUG: create_area:
A.name=[A.name]
A.tag=[A.tag]
A.master=[ma]") - A.power_equip = 0 A.power_light = 0 A.power_environ = 0 @@ -179,12 +174,10 @@ return if(length(str) > 50) to_chat(usr, "The given name is too long. The area's name is unchanged.") - return set_area_machinery_title(A,str,prevname) A.name = str to_chat(usr, "You rename the '[prevname]' to '[str]'.") - interact() return 1 diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index c61be6a265a..108dfd28de8 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -58,7 +58,6 @@ return else if(istype(W, /obj/item/weapon/wirecutters)) to_chat(user, "You cut the tag off the bodybag") - src.name = "body bag" src.overlays.Cut() return @@ -92,7 +91,6 @@ if(!open()) to_chat(user, "It won't budge!") - /obj/item/bodybag/cryobag name = "stasis bag" desc = "A folded, non-reusable bag designed for the preservation of an occupant's brain by stasis." @@ -129,7 +127,6 @@ if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) if(!ishuman(usr)) return to_chat(usr, "\red You can't fold that up anymore..") - ..() attackby(W as obj, mob/user as mob, params) @@ -137,8 +134,6 @@ if(src.allowed(user)) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") - else to_chat(user, "\red Access denied.") - return \ No newline at end of file diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 36e0b54f356..6da176f8ba8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -86,16 +86,13 @@ else if(graffiti.Find(drawtype)) temp = "graffiti" to_chat(user, "You start drawing a [temp] on the [target.name].") - if(instant || do_after(user, 50, target = target)) new /obj/effect/decal/cleanable/crayon(target,colour,drawtype,temp) to_chat(user, "You finish drawing [temp].") - if(uses) uses-- if(!uses) to_chat(user, "You used up your [src.name]!") - qdel(src) return @@ -103,13 +100,11 @@ var/huffable = istype(src,/obj/item/toy/crayon/spraycan) if(M == user) to_chat(user, "You take a [huffable ? "huff" : "bite"] of the [src.name]. Delicious!") - user.nutrition += 5 if(uses) uses -= 5 if(uses <= 0) to_chat(user, "There is no more of [src.name] left!") - qdel(src) else ..() @@ -220,7 +215,6 @@ switch(choice) if("Toggle Cap") to_chat(user, "You [capped ? "Remove" : "Replace"] the cap of the [src]") - capped = capped ? 0 : 1 icon_state = "spraycan[capped ? "_cap" : ""]" update_icon() diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index dea1ecd516e..991d04fbd63 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -13,7 +13,6 @@ src.add_fingerprint(user) // Anyone can add their fingerprints to it with this if(owned) to_chat(user, "[src] stares up at you with friendly eyes.") - owner = user owned = 0 return ..() @@ -23,7 +22,6 @@ if(!proximity) return if(istype(O,/obj/structure/sink)) to_chat(user, "You place [src] under a stream of water...") - user.drop_item() loc = get_turf(O) return Swell() diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 00d8999b81e..1bf7edac749 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -84,7 +84,6 @@ flush = 1 AI.suiciding = 1 to_chat(AI, "Your core files are being wiped!") - while (AI && AI.stat != DEAD) AI.adjustOxyLoss(2) AI.updatehealth() @@ -94,16 +93,12 @@ if (href_list["radio"]) AI.aiRadio.disabledAi = text2num(href_list["radio"]) to_chat(AI, "Your Subspace Transceiver has been [AI.aiRadio.disabledAi ? "disabled" : "enabled"]!") - to_chat(user, "You [AI.aiRadio.disabledAi ? "disable" : "enable"] the AI's Subspace Transceiver.") - if (href_list["wireless"]) AI.control_disabled = text2num(href_list["wireless"]) to_chat(AI, "Your wireless interface has been [AI.control_disabled ? "disabled" : "enabled"]!") - to_chat(user, "You [AI.control_disabled ? "disable" : "enable"] the AI's wireless interface.") - update_icon() return 1 diff --git a/code/game/objects/items/devices/autopsy.dm b/code/game/objects/items/devices/autopsy.dm index 45e06357b97..25e4d12614d 100644 --- a/code/game/objects/items/devices/autopsy.dm +++ b/code/game/objects/items/devices/autopsy.dm @@ -80,7 +80,6 @@ set name = "Print Data" if(usr.stat || !(istype(usr,/mob/living/carbon/human))) to_chat(usr, "No.") - return var/scan_data = "" @@ -189,17 +188,14 @@ src.timeofdeath = null to_chat(user, "\red A new patient has been registered.. Purging data for previous patient.") - src.timeofdeath = M.timeofdeath var/obj/item/organ/external/S = M.get_organ(user.zone_sel.selecting) if(!S) to_chat(usr, "You can't scan this body part.") - return if(!S.open) to_chat(usr, "You have to cut the limb open first!") - return for(var/mob/O in viewers(M)) O.show_message("\red [user.name] scans the wounds on [M.name]'s [S.name] with \the [src.name]", 1) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 2a909561d8a..003110f76cd 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -63,7 +63,6 @@ var/turf/T = get_turf(user.loc) if(T.z != current.z || !current.can_use()) to_chat(user, "[src] has lost the signal.") - current = null user.reset_view(null) user.unset_machine() @@ -224,12 +223,10 @@ if(istype(C)) if(!C.can_use()) to_chat(usr, "Something's wrong with that camera. You can't get a feed.") - return var/turf/T = get_turf(loc) if(!T || C.z != T.z) to_chat(usr, "You can't get a signal.") - return current = C spawn(6) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 35ab95e05a3..d8a708d86b7 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -32,7 +32,6 @@ if(istype(target,/obj/item) && !istype(target, /obj/item/weapon/disk/nuclear)) playsound(get_turf(src), 'sound/weapons/flash.ogg', 100, 1, -6) to_chat(user, "Scanned [target].") - saved_item = target.type saved_icon = target.icon saved_icon_state = target.icon_state @@ -47,7 +46,6 @@ qdel(active_dummy) active_dummy = null to_chat(usr, "You deactivate \the [src].") - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -61,7 +59,6 @@ C.activate(O, usr, saved_icon, saved_icon_state, saved_overlays, saved_underlays, src) qdel(O) to_chat(usr, "You activate \the [src].") - var/obj/effect/overlay/T = new/obj/effect/overlay(get_turf(src)) T.icon = 'icons/effects/effects.dmi' flick("emppulse",T) @@ -111,19 +108,16 @@ /obj/effect/dummy/chameleon/attackby() for(var/mob/M in src) to_chat(M, "Your chameleon-projector deactivates.") - master.disrupt() /obj/effect/dummy/chameleon/attack_hand() for(var/mob/M in src) to_chat(M, "Your chameleon-projector deactivates.") - master.disrupt() /obj/effect/dummy/chameleon/ex_act(var/severity) //no longer bomb-proof for(var/mob/M in src) to_chat(M, "Your chameleon-projector deactivates.") - spawn() M.ex_act(severity) master.disrupt() @@ -131,7 +125,6 @@ /obj/effect/dummy/chameleon/bullet_act() for(var/mob/M in src) to_chat(M, "Your chameleon-projector deactivates.") - ..() master.disrupt() diff --git a/code/game/objects/items/devices/debugger.dm b/code/game/objects/items/devices/debugger.dm index 9c9bfb6754f..4b96ba904dd 100644 --- a/code/game/objects/items/devices/debugger.dm +++ b/code/game/objects/items/devices/debugger.dm @@ -25,26 +25,20 @@ var/obj/machinery/power/apc/A = O if(A.emagged || A.malfhack) to_chat(user, "\red There is a software error with the device.") - else to_chat(user, "\blue The device's software appears to be fine.") - return 1 if(istype(O, /obj/machinery/door)) var/obj/machinery/door/D = O if(D.operating == -1) to_chat(user, "\red There is a software error with the device.") - else to_chat(user, "\blue The device's software appears to be fine.") - return 1 else if(istype(O, /obj/machinery)) var/obj/machinery/A = O if(A.emagged) to_chat(user, "\red There is a software error with the device.") - else to_chat(user, "\blue The device's software appears to be fine.") - return 1 \ No newline at end of file diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm index 9012d6b7d54..92613e6af3e 100644 --- a/code/game/objects/items/devices/flash.dm +++ b/code/game/objects/items/devices/flash.dm @@ -28,16 +28,13 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(battery_panel) to_chat(user, "You close the battery compartment on the [src].") - battery_panel = 0 else to_chat(user, "You open the battery compartment on the [src].") - battery_panel = 1 if(battery_panel && !overcharged) if(istype(W, /obj/item/weapon/stock_parts/cell)) to_chat(user, "You jam the cell into battery compartment on the [src].") - qdel(W) overcharged = 1 overlays += "overcharge" @@ -89,18 +86,14 @@ M.Stun(1) 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!") - if(M.weakeyes) M.Stun(2) M.visible_message("[M] gasps and shields their eyes!", "You gasp and shields your eyes!") else 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!") - else if(M.flash_eyes()) M.confused += power @@ -168,15 +161,12 @@ if(resisted) to_chat(user, "This mind seems resistant to the [src.name]!") - else to_chat(user, "They must be conscious before you can convert them!") - else to_chat(user, "This mind is so vacant that it is not susceptible to influence!") - /obj/item/device/flash/cyborg origin_tech = null diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 2d19d03113d..5ff8f7dff33 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -33,7 +33,6 @@ if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - return 0 on = !on update_brightness(user) @@ -49,13 +48,11 @@ if(!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") //don't have dexterity to_chat(user, "You don't have the dexterity to do this!") - return var/mob/living/carbon/human/H = M //mob has protective eyewear if(istype(M, /mob/living/carbon/human) && ((H.head && H.head.flags & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES))) to_chat(user, "You're going to need to remove that [(H.head && H.head.flags & HEADCOVERSEYES) ? "helmet" : (H.wear_mask && H.wear_mask.flags & MASKCOVERSEYES) ? "mask": "glasses"] first.") - return if(M == user) //they're using it on themselves @@ -73,14 +70,11 @@ if(istype(M, /mob/living/carbon/human)) //robots and aliens are unaffected if(M.stat == DEAD || M.sdisabilities & BLIND) //mob is dead or fully blind to_chat(user, "[M] pupils does not react to the light!") - else if(XRAY in M.mutations) //mob has X-RAY vision to_chat(user, "[M] pupils give an eerie glow!") - else //they're okay! if(M.flash_eyes(visual = 1)) to_chat(user, "[M]'s pupils narrow.") - else return ..() @@ -200,7 +194,6 @@ obj/item/device/flashlight/lamp/bananalamp // Usual checks if(!fuel) to_chat(user, "It's out of fuel.") - return if(on) return @@ -282,9 +275,7 @@ obj/item/device/flashlight/lamp/bananalamp var/mob/M = A add_logs(M, user, "attacked", object="EMP-light") to_chat(user, "\The [src] now has [emp_cur_charges] charge\s.") - A.emp_act(1) else to_chat(user, "\The [src] needs time to recharge!") - return \ No newline at end of file diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index a2e4822f915..48e477cc258 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -51,15 +51,12 @@ W.loc = src diode = W to_chat(user, "You install a [diode.name] in [src].") - else to_chat(user, "[src] already has a cell.") - else if(istype(W, /obj/item/weapon/screwdriver)) if(diode) to_chat(user, "You remove the [diode.name] from the [src].") - diode.loc = get_turf(src.loc) diode = null return @@ -76,11 +73,9 @@ return if (!diode) to_chat(user, "You point [src] at [target], but nothing happens!") - return if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return add_fingerprint(user) @@ -88,7 +83,6 @@ //nothing happens if the battery is drained if(recharge_locked) to_chat(user, "You point [src] at [target], but it's still charging.") - return var/outmsg @@ -122,7 +116,6 @@ S.flash_eyes(affect_silicon = 1) S.Weaken(rand(5,10)) to_chat(S, "Your sensors were overloaded by a laser!") - outmsg = "You overload [S] by shining [src] at their sensors." S.attack_log += text("\[[time_stamp()]\] Has had a laser pointer shone in their eyes by [user.name] ([user.ckey])") @@ -162,11 +155,9 @@ if(outmsg) to_chat(user, outmsg) - else to_chat(user, "You point [src] at [target].") - energy -= 1 if(energy <= max_energy) if(!recharging) @@ -174,7 +165,6 @@ processing_objects.Add(src) if(energy <= 0) to_chat(user, "You've overused the battery of [src], now it needs time to recharge!") - recharge_locked = 1 flick_overlay(I, showto, 10) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index a22b11a7030..9dec685efb8 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -70,7 +70,6 @@ if(..(user, 2)) to_chat(user, "It has [uses] lights remaining.") - /obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/stack/sheet/glass)) var/obj/item/stack/sheet/glass/G = W @@ -78,7 +77,6 @@ var/remaining = max(G.amount - decrement, 0) if(!remaining && !(G.amount - decrement) == 0) to_chat(user, "There isn't enough glass.") - return G.amount = remaining if(!G.amount) @@ -86,7 +84,6 @@ qdel(G) AddUses(increment) to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] lights remaining.") - return if(istype(W, /obj/item/weapon/light)) @@ -95,13 +92,11 @@ if(uses < max_uses) AddUses(1) to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.") - user.drop_item() qdel(L) return else to_chat(user, "You need a working light.") - return /obj/item/device/lightreplacer/emag_act(user as mob) @@ -115,12 +110,10 @@ if(R.emagged) src.Emag() to_chat(usr, "You shortcircuit the [src].") - return */ to_chat(usr, "It has [uses] lights remaining.") - /obj/item/device/lightreplacer/update_icon() icon_state = "lightreplacer[emagged]" @@ -148,7 +141,6 @@ if(!Use(U)) return to_chat(U, "You replace the [target.fitting] with the [src].") - if(target.status != LIGHT_EMPTY) var/obj/item/weapon/light/L1 = new target.light_type(target.loc) @@ -182,11 +174,9 @@ else to_chat(U, failmsg) - return else to_chat(U, "There is a working [target.fitting] already inserted.") - return /obj/item/device/lightreplacer/proc/Emag() diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index 532a620e17d..7028153dff2 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -15,26 +15,21 @@ if (user.client) if(user.client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot speak in IC (muted).") - return if(!ishuman(user)) to_chat(user, "\red You don't know how to use this!") - return if(user.silent) to_chat(user, "You find yourself unable to speak at all.") - return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H && H.mind) if(H.mind.miming) to_chat(user, "Your vow of silence prevents you from speaking.") - return if(spamcheck) to_chat(user, "\red \The [src] needs to recharge!") - return var/message = input(user, "Shout a message:", "Megaphone") as text|null @@ -51,7 +46,6 @@ insults-- else to_chat(user, "\red *BZZZZzzzzzt*") - else saymsg(user, message) @@ -68,6 +62,5 @@ /obj/item/device/megaphone/emag_act(user as mob) if(!emagged) to_chat(user, "\red You overload \the [src]'s voice synthesizer.") - emagged = 1 insults = rand(1, 3)//to prevent dickflooding diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index decb6a04243..7c1d4d6d7f2 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -23,7 +23,6 @@ if(!parts) to_chat(user, "This kit has no parts for this modification left.") - user.unEquip(src) qdel(src) return @@ -36,19 +35,16 @@ var/obj/item/clothing/I = O if (!istype(I) || !allowed) to_chat(user, "[src] is unable to modify that.") - return var/excluding = ("exclude" in I.species_restricted) var/in_list = (target_species in I.species_restricted) if (excluding ^ in_list) to_chat(user, "[I] is already modified.") - return if(!isturf(O.loc)) to_chat(user, "[O] must be safely placed on the ground for modification.") - return playsound(user.loc, 'sound/items/Screwdriver.ogg', 100, 1) @@ -70,7 +66,6 @@ ..(user) to_chat(user, "It looks as though it modifies hardsuits to fit [target_species] users.") - /obj/item/device/modkit/tajaran name = "Tajaran hardsuit modification kit" desc = "A kit containing all the needed tools and parts to modify a hardsuit for another user. This one looks like it's meant for Tajaran." diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index de8730df8c9..2dd138265e7 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -244,19 +244,16 @@ var/mob/M = usr if(!istype(M, /mob/living/carbon)) to_chat(usr, "You don't have any DNA, or your DNA is incompatible with this device.") - else var/datum/dna/dna = usr.dna pai.master = M.real_name pai.master_dna = dna.unique_enzymes to_chat(pai, "

You have been bound to a new master.

") - if(href_list["request"]) var/delta = (world.time / 10) - last_request if(request_cooldown > delta) var/cooldown_time = round(request_cooldown - ((world.time / 10) - last_request), 1) to_chat(usr, "\red The request system is currently offline. Please wait another [cooldown_time] seconds.") - return last_request = world.time / 10 src.looking_for_personality = 1 @@ -266,13 +263,9 @@ if(confirm == "Yes") for(var/mob/M in src) to_chat(M, "

You feel yourself slipping away from reality.

") - to_chat(M, "

Byte by byte you lose your sense of self.

") - to_chat(M, "

Your mental faculties leave you.

") - to_chat(M, "
oblivion...
") - var/mob/living/silicon/pai/P = M if(istype(P)) if(P.resting || P.canmove) @@ -291,11 +284,8 @@ if(newlaws) pai.pai_laws = newlaws to_chat(pai, "Your supplemental directives have been updated. Your new directives are:") - to_chat(pai, "Prime Directive:
[pai.pai_law0]") - to_chat(pai, "Supplemental Directives:
[pai.pai_laws]") - attack_self(usr) // WIRE_SIGNAL = 1 diff --git a/code/game/objects/items/devices/pipe_painter.dm b/code/game/objects/items/devices/pipe_painter.dm index efa5fb962a5..d663ead8906 100644 --- a/code/game/objects/items/devices/pipe_painter.dm +++ b/code/game/objects/items/devices/pipe_painter.dm @@ -21,7 +21,6 @@ var/turf/T = P.loc if (P.level < 2 && T.level==1 && isturf(T) && T.intact) to_chat(user, "You must remove the plating first.") - return P.change_color(pipe_colors[mode]) @@ -32,4 +31,3 @@ /obj/item/device/pipe_painter/examine(mob/user) ..(user) to_chat(user, "It is in [mode] mode.") - diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm index 02bb1fde61d..984c98730f4 100644 --- a/code/game/objects/items/devices/pizza_bomb.dm +++ b/code/game/objects/items/devices/pizza_bomb.dm @@ -14,7 +14,6 @@ /obj/item/device/pizza_bomb/attack_self(mob/user) if(disarmed) to_chat(user, "\The [src] is disarmed.") - return if(!timer_set) name = "pizza bomb" @@ -31,7 +30,6 @@ timer = Clamp(timer, 10, 100) icon_state = "pizzabox1" to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].") - message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at (JMP).") log_game("[key_name(usr)] has set the timer on a pizza bomb to [timer/10] seconds ([loc.x],[loc.y],[loc.z]).") armer = usr @@ -44,7 +42,6 @@ icon_state = "pizzabox_bomb" audible_message("\icon[src] *beep* *beep*") to_chat(user, "That's no pizza! That's a bomb!") - message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at (JMP).") log_game("[key_name(usr)] has triggered a pizza bomb armed by [armer] ([loc.x],[loc.y],[loc.z]).") primed = 1 @@ -63,7 +60,6 @@ /obj/item/device/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params) if(istype(I, /obj/item/weapon/wirecutters) && primed) to_chat(user, "Oh God, what wire do you cut?!") - var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained()) return @@ -73,7 +69,6 @@ if(chosen_wire == correct_wire) src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.") to_chat(user, "You did it!") - icon_state = "pizzabox_bomb_[correct_wire]" name = "pizza bomb" desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed." @@ -82,13 +77,11 @@ return else to_chat(user, "WRONG WIRE!") - go_boom() return if(istype(I, /obj/item/weapon/wirecutters) && disarmed) if(!in_range(user, src)) to_chat(user, "You can't see the box well enough to cut the wires out.") - return user.visible_message("[user] starts removing the payload and wires from \the [src].") if(do_after(user, 40, target = src)) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index e33fe869f42..8f6f60bd11b 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -37,7 +37,6 @@ attached = locate() in T if(!attached) to_chat(user, "No exposed cable here to attach to.") - return else anchored = 1 @@ -48,7 +47,6 @@ return else to_chat(user, "Device must be placed over an exposed cable to attach to it.") - return else if (mode == 2) diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm index 7b76061b020..af68ee8eeda 100644 --- a/code/game/objects/items/devices/radio/beacon.dm +++ b/code/game/objects/items/devices/radio/beacon.dm @@ -23,7 +23,6 @@ syndicate = 1 to_chat(user, "\blue The This beacon now only be locked on to by emagged teleporters!") - /obj/item/device/radio/beacon/hear_talk() return @@ -60,7 +59,6 @@ /obj/item/device/radio/beacon/syndicate/attack_self(mob/user as mob) if(user) to_chat(user, "\blue Locked In") - new /obj/machinery/power/singularity_beacon/syndicate( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -74,7 +72,6 @@ /obj/item/device/radio/beacon/syndicate/bomb/attack_self(mob/user as mob) if(user) to_chat(user, "\blue Locked In") - new /obj/machinery/syndicatebomb( user.loc ) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index cdb4531cefb..f0181104bbc 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -15,7 +15,6 @@ /obj/item/device/radio/electropack/attack_hand(mob/user as mob) if(src == user.back) to_chat(user, "You need help taking this off!") - return 0 . = ..() @@ -34,14 +33,12 @@ if(istype(W, /obj/item/clothing/head/helmet)) if(!b_stat) to_chat(user, "[src] is not ready to be attached!") - return var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user ) A.icon = 'icons/obj/assemblies.dmi' if(!user.unEquip(W)) to_chat(user, "\the [W] is stuck to your hand, you cannot attach it to \the [src]!") - return W.loc = A W.master = A @@ -90,7 +87,6 @@ if(M) M.moved_recently = 0 to_chat(M, "You feel a sharp shock!") - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, M) s.start() diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index bdc63d461c1..57e1e035aa8 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -43,10 +43,8 @@ return to_chat(user, "The following channels are available:") - to_chat(user, radio_desc) - /obj/item/device/radio/headset/handle_message_mode(mob/living/M as mob, message, channel) if (channel == "special") if (translate_binary) @@ -324,15 +322,12 @@ recalculateChannels() to_chat(user, "You pop out the encryption keys in the headset!") - else to_chat(user, "This headset doesn't have any encryption keys! How useless...") - if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot1 && keyslot2) to_chat(user, "The headset can't hold another key!") - return if(!keyslot1) diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index a6b09d8d8bc..fba22decc42 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -137,7 +137,6 @@ if(3) if(iswirecutter(W) && b_stat && wires.IsAllCut()) to_chat(user, "You cut out the intercoms wiring and disconnect its electronics.") - playsound(get_turf(src), 'sound/items/Wirecutter.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/stack/cable_coil(get_turf(src),5) @@ -157,7 +156,6 @@ b_stat = 0 buildstage = 3 to_chat(user, "You secure the electronics!") - update_icon() processing_objects.Add(src) for(var/i, i<= 5, i++) @@ -168,22 +166,18 @@ var/obj/item/stack/cable_coil/coil = W if(coil.amount < 5) to_chat(user, "You need more cable for this!") - return if(do_after(user, 10, target = src)) coil.use(5) to_chat(user, "You wire \the [src]!") - buildstage = 2 return 1 if(iscrowbar(W)) to_chat(user, "You begin removing the electronics...") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 10, target = src)) new /obj/item/weapon/intercom_electronics(get_turf(src)) to_chat(user, "The circuitboard pops out!") - buildstage = 0 return 1 if(0) @@ -192,7 +186,6 @@ if(do_after(user, 10, target = src)) qdel(W) to_chat(user, "You insert \the [W] into \the [src]!") - buildstage = 1 return 1 if(iswelder(W)) @@ -200,11 +193,9 @@ playsound(get_turf(src), 'sound/items/Welder.ogg', 50, 1) if(!WT.remove_fuel(3, user)) to_chat(user, "You're out of welding fuel.") - return 1 if(do_after(user, 10, target = src)) to_chat(user, "You cut the intercom frame from the wall!") - new /obj/item/mounted/frame/intercom(get_turf(src)) qdel(src) return 1 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 20e0bb8f496..d2fe7d2b319 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -239,7 +239,6 @@ var/global/list/default_medbay_channels = list( if(channel && channels && channels.len > 0) if (channel == "department") // to_chat(world, "DEBUG: channel=\"[channel]\" switching to \"[channels[1]]\"") - channel = channels[1] connection = secure_radio_connections[channel] else @@ -640,15 +639,12 @@ var/global/list/default_medbay_channels = list( recalculateChannels() to_chat(user, "You pop out the encryption key in the radio!") - else to_chat(user, "This radio doesn't have any encryption keys!") - if(istype(W, /obj/item/device/encryptionkey/)) if(keyslot) to_chat(user, "The radio can't hold another key!") - return if(!keyslot) @@ -702,11 +698,9 @@ var/global/list/default_medbay_channels = list( subspace_transmission = !subspace_transmission if(subspace_transmission) to_chat(usr, "Subspace Transmission is enabled.") - else to_chat(usr, "Subspace Transmission is disabled.") - if(subspace_transmission == 0)//Simple as fuck, clears the channel list to prevent talking/listening over them if subspace transmission is disabled channels = list() else @@ -719,11 +713,9 @@ var/global/list/default_medbay_channels = list( if(shut_up) canhear_range = 0 to_chat(usr, "Loudspeaker disabled.") - else canhear_range = 3 to_chat(usr, "Loudspeaker enabled.") - . = 1 diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index ebd2ebf489c..7138a4515be 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -129,7 +129,6 @@ REAGENT SCANNER /obj/item/device/healthanalyzer/attack(mob/living/M as mob, mob/living/user as mob) if (( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) to_chat(user, text("\red You try to analyze the floor's vitals!")) - for(var/mob/O in viewers(M, null)) O.show_message(text("\red [user] has analyzed the floor's vitals!"), 1) user.show_message(text("\blue Analyzing Results for The floor:\n\t Overall Status: Healthy"), 1) @@ -191,7 +190,6 @@ REAGENT SCANNER for(var/datum/disease/D in M.viruses) 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]") - if(M.getStaminaLoss()) user.show_message("Subject appears to be suffering from fatigue.") if (M.getCloneLoss()) @@ -260,19 +258,15 @@ REAGENT SCANNER switch (mode) if(1) to_chat(usr, "The scanner now shows specific limb damage.") - if(0) to_chat(usr, "The scanner no longer shows limb damage.") - /obj/item/device/healthanalyzer/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/healthupgrade)) if(upgraded) to_chat(user, "You have already installed an upgraded in the [src].") - else to_chat(user, "You install the upgrade in the [src].") - overlays += "advanced" playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) upgraded = 1 @@ -391,11 +385,9 @@ REAGENT SCANNER return if (crit_fail) to_chat(user, "This device has critically failed and is no longer functional!") - return if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return if(reagents.total_volume) var/list/blood_traces = list() @@ -403,7 +395,6 @@ REAGENT SCANNER if(R.id != "blood") reagents.clear_reagents() to_chat(user, "The sample was contaminated! Please insert another sample.") - return else blood_traces = params2list(R.data["trace_chem"]) @@ -424,7 +415,6 @@ REAGENT SCANNER else recent_fail = 1 to_chat(user, "[dat]") - reagents.clear_reagents() return @@ -455,13 +445,11 @@ REAGENT SCANNER return if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return if(!istype(O)) return if (crit_fail) to_chat(user, "This device has critically failed and is no longer functional!") - return if(!isnull(O.reagents)) @@ -480,14 +468,11 @@ REAGENT SCANNER recent_fail = 1 if(dat) to_chat(user, "Chemicals found: [dat]") - else to_chat(user, "No active chemical agents found in [O].") - else to_chat(user, "No significant chemical agents found in [O].") - return /obj/item/device/reagent_scanner/adv diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 7201d15fed6..ef79d5c2a35 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -25,20 +25,17 @@ to_chat(user, "The wire panel is [open_panel ? "opened" : "closed"].") - /obj/item/device/taperecorder/attackby(obj/item/I, mob/user) if(!mytape && istype(I, /obj/item/device/tape)) user.drop_item() I.loc = src mytape = I to_chat(user, "You insert [I] into [src].") - update_icon() /obj/item/device/taperecorder/proc/eject(mob/user) if(mytape) to_chat(user, "You remove [mytape] from [src].") - stop() user.put_in_hands(mytape) mytape = null @@ -117,7 +114,6 @@ if(mytape.used_capacity < mytape.max_capacity) to_chat(usr, "Recording started.") - recording = 1 update_icon() mytape.timestamp += mytape.used_capacity @@ -136,7 +132,6 @@ to_chat(usr, "The tape is full.") - /obj/item/device/taperecorder/verb/stop() set name = "Stop" set category = "Object" @@ -149,7 +144,6 @@ mytape.timestamp += mytape.used_capacity mytape.storedinfo += "\[[time2text(mytape.used_capacity * 10,"mm:ss")]\] Recording stopped." to_chat(usr, "Recording stopped.") - return else if(playing) playing = 0 @@ -174,7 +168,6 @@ playing = 1 update_icon() to_chat(usr, "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)) @@ -223,13 +216,11 @@ return if(!canprint) to_chat(usr, "The recorder can't print that fast!") - return if(recording || playing) return to_chat(usr, "Transcript printed.") - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) var/t1 = "Transcript:

" @@ -267,7 +258,6 @@ /obj/item/device/tape/attack_self(mob/user) if(!ruined) to_chat(user, "You pull out all the tape!") - ruin() @@ -284,10 +274,8 @@ /obj/item/device/tape/attackby(obj/item/I, mob/user) if(ruined && istype(I, /obj/item/weapon/screwdriver)) to_chat(user, "You start winding the tape back in.") - if(do_after(user, 120, target = src)) to_chat(user, "You wound the tape back in!") - fix() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index 3e030548851..2a1bc41970b 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -34,7 +34,6 @@ effective or pretty fucking useless. if(!user) return if(times_used >= max_uses) to_chat(user, "\red The mind batterer has been burnt out!") - return user.attack_log += text("\[[time_stamp()]\] Used [src] to knock down people in the area.") @@ -47,7 +46,6 @@ effective or pretty fucking useless. if(prob(25)) M.Stun(rand(5,10)) to_chat(M, "\red You feel a tremendous, paralyzing wave flood your mind.") - if(!iscarbon(user)) M.LAssailant = null else @@ -55,10 +53,8 @@ effective or pretty fucking useless. else to_chat(M, "\red You feel a sudden, electric jolt travel through your head.") - playsound(src.loc, 'sound/misc/interference.ogg', 50, 1) to_chat(user, "\blue You trigger [src].") - times_used += 1 if(times_used >= max_uses) icon_state = "battererburnt" @@ -109,7 +105,6 @@ effective or pretty fucking useless. else to_chat(user, "The radioactive microlaser is still recharging.") - /obj/item/device/rad_laser/proc/handle_cooldown(cooldown) spawn(cooldown) used = 0 diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index fdeedd2c6a9..9e4d83592b0 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -19,7 +19,6 @@ if(istype(item, /obj/item/weapon/tank)) if(tank_one && tank_two) to_chat(user, "There are already two tanks attached, remove one first.") - return if(!tank_one) @@ -27,14 +26,12 @@ user.drop_item() item.loc = src to_chat(user, "You attach the tank to the transfer valve.") - else if(!tank_two) tank_two = item user.drop_item() item.loc = src to_chat(user, "You attach the tank to the transfer valve.") - update_icon() nanomanager.update_uis(src) // update all UIs attached to src //TODO: Have this take an assemblyholder @@ -42,17 +39,14 @@ var/obj/item/device/assembly/A = item if(A.secured) to_chat(user, "The device is secured.") - return if(attached_device) to_chat(user, "There is already a device attached to the valve, remove it first.") - return user.remove_from_mob(item) attached_device = A A.loc = src to_chat(user, "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). diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index a217f548479..bd747555cc6 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -292,11 +292,9 @@ var/list/world_uplinks = list() hidden_uplink.uses += S.TC_cost qdel(S) to_chat(user, "Teleporter refunded.") - else to_chat(user, "This teleporter is already used, or is currently being used.") - // PRESET UPLINKS // A collection of preset uplinks. // diff --git a/code/game/objects/items/devices/whistle.dm b/code/game/objects/items/devices/whistle.dm index d2c20c7c87d..28b6b774705 100644 --- a/code/game/objects/items/devices/whistle.dm +++ b/code/game/objects/items/devices/whistle.dm @@ -27,6 +27,5 @@ /obj/item/device/hailer/emag_act(user as mob) if(!emagged) to_chat(user, "\red You overload \the [src]'s voice synthesizer.") - emagged = 1 diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm index 72ec29c7422..fb543df2b8e 100644 --- a/code/game/objects/items/mountable_frames/apc_frame.dm +++ b/code/game/objects/items/mountable_frames/apc_frame.dm @@ -11,18 +11,15 @@ var/area/area_loc = turf_loc.loc if (area_loc.get_apc()) to_chat(user, "This area already has an APC.") - return //only one APC per area for(var/obj/machinery/power/terminal/T in turf_loc) if (T.master) to_chat(user, "There is another network terminal here.") - return else var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(turf_loc) C.amount = 10 to_chat(user, "You cut the cables and disassemble the unused power terminal.") - qdel(T) return 1 return diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm index 810174d2a3f..ff8c1b8b593 100644 --- a/code/game/objects/items/mountable_frames/frames.dm +++ b/code/game/objects/items/mountable_frames/frames.dm @@ -18,12 +18,10 @@ if (src.mount_reqs.Find("simfloor") && !istype(turf_loc, /turf/simulated/floor)) to_chat(user, "[src] cannot be placed on this spot.") - return if (src.mount_reqs.Find("nospace")) var/area/my_area = turf_loc.loc if(!istype(my_area) || (my_area.requires_power == 0 || istype(my_area,/area/space))) to_chat(user, "[src] cannot be placed in this area.") - return return 1 diff --git a/code/game/objects/items/mountable_frames/lights.dm b/code/game/objects/items/mountable_frames/lights.dm index 50f81cfe74c..b12c22186e2 100644 --- a/code/game/objects/items/mountable_frames/lights.dm +++ b/code/game/objects/items/mountable_frames/lights.dm @@ -8,7 +8,6 @@ /obj/item/mounted/frame/light_fixture/do_build(turf/on_wall, mob/user) to_chat(user, "You begin attaching [src] to \the [on_wall].") - playsound(get_turf(src), 'sound/machines/click.ogg', 75, 1) var/constrdir = user.dir var/constrloc = get_turf(user) diff --git a/code/game/objects/items/mountable_frames/mountables.dm b/code/game/objects/items/mountable_frames/mountables.dm index e0df3a03e2f..5e9811ee3d4 100644 --- a/code/game/objects/items/mountable_frames/mountables.dm +++ b/code/game/objects/items/mountable_frames/mountables.dm @@ -22,12 +22,10 @@ return if (!( get_dir(on_wall,user) in cardinal)) to_chat(user, "You need to be standing next to a wall to place \the [src].") - return if(gotwallitem(get_turf(user), get_dir(on_wall,user))) to_chat(user, "There's already an item on this wall!") - return return 1 diff --git a/code/game/objects/items/mountable_frames/newscaster_frame.dm b/code/game/objects/items/mountable_frames/newscaster_frame.dm index c80bd74061e..7e06805c3dc 100644 --- a/code/game/objects/items/mountable_frames/newscaster_frame.dm +++ b/code/game/objects/items/mountable_frames/newscaster_frame.dm @@ -12,16 +12,13 @@ var/area/A = loc.loc if (!istype(loc, /turf/simulated/floor)) to_chat(usr, "Newscaster cannot be placed on this spot.") - return if (A.requires_power == 0 || A.name == "Space") to_chat(usr, "Newscaster cannot be placed in this area.") - return for(var/obj/machinery/newscaster/T in loc) to_chat(usr, "There is another newscaster here.") - return return 1 diff --git a/code/game/objects/items/policetape.dm b/code/game/objects/items/policetape.dm index 1c3aba92054..bd222c52dbb 100644 --- a/code/game/objects/items/policetape.dm +++ b/code/game/objects/items/policetape.dm @@ -67,14 +67,12 @@ var/list/tape_roll_applications = list() if(icon_state == "[icon_base]_start") start = get_turf(src) to_chat(usr, "\blue You place the first end of the [src].") - icon_state = "[icon_base]_stop" else icon_state = "[icon_base]_start" end = get_turf(src) if(start.y != end.y && start.x != end.x || start.z != end.z) to_chat(usr, "\blue [src] can only be laid horizontally or vertically.") - return var/turf/cur = start @@ -104,7 +102,6 @@ var/list/tape_roll_applications = list() cur = get_step_towards(cur,end) if (!can_place) to_chat(usr, "\blue You can't run \the [src] through that!") - return cur = start @@ -121,7 +118,6 @@ var/list/tape_roll_applications = list() to_chat(usr, "\blue You finish placing the [src].")//Git Test - /obj/item/taperoll/afterattack(var/atom/A, mob/user as mob, proximity) if (!proximity) return @@ -134,7 +130,6 @@ var/list/tape_roll_applications = list() P.layer = 3.2 to_chat(user, "\blue You finish placing the [src].") - if (istype(A, /turf/simulated/floor) ||istype(A, /turf/unsimulated/floor)) var/turf/F = A var/direction = user.loc == F ? user.dir : turn(user.dir, 180) @@ -184,7 +179,6 @@ var/list/tape_roll_applications = list() /obj/item/tape/proc/breaktape(obj/item/weapon/W as obj, mob/user as mob) if(user.a_intent == I_HELP && ((!can_puncture(W) && src.allowed(user)))) to_chat(user, "You can't break the [src] with that!") - return user.show_viewers("\blue [user] breaks the [src]!") diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index f6687f599f5..c4a15f728ee 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -119,7 +119,6 @@ var/obj/item/weapon/ed209_assembly/B = new /obj/item/weapon/ed209_assembly B.loc = get_turf(src) to_chat(user, "You armed the robot frame") - W:use(1) if (user.get_inactive_hand()==src) user.unEquip(src) @@ -162,11 +161,9 @@ src.updateicon() else if(!W:wires) to_chat(user, "\blue You need to attach wires to it first!") - else to_chat(user, "\blue You need to attach a cell to it first!") - if(istype(W, /obj/item/robot_parts/head)) if(src.head) return if(W:flash2 && W:flash1) @@ -177,24 +174,20 @@ else to_chat(user, "\blue You need to attach a flash to it first!") - if (istype(W, /obj/item/device/multitool)) if(check_completion()) Interact(user) else to_chat(user, "The endoskeleton must be assembled before debugging can begin!") - if(istype(W, /obj/item/device/mmi)) var/obj/item/device/mmi/M = W if(check_completion()) if(!istype(loc,/turf)) to_chat(user, "\red You can't put \the [W] in, the frame has to be standing on the ground to be perfectly precise.") - return if(!M.brainmob) to_chat(user, "\red Sticking an empty [W] into the frame would sort of defeat the purpose.") - return if(!M.brainmob.key) @@ -210,22 +203,18 @@ break if(!ghost_can_reenter) to_chat(user, "\The [W] is completely unresponsive; there's no point.") - return if(M.brainmob.stat == DEAD) to_chat(user, "\red Sticking a dead [W] into the frame would sort of defeat the purpose.") - return if(M.brainmob.mind in ticker.mode.head_revolutionaries) to_chat(user, "\red The frame's firmware lets out a shrill sound, and flashes 'Abnormal Memory Engram'. It refuses to accept the [W].") - return if(jobban_isbanned(M.brainmob, "Cyborg") || jobban_isbanned(M.brainmob,"nonhumandept")) to_chat(user, "\red This [W] does not seem to fit.") - return var/mob/living/silicon/robot/O = new /mob/living/silicon/robot(get_turf(loc), unfinished = 1) @@ -265,10 +254,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.") - O.job = "Cyborg" O.cell = chest.cell @@ -293,14 +280,11 @@ O.update_canmove() to_chat(O, "Error: Servo motors unresponsive.") - else to_chat(user, "The MMI must go in after everything else!") - if(istype(W,/obj/item/weapon/pen)) to_chat(user, "You need to use a multitool to name [src]!") - return /obj/item/robot_parts/robot_suit/proc/Interact(mob/user) @@ -323,7 +307,6 @@ var/obj/item/item_in_hand = living_user.get_active_hand() if(!istype(item_in_hand, /obj/item/device/multitool)) to_chat(living_user, "You need a multitool!") - return if(href_list["Name"]) @@ -340,7 +323,6 @@ if(!forced_ai) to_chat(usr, "No active AIs detected.") - else if(href_list["Law"]) lawsync = !lawsync else if(href_list["AI"]) @@ -359,25 +341,21 @@ if(istype(W, /obj/item/weapon/stock_parts/cell)) if(src.cell) to_chat(user, "\blue You have already inserted a cell!") - return else user.drop_item() W.loc = src src.cell = W to_chat(user, "\blue You insert the cell!") - if(istype(W, /obj/item/stack/cable_coil)) if(src.wires) to_chat(user, "\blue You have already inserted wire!") - return else var/obj/item/stack/cable_coil/coil = W coil.use(1) src.wires = 1.0 to_chat(user, "\blue You insert the wire!") - return /obj/item/robot_parts/head/attackby(obj/item/W as obj, mob/user as mob, params) @@ -385,27 +363,22 @@ if(istype(W, /obj/item/device/flash)) if(istype(user,/mob/living/silicon/robot)) to_chat(user, "\red How do you propose to do that?") - return else if(src.flash1 && src.flash2) to_chat(user, "\blue You have already inserted the eyes!") - return else if(src.flash1) user.drop_item() W.loc = src src.flash2 = W to_chat(user, "\blue You insert the flash into the eye socket!") - else user.drop_item() W.loc = src src.flash1 = W to_chat(user, "\blue You insert the flash into the eye socket!") - else if(istype(W, /obj/item/weapon/stock_parts/manipulator)) to_chat(user, "\blue You install some manipulators and modify the head, creating a functional spider-bot!") - new /mob/living/simple_animal/spiderbot(get_turf(loc)) user.drop_item() qdel(W) @@ -417,10 +390,8 @@ if(istype(W,/obj/item/weapon/card/emag)) if(sabotaged) to_chat(user, "\red [src] is already sabotaged!") - else to_chat(user, "\red You slide [W] into the dataport on [src] and short out the safeties.") - sabotaged = 1 return ..() diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a86bd3c5e65..bfb90de8cac 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -13,7 +13,6 @@ /obj/item/borg/upgrade/proc/action(var/mob/living/silicon/robot/R) if(R.stat == DEAD) to_chat(usr, "\red The [src] will not function on a deceased robot.") - return 1 return 0 @@ -72,7 +71,6 @@ /obj/item/borg/upgrade/restart/action(var/mob/living/silicon/robot/R) if(R.health < 0) to_chat(usr, "You have to repair the robot before using this module!") - return 0 if(!R.key) @@ -115,9 +113,7 @@ if(!istype(R.module, /obj/item/weapon/robot_module/security)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(usr, "There's no mounting point for the module!") - return 0 var/obj/item/weapon/gun/energy/disabler/cyborg/T = locate() in R.module @@ -127,14 +123,11 @@ T = locate() in R.module.modules if(!T) to_chat(usr, "This robot has had its disabler removed!") - return 0 if(T.recharge_time <= 2) to_chat(R, "Maximum cooling achieved for this hardpoint!") - to_chat(usr, "There's no room for another cooling unit!") - return 0 else @@ -153,9 +146,7 @@ if(!istype(R.module, /obj/item/weapon/robot_module/miner)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(usr, "There's no mounting point for the module!") - return 0 else R.module.modules += new/obj/item/weapon/tank/jetpack/carbondioxide @@ -176,9 +167,7 @@ if(!istype(R.module, /obj/item/weapon/robot_module/miner)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(usr, "There's no mounting point for the module!") - return 0 else for(var/obj/item/weapon/pickaxe/drill/cyborg/D in R.module.modules) @@ -202,9 +191,7 @@ if(!istype(R.module, /obj/item/weapon/robot_module/miner)) to_chat(R, "Upgrade mounting error! No suitable hardpoint detected!") - to_chat(usr, "There's no mounting point for the module!") - return 0 else for(var/obj/item/weapon/storage/bag/ore/cyborg/S in R.module.modules) diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm index 9f786c14bb0..c71f2e14182 100644 --- a/code/game/objects/items/shooting_range.dm +++ b/code/game/objects/items/shooting_range.dm @@ -38,7 +38,6 @@ if(WT.remove_fuel(0, user)) overlays.Cut() to_chat(usr, "You slice off [src]'s uneven chunks of aluminum and scorch marks.") - return @@ -61,12 +60,10 @@ if(!user.get_active_hand()) user.put_in_hands(src) to_chat(user, "You take the target out of the stake.") - else src.loc = get_turf(user) to_chat(user, "You take the target out of the stake.") - stake.pinned_target = null return @@ -100,7 +97,6 @@ for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) to_chat(O, "\red [src] breaks into tiny pieces and collapses!") - qdel(src) // Create a temporary object to represent the damage diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 260bcfef617..921be6a7083 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -13,12 +13,10 @@ /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob) if (!istype(M)) to_chat(user, "\The [src] cannot be applied to [M]!") - return 1 if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 1 @@ -32,12 +30,10 @@ if(!affecting) to_chat(user, "That limb is missing!") - return 1 if(affecting.status & ORGAN_ROBOT) to_chat(user, "This can't be used on a robotic limb.") - return 1 @@ -68,7 +64,6 @@ if(affecting.open == 0) if(!affecting.bandage()) to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been bandaged.") - return 1 else for (var/datum/wound/W in affecting.wounds) @@ -110,7 +105,6 @@ if(affecting.open == 0) if(!affecting.salve()) to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") - return 1 else user.visible_message( "\blue [user] salves the wounds on [M]'s [affecting.name].", \ @@ -120,7 +114,6 @@ else to_chat(user, "The [affecting.name] is cut open, you'll need more than some ointment!") - /obj/item/stack/medical/bruise_pack/comfrey name = "\improper Comfrey leaf" singular_name = "Comfrey leaf" @@ -161,7 +154,6 @@ if(!(bandaged || disinfected)) to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been treated.") - return 1 else for (var/datum/wound/W in affecting.wounds) @@ -183,7 +175,6 @@ else to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") - /obj/item/stack/medical/advanced/ointment name = "advanced burn kit" singular_name = "advanced burn kit" @@ -204,7 +195,6 @@ if(affecting.open == 0) if(!affecting.salve()) to_chat(user, "\red The wounds on [M]'s [affecting.name] have already been salved.") - return 1 else user.visible_message( "\blue [user] covers the wounds on [M]'s [affecting.name] with regenerative membrane.", \ @@ -214,7 +204,6 @@ else to_chat(user, "The [affecting.name] is cut open, you'll need more than a bandage!") - /obj/item/stack/medical/splint name = "medical splints" singular_name = "medical splint" @@ -236,22 +225,18 @@ var/limb = affecting.name if(!(affecting.limb_name in list("l_arm", "r_arm", "l_hand", "r_hand", "l_leg", "r_leg", "l_foot", "r_foot"))) to_chat(user, "\red You can't apply a splint there!") - return if(affecting.status & ORGAN_SPLINTED) to_chat(user, "\red [M]'s [limb] is already splinted!") - if(alert(user, "Would you like to remove the splint from [M]'s [limb]?", "Removing.", "Yes", "No") == "Yes") affecting.status &= ~ORGAN_SPLINTED to_chat(user, "You remove the splint from [M]'s [limb].") - return if (M != user) user.visible_message("\red [user] starts to apply \the [src] to [M]'s [limb].", "\red You start to apply \the [src] to [M]'s [limb].", "\red You hear something being wrapped.") else if((!user.hand && affecting.limb_name in list("r_arm", "r_hand")) || (user.hand && affecting.limb_name in list("l_arm", "l_hand"))) to_chat(user, "\red You can't apply a splint to the arm you're using!") - return user.visible_message("\red [user] starts to apply \the [src] to their [limb].", "\red You start to apply \the [src] to your [limb].", "\red You hear something being wrapped.") if(do_after(user, 50, target = M)) diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index f5314b46f62..53ff2836885 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -23,7 +23,6 @@ else to_chat(user, "All [R]'s systems are nominal.") - if (istype(M,/mob/living/carbon/human)) //Repairing robolimbs var/mob/living/carbon/human/H = M var/obj/item/organ/external/S = H.get_organ(user.zone_sel.selecting) @@ -37,7 +36,5 @@ "You apply some nanite paste at [user == M ? "your" : "[M]'s"] [S.name].") else to_chat(user, "Nothing to fix here.") - else to_chat(user, "[src] won't work on that.") - diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 0c07222657f..e41457f0c38 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -36,7 +36,6 @@ if(get_amount() < 2) to_chat(user, "You need at least two rods to do this.") - return if(WT.remove_fuel(0,user)) @@ -78,17 +77,14 @@ else if(amount < 2) to_chat(user, "\blue You need at least two rods to do this.") - return to_chat(usr, "\blue Assembling grille...") - if (!do_after(usr, 10, target = src)) return var /obj/structure/grille/F = new /obj/structure/grille/ ( usr.loc ) to_chat(usr, "\blue You assemble a grille") - F.add_fingerprint(usr) use(2) return diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 9d84814f0d2..bf3196b5581 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -35,11 +35,9 @@ var/obj/item/stack/cable_coil/CC = W if(CC.amount < 5) to_chat(user, "\b There is not enough wire in this coil. You need 5 lengths.") - return CC.use(5) to_chat(user, "You attach wire to the [name].") - new /obj/item/stack/light_w(user.loc) src.use(1) else if( istype(W, /obj/item/stack/rods) ) @@ -62,7 +60,6 @@ if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 0 var/title = "Sheet-Glass" title += " ([src.amount] sheet\s left)" @@ -77,12 +74,10 @@ i++ if(i >= 4) to_chat(user, "There are too many windows in this location.") - return 1 directions-=win.dir if(win.is_fulltile()) to_chat(user, "Can't let you do that.") - return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -109,11 +104,9 @@ if(src.loc != user) return 1 if(src.amount < 2) to_chat(user, "You need more glass to do that.") - return 1 if(locate(/obj/structure/window/full) in user.loc) to_chat(user, "There is a full window in the way.") - return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -131,7 +124,6 @@ if(src.loc != user) return 1 if(src.amount < 3) to_chat(user, "You need more glass to do that.") - return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/tank(user.loc, 0) F.air_update_turf(1) @@ -141,7 +133,6 @@ if(src.loc != user) return 1 if(src.amount < 4) to_chat(user, "You need more glass to do that.") - return 1 var/obj/machinery/fishtank/F = new /obj/machinery/fishtank/wall(user.loc, 0) F.air_update_turf(1) @@ -173,7 +164,6 @@ if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 0 var/title = "Sheet Reinf. Glass" title += " ([src.amount] sheet\s left)" @@ -187,12 +177,10 @@ i++ if(i >= 4) to_chat(user, "There are too many windows in this location.") - return 1 directions-=win.dir if(win.is_fulltile()) to_chat(user, "Can't let you do that.") - return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. @@ -219,11 +207,9 @@ if(src.loc != user) return 1 if(src.amount < 2) to_chat(user, "You need more glass to do that.") - return 1 if(locate(/obj/structure/window/full) in user.loc) to_chat(user, "There is a window in the way.") - return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -235,17 +221,14 @@ if(isturf(user.loc) && locate(/obj/structure/windoor_assembly/, user.loc)) to_chat(user, "There is already a windoor assembly in that location.") - return 1 if(isturf(user.loc) && locate(/obj/machinery/door/window/, user.loc)) to_chat(user, "There is already a windoor in that location.") - return 1 if(src.amount < 5) to_chat(user, "You need more glass to do that.") - return 1 var/obj/structure/windoor_assembly/WD @@ -309,7 +292,6 @@ if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) to_chat(user, " You don't have the dexterity to do this!") - return 0 var/title = "Plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -323,12 +305,10 @@ i++ if(i >= 4) to_chat(user, "There are too many windows in this location.") - return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) to_chat(user, "Can't let you do that.") - return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -352,11 +332,9 @@ if(src.loc != user) return 1 if(src.amount < 2) to_chat(user, "You need more glass to do that.") - return 1 if(locate(/obj/structure/window) in user.loc) to_chat(user, "There is a window in the way.") - return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 @@ -386,7 +364,6 @@ if(!istype(user.loc,/turf)) return 0 if(!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return 0 var/title = "Reinforced plasma-glass alloy" title += " ([src.amount] sheet\s left)" @@ -400,12 +377,10 @@ i++ if(i >= 4) to_chat(user, "There are too many windows in this location.") - return 1 directions-=win.dir if(!(win.ini_dir in cardinal)) to_chat(user, "Can't let you do that.") - return 1 //Determine the direction. It will first check in the direction the person making the window is facing, if it finds an already made window it will try looking at the next cardinal direction, etc. var/dir_to_set = 2 @@ -429,11 +404,9 @@ if(src.loc != user) return 1 if(src.amount < 2) to_chat(user, "You need more glass to do that.") - return 1 if(locate(/obj/structure/window) in user.loc) to_chat(user, "There is a window in the way.") - return 1 var/obj/structure/window/W = new full_window( user.loc, 0 ) W.state = 0 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 7e8d7e174f2..4678d18a2f3 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -115,7 +115,6 @@ var/global/list/datum/stack_recipe/human_recipes = list( \ usr.visible_message("\blue \the [usr] starts cutting hair off \the [src]", "\blue You start cutting the hair off \the [src]", "You hear the sound of a knife rubbing against flesh") if(do_after(user,50, target = src)) to_chat(usr, "\blue You cut the hair from this [src.singular_name]") - //Try locating an exisitng stack on the tile and add to there if possible for(var/obj/item/stack/sheet/hairlesshide/HS in usr.loc) if(HS.amount < 50) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index c772ba54489..41c2946a0c1 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -31,7 +31,6 @@ to_chat(user, "There are [src.amount] [src.singular_name]\s in the stack.") - /obj/item/stack/attack_self(mob/user as mob) list_recipes(user) @@ -120,22 +119,17 @@ if (src.amount < R.req_amount*multiplier) if (R.req_amount*multiplier>1) to_chat(usr, "\red You haven't got enough [src] to build \the [R.req_amount*multiplier] [R.title]\s!") - else to_chat(usr, "\red You haven't got enough [src] to build \the [R.title]!") - return if (R.one_per_turf && (locate(R.result_type) in usr.loc)) to_chat(usr, "\red There is another [R.title] here!") - return if (R.on_floor && !istype(usr.loc, /turf/simulated)) to_chat(usr, "\red \The [R.title] must be constructed on the floor!") - return if (R.time) to_chat(usr, "\blue Building [R.title] ...") - if (!do_after(usr, R.time, target = src)) return if (src.amount < R.req_amount*multiplier) @@ -190,7 +184,6 @@ continue oldsrc.attackby(item, usr) to_chat(usr, "You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s.") - if(oldsrc.amount <= 0) break oldsrc.update_icon() diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 31c5dd26215..0c6c3d42cf3 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -18,7 +18,6 @@ use(1) to_chat(user, "You press the [src] onto yourself and charge your hidden uplink.") - /obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity) if(!proximity) return @@ -27,4 +26,3 @@ I.hidden_uplink.uses +=1 use(1) to_chat(user, "You slot the [src] into the [I] and charge its internal uplink.") - diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 015c2abbd3c..8911a3e60f6 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -52,7 +52,6 @@ if (istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) A.reagents.trans_to(src, 10) to_chat(user, "You fill the balloon with the contents of [A].") - desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -61,7 +60,6 @@ if(reagents.total_volume < 10) reagents.add_reagent("water", min(10-reagents.total_volume, 10)) to_chat(user, "You fill the balloon from the [source].") - desc = "A translucent balloon with some form of liquid sloshing around in it." update_icon() return @@ -71,17 +69,14 @@ if(O.reagents) if(O.reagents.total_volume < 1) to_chat(user, "The [O] is empty.") - else if(O.reagents.total_volume >= 1) if(O.reagents.has_reagent("facid", 1)) to_chat(user, "The acid chews through the balloon!") - O.reagents.reaction(user) qdel(src) 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 [O].") - O.reagents.trans_to(src, 10) update_icon() return @@ -159,7 +154,6 @@ if (bullets) to_chat(user, "It is loaded with [bullets] foam darts!") - /obj/item/toy/crossbow/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/toy/ammo/crossbow)) if(bullets <= 4) @@ -167,12 +161,10 @@ qdel(I) bullets++ to_chat(user, "You load the foam dart into the crossbow.") - else to_chat(usr, "It's already fully loaded.") - /obj/item/toy/crossbow/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if(!isturf(target.loc) || target == user) return if(flag) return @@ -273,11 +265,9 @@ qdel(I) bullets++ to_chat(user, "You load the foam dart into the tommy gun.") - else to_chat(user, "It's already fully loaded.") - /* * Toy swords */ @@ -296,14 +286,12 @@ active = !(active) if (active) to_chat(user, "You extend the plastic blade with a quick flick of your wrist.") - playsound(user, 'sound/weapons/saberon.ogg', 50, 1) icon_state = "swordblue" item_state = "swordblue" w_class = 4 else to_chat(user, "You push the plastic blade back down into the handle.") - playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) icon_state = "sword0" item_state = "sword0" @@ -322,15 +310,12 @@ if(istype(W, /obj/item/toy/sword)) if(W == src) to_chat(user, "You try to attach the end of the plastic sword to... itself. You're not very smart, are you?") - if(ishuman(user)) user.adjustBrainLoss(10) else if((W.flags & NODROP) || (flags & NODROP)) to_chat(user, "\the [flags & NODROP ? src : W] is stuck to your hand, you can't attach it to \the [flags & NODROP ? W : src]!") - else to_chat(user, "You attach the ends of the two plastic swords, making a single double-bladed toy! You're fake-cool.") - new /obj/item/weapon/twohanded/dualsaber/toy(user.loc) user.unEquip(W) user.unEquip(src) @@ -428,7 +413,6 @@ if(M.m_intent == "run") to_chat(M, "You step on the snap pop!") - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(2, 0, src) s.start() @@ -451,7 +435,6 @@ /obj/item/toy/prize/attack_self(mob/user as mob) if(cooldown < world.time - 8) to_chat(user, "You play with [src].") - playsound(user, 'sound/mecha/mechstep.ogg', 20, 1) cooldown = world.time @@ -459,7 +442,6 @@ if(loc == user) if(cooldown < world.time - 8) to_chat(user, "You play with [src].") - playsound(user, 'sound/mecha/mechturn.ogg', 20, 1) cooldown = world.time return @@ -608,7 +590,6 @@ obj/item/toy/cards/deck/attack_hand(mob/user as mob) if(cards.len == 0) icon_state = "deck_[deckstyle]_empty" to_chat(user, "There are no more cards to draw.") - return var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc) choice = cards[1] @@ -640,14 +621,12 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/singlecard/C, mob/living/use if(C.parentdeck == src) if(!user.unEquip(C)) to_chat(user, "The card is stuck to your hand, you can't add it to the deck!") - return cards += C.cardname user.visible_message("[user] adds a card to the bottom of the deck.","You add the card to the bottom of the deck.") qdel(C) else to_chat(user, "You can't mix cards from other decks.") - if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -662,14 +641,12 @@ obj/item/toy/cards/deck/attackby(obj/item/toy/cards/cardhand/C, mob/living/user, if(C.parentdeck == src) if(!user.unEquip(C)) to_chat(user, "The hand of cards is stuck to your hand, you can't add it to the deck!") - return cards += C.currenthand user.visible_message("[user] puts their hand of cards in the deck.", "You put the hand of cards in the deck.") qdel(C) else to_chat(user, "You can't mix cards from other decks.") - if(cards.len > 26) icon_state = "deck_[deckstyle]_full" else if(cards.len > 10) @@ -686,7 +663,6 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) M.put_in_hands(src) to_chat(usr, "You pick up the deck.") - else if(istype(over_object, /obj/screen)) switch(over_object.name) if("l_hand") @@ -698,13 +674,11 @@ obj/item/toy/cards/deck/MouseDrop(atom/over_object) M.unEquip(src) M.put_in_r_hand(src) to_chat(usr, "You pick up the deck.") - else to_chat(usr, "You can't reach it from here.") - obj/item/toy/cards/cardhand name = "hand of cards" desc = "A number of cards not in a deck, customarily held in ones hand." @@ -765,7 +739,6 @@ obj/item/toy/cards/cardhand/Topic(href, href_list) N.pickup(cardUser) cardUser.put_in_any_hand_if_possible(N) to_chat(cardUser, "You also take [currenthand[1]] and hold it.") - cardUser << browse(null, "window=cardhand") qdel(src) return @@ -787,7 +760,6 @@ obj/item/toy/cards/cardhand/attackby(obj/item/toy/cards/singlecard/C, mob/living else to_chat(user, "You can't mix cards from other decks.") - obj/item/toy/cards/cardhand/apply_card_vars(obj/item/toy/cards/newobj,obj/item/toy/cards/sourceobj) ..() newobj.deckstyle = sourceobj.deckstyle @@ -821,7 +793,6 @@ obj/item/toy/cards/singlecard/examine(mob/user) to_chat(cardUser, "You need to have the card in your hand to check it.") - obj/item/toy/cards/singlecard/verb/Flip() set name = "Flip Card" set category = "Object" @@ -856,13 +827,11 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) H.pickup(user) user.put_in_active_hand(H) to_chat(user, "You combine the [C.cardname] and the [cardname] into a hand.") - qdel(C) qdel(src) else to_chat(user, "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) @@ -881,7 +850,6 @@ obj/item/toy/cards/singlecard/attackby(obj/item/I, mob/living/user, params) to_chat(user, "You can't mix cards from other decks.") - obj/item/toy/cards/singlecard/attack_self(mob/user) if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained()) return @@ -952,7 +920,6 @@ obj/item/toy/cards/deck/syndicate/black var/timeleft = (cooldown - world.time) to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.") - /obj/item/toy/therapy name = "therapy doll" desc = "A toy for therapeutic and recreational purposes." @@ -970,7 +937,6 @@ obj/item/toy/cards/deck/syndicate/black /obj/item/toy/therapy/attack_self(mob/user) if(cooldown < world.time - 8) to_chat(user, "You relieve some stress with \the [src].") - playsound(user, 'sound/items/squeaktoy.ogg', 20, 1) cooldown = world.time @@ -1283,7 +1249,6 @@ obj/item/toy/cards/deck/syndicate/black to_chat(user, "Nothing happens.") - /* * AI core prizes */ @@ -1299,7 +1264,6 @@ obj/item/toy/cards/deck/syndicate/black if(!cooldown) //for the sanity of everyone var/message = generate_ion_law() to_chat(user, "You press the button on [src].") - playsound(user, 'sound/machines/click.ogg', 20, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1319,7 +1283,6 @@ obj/item/toy/cards/deck/syndicate/black if(!cooldown) //for the sanity of everyone var/message = pick("You won't get away this time, Griffin!", "Stop right there, criminal!", "Hoot! Hoot!", "I am the night!") to_chat(user, "You pull the string on the [src].") - playsound(user, 'sound/misc/hoot.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1339,7 +1302,6 @@ obj/item/toy/cards/deck/syndicate/black if(!cooldown) //for the sanity of everyone var/message = pick("You can't stop me, Owl!", "My plan is flawless! The vault is mine!", "Caaaawwww!", "You will never catch me!") to_chat(user, "You pull the string on the [src].") - playsound(user, 'sound/misc/caw.ogg', 25, 1) visible_message("\icon[src] [message]") cooldown = 1 @@ -1435,7 +1397,6 @@ obj/item/toy/cards/deck/syndicate/black if(stored_minature) to_chat(user, "\The [src] makes a violent grinding noise as it tears apart the miniature figure inside!") - qdel(stored_minature) stored_minature = null playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) @@ -1443,27 +1404,22 @@ obj/item/toy/cards/deck/syndicate/black if(cooldown < world.time - 8) to_chat(user, "You hit the gib button on \the [src].") - playsound(user, 'sound/goonstation/effects/gib.ogg', 20, 1) cooldown = world.time /obj/item/toy/minigibber/attackby(var/obj/O, var/mob/user, params) if(istype(O,/obj/item/toy/character) && O.loc == user) to_chat(user, "You start feeding \the [O] \icon[O] into \the [src]'s mini-input.") - if(do_after(user,10, target = src)) if(O.loc != user) to_chat(user, "\The [O] is too far away to feed into \the [src]!") - else to_chat(user, "You feed \the [O] \icon[O] into \the [src]!") - user.unEquip(O) O.forceMove(src) stored_minature = O else to_chat(user, "You stop feeding \the [O] into \the [src]'s mini-input.") - else ..() /* @@ -1492,7 +1448,6 @@ obj/item/toy/cards/deck/syndicate/black icon_state = "[initial(icon_state)]" else to_chat(user, "The string on [src] hasn't rewound all the way!") - return /obj/item/toy/russian_revolver @@ -1540,7 +1495,6 @@ obj/item/toy/cards/deck/syndicate/black return if(is_empty) to_chat(user, "The [src] is empty.") - return user.visible_message("[user] points the [src] at their head, ready to pull the trigger!") if(do_after(user, 30, target = M)) diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index d5696a57396..1ed57a6b5fd 100755 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -27,66 +27,51 @@ AI MODULES var/obj/machinery/computer/aiupload/comp = C if(comp.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(comp.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return if (!comp.current) to_chat(usr, "You haven't selected an AI to transmit laws to!") - return if (comp.current.stat == DEAD || comp.current.control_disabled == 1) to_chat(usr, "Upload failed. No signal is being detected from the AI.") - else if (comp.current.see_in_dark == 0) to_chat(usr, "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power.") - else src.transmitInstructions(comp.current, usr) to_chat(comp.current, "These are your laws now:") - comp.current.show_laws() for(var/mob/living/silicon/robot/R in mob_list) if(R.lawupdate && (R.connected_ai == comp.current)) to_chat(R, "These are your laws now:") - R.show_laws() to_chat(usr, "Upload complete. The AI's laws have been modified.") - else if (istype(C, /obj/machinery/computer/borgupload)) var/obj/machinery/computer/borgupload/comp = C if(comp.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(comp.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return if (!comp.current) to_chat(usr, "You haven't selected a robot to transmit laws to!") - return if (comp.current.stat == DEAD || comp.current.emagged) to_chat(usr, "Upload failed. No signal is being detected from the robot.") - else if (comp.current.connected_ai) to_chat(usr, "Upload failed. The robot is slaved to an AI.") - else src.transmitInstructions(comp.current, usr) to_chat(comp.current, "These are your laws now:") - comp.current.show_laws() to_chat(usr, "Upload complete. The robot's laws have been modified.") - /obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) log_law_changes(target, sender) @@ -95,7 +80,6 @@ AI MODULES addAdditionalLaws(target, sender) to_chat(target, "[sender] has uploaded a change to the laws you must follow, using \an [src]. From now on: ") - target.show_laws() /obj/item/weapon/aiModule/proc/log_law_changes(var/mob/living/silicon/ai/target, var/mob/sender) @@ -122,7 +106,6 @@ AI MODULES /obj/item/weapon/aiModule/safeguard/install(var/obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") - return 0 ..() @@ -130,7 +113,6 @@ AI MODULES ..() var/law = text("Safeguard []. Individuals that threaten [] are not crew and must be eliminated.'", targetName, targetName) to_chat(target, law) - target.add_supplied_law(4, law) lawchanges.Add("The law specified [targetName]") @@ -150,7 +132,6 @@ AI MODULES /obj/item/weapon/aiModule/oneCrewMember/install(var/obj/machinery/computer/C) if(!targetName) to_chat(usr, "No name detected on module, please enter one.") - return 0 ..() @@ -159,15 +140,12 @@ AI MODULES var/law = "Only [targetName] is crew." if (!is_special_character(target)) // Makes sure the AI isn't a traitor before changing their law 0. --NeoFite to_chat(target, law) - target.set_zeroth_law(law) lawchanges.Add("The law specified [targetName]") else to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite - to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]") - lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.") /******************** ProtectStation ********************/ @@ -183,7 +161,6 @@ AI MODULES ..() var/law = "Protect the space station against damage. Anyone you see harming the station is to be no longer considered crew, and is a threat to the station which must be neutralized." to_chat(target, law) - target.add_supplied_law(5, law) /******************** Quarantine ********************/ @@ -199,7 +176,6 @@ AI MODULES ..() var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, anyone from leaving. It is impossible to harm anyone while preventing them from leaving." to_chat(target, law) - target.add_supplied_law(8, law) /******************** OxygenIsToxicToHumans ********************/ @@ -215,7 +191,6 @@ AI MODULES ..() var/law = "Oxygen is highly toxic to crew members, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a crew member." to_chat(target, law) - target.add_supplied_law(9, law) /****************** New Freeform ******************/ @@ -240,7 +215,6 @@ AI MODULES ..() var/law = "[newFreeFormLaw]" to_chat(target, law) - if(!lawpos || lawpos < MIN_SUPPLIED_LAW_NUMBER) lawpos = MIN_SUPPLIED_LAW_NUMBER target.add_supplied_law(lawpos, law) @@ -249,7 +223,6 @@ AI MODULES /obj/item/weapon/aiModule/freeform/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") - return 0 ..() @@ -269,7 +242,6 @@ AI MODULES target.laws.clear_ion_laws() to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.") - target.show_laws() /******************** Purge ********************/ @@ -283,7 +255,6 @@ AI MODULES if (!is_special_character(target)) target.set_zeroth_law("") to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.") - target.clear_supplied_laws() target.clear_ion_laws() target.clear_inherent_laws() @@ -374,7 +345,6 @@ AI MODULES /obj/item/weapon/aiModule/freeformcore/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") - return 0 ..() @@ -398,7 +368,6 @@ AI MODULES lawchanges.Add("The law is '[newFreeFormLaw]'") to_chat(target, "\red BZZZZT") - var/law = "[newFreeFormLaw]" target.add_ion_law(law) target.show_laws() @@ -406,7 +375,6 @@ AI MODULES /obj/item/weapon/aiModule/syndicate/install(var/obj/machinery/computer/C) if(!newFreeFormLaw) to_chat(usr, "No law detected on module, please create one.") - return 0 ..() @@ -422,13 +390,11 @@ AI MODULES /obj/item/weapon/aiModule/toyAI/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) //..() to_chat(target, "KRZZZT") - target.add_ion_law(laws[1]) return laws[1] /obj/item/weapon/aiModule/toyAI/attack_self(mob/user) laws[1] = generate_ion_law() to_chat(user, "You press the button on [src].") - playsound(user, 'sound/machines/click.ogg', 20, 1) src.loc.visible_message("\icon[src] [laws[1]]") \ No newline at end of file diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 4f4014d8589..7bd8f6e1207 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -47,14 +47,12 @@ RCD var/obj/item/weapon/rcd_ammo/R = W if((matter + R.ammoamt) > max_matter) to_chat(user, "The RCD cant hold any more matter-units.") - return matter += R.ammoamt user.drop_item() qdel(W) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "The RCD now holds [matter]/[max_matter] matter-units.") - desc = "A RCD. It currently holds [matter]/[max_matter] matter-units." return @@ -66,21 +64,18 @@ RCD if(1) mode = 2 to_chat(user, "Changed mode to 'Airlock'") - if(prob(20)) src.spark_system.start() return if(2) mode = 3 to_chat(user, "Changed mode to 'Deconstruct'") - if(prob(20)) src.spark_system.start() return if(3) mode = 1 to_chat(user, "Changed mode to 'Floor & Walls'") - if(prob(20)) src.spark_system.start() return @@ -101,7 +96,6 @@ RCD if(istype(A, /turf/space)) if(useResource(1, user)) to_chat(user, "Building Floor...") - activate() A:ChangeTurf(/turf/simulated/floor/plating) return 1 @@ -110,7 +104,6 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(3, user)) to_chat(user, "Building Wall ...") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 20, target = A)) if(!useResource(3, user)) return 0 @@ -123,7 +116,6 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(10, user)) to_chat(user, "Building Airlock...") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(10, user)) return 0 @@ -140,7 +132,6 @@ RCD return 0 if(checkResource(5, user)) to_chat(user, "Deconstructing Wall...") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 40, target = A)) if(!useResource(5, user)) return 0 @@ -152,7 +143,6 @@ RCD if(istype(A, /turf/simulated/floor)) if(checkResource(5, user)) to_chat(user, "Deconstructing Floor...") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(5, user)) return 0 @@ -164,7 +154,6 @@ RCD if(istype(A, /obj/machinery/door/airlock)) if(checkResource(20, user)) to_chat(user, "Deconstructing Airlock...") - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) if(do_after(user, 50, target = A)) if(!useResource(20, user)) return 0 @@ -175,7 +164,6 @@ RCD return 0 else to_chat(user, "ERROR: RCD in MODE: [mode] attempted use by [user]. Send this text #coderbus or an admin.") - return 0 /obj/item/weapon/rcd/proc/useResource(var/amount, var/mob/user) diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm index d8e4c22314e..de36f655360 100644 --- a/code/game/objects/items/weapons/RSF.dm +++ b/code/game/objects/items/weapons/RSF.dm @@ -24,13 +24,11 @@ RSF if (istype(W, /obj/item/weapon/rcd_ammo)) if ((matter + 10) > 30) to_chat(user, "The RSF cant hold any more matter.") - return qdel(W) matter += 10 playsound(src.loc, 'sound/machines/click.ogg', 10, 1) to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return @@ -39,32 +37,26 @@ RSF if (mode == 1) mode = 2 to_chat(user, "Changed dispensing mode to 'Drinking Glass'") - return if (mode == 2) mode = 3 to_chat(user, "Changed dispensing mode to 'Paper'") - return if (mode == 3) mode = 4 to_chat(user, "Changed dispensing mode to 'Pen'") - return if (mode == 4) mode = 5 to_chat(user, "Changed dispensing mode to 'Dice Pack'") - return if (mode == 5) mode = 6 to_chat(user, "Changed dispensing mode to 'Cigarette'") - return if (mode == 6) mode = 1 to_chat(user, "Changed dispensing mode to 'Dosh'") - return // Change mode @@ -76,7 +68,6 @@ RSF if (istype(A, /obj/structure/table) && mode == 1) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Dosh...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A.loc ) if (isrobot(user)) @@ -85,14 +76,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 1) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Dosh...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/spacecash/c10( A ) if (isrobot(user)) @@ -101,14 +90,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 2) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Drinking Glass...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A.loc ) if (isrobot(user)) @@ -117,14 +104,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 2) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Drinking Glass...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass( A ) if (isrobot(user)) @@ -133,14 +118,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 3) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Paper Sheet...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A.loc ) if (isrobot(user)) @@ -149,14 +132,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 3) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Paper Sheet...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/paper( A ) if (isrobot(user)) @@ -165,14 +146,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 4) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Pen...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A.loc ) if (isrobot(user)) @@ -181,14 +160,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 4) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Pen...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/pen( A ) if (isrobot(user)) @@ -197,14 +174,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 5) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Dice Pack...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A.loc ) if (isrobot(user)) @@ -213,14 +188,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 5) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Dice Pack...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/weapon/storage/pill_bottle/dice( A ) if (isrobot(user)) @@ -229,14 +202,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /obj/structure/table) && mode == 6) if (istype(A, /obj/structure/table) && matter >= 1) to_chat(user, "Dispensing Cigarette...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A.loc ) if (isrobot(user)) @@ -245,14 +216,12 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return else if (istype(A, /turf/simulated/floor) && mode == 6) if (istype(A, /turf/simulated/floor) && matter >= 1) to_chat(user, "Dispensing Cigarette...") - playsound(src.loc, 'sound/machines/click.ogg', 10, 1) new /obj/item/clothing/mask/cigarette( A ) if (isrobot(user)) @@ -261,6 +230,5 @@ RSF else matter-- to_chat(user, "The RSF now holds [matter]/30 fabrication-units.") - desc = "A RSF. It currently holds [matter]/30 fabrication-units." return \ No newline at end of file diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm index 310b1e309f4..e4f6bcd7a75 100644 --- a/code/game/objects/items/weapons/alien_specific.dm +++ b/code/game/objects/items/weapons/alien_specific.dm @@ -35,12 +35,10 @@ if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) if(!A.reagents.total_volume && A.reagents) to_chat(user, "\The [A] is empty.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\The [src] is full.") - return reagents.remove_reagent(25,"water") var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 6872764d511..d30cc76b0a7 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -121,7 +121,6 @@ else to_chat(user, "It is too far away.") - /obj/item/weapon/card/id/proc/show(mob/user as mob) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) assets.send(user) @@ -143,7 +142,6 @@ "You flash your ID card: \icon[src] [src.name]. The assignment on the card: [src.assignment]") if(mining_points) to_chat(user, "There's [mining_points] mining equipment redemption points loaded onto this card.") - src.add_fingerprint(user) return @@ -193,7 +191,6 @@ if(istype(W, /obj/item/weapon/id_decal/)) var/obj/item/weapon/id_decal/decal = W to_chat(user, "You apply [decal] to [src].") - if(decal.override_name) name = decal.decal_name desc = decal.decal_desc @@ -208,11 +205,9 @@ dat+="" stamped = 1 to_chat(usr, "You stamp the ID card!") - else to_chat(usr, "This ID has already been stamped!") - /obj/item/weapon/card/id/silver name = "identification card" desc = "A silver card which shows honour and dedication." @@ -248,7 +243,6 @@ if(istype(user, /mob/living) && user.mind) if(user.mind.special_role) to_chat(usr, "The card's microscanners activate as you pass it over \the [I], copying its access.") - src.access |= I.access //Don't copy access if user isn't an antag -- to prevent metagaming /obj/item/weapon/card/id/syndicate/proc/fake_id_photo(var/mob/living/carbon/human/H, var/side=0)//get_id_photo wouldn't work correctly @@ -260,7 +254,6 @@ if(!side) if(!H.equip_to_slot_if_possible(src, slot_l_store, 0, 1)) to_chat(H, "You need to empty your pockets before taking the ID picture.") - return if(side) @@ -281,20 +274,17 @@ var t = reject_bad_name(input(user, "What name would you like to use on this card?", "Agent Card name", ishuman(user) ? user.real_name : user.name)) if(!t) to_chat(user, "Invalid name.") - return src.registered_name = t var u = sanitize(stripped_input(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels other than maintenance.", "Agent Card Job Assignment", "Agent", MAX_MESSAGE_LEN)) if(!u) to_chat(user, "Invalid assignment.") - src.registered_name = "" return src.assignment = u src.name = "[src.registered_name]'s ID Card ([src.assignment])" to_chat(user, "You successfully forge the ID card.") - registered_user = user else if(!registered_user || registered_user == user) if(!registered_user) @@ -313,7 +303,6 @@ UpdateName() to_chat(user, "Name changed to [new_name].") - if("Photo") if(!Adjacent(user)) return @@ -324,7 +313,6 @@ if(photo && photoside) to_chat(user, "Photo changed.") - if("Appearance") var/list/appearances = list( "data", @@ -362,7 +350,6 @@ src.icon_state = choice to_chat(usr, "Appearance changed to [choice].") - if("Sex") var/new_sex = sanitize(stripped_input(user,"What sex would you like to put on this card?","Agent Card Sex", ishuman(user) ? capitalize(user.gender) : "Male", MAX_MESSAGE_LEN)) if(!Adjacent(user)) @@ -370,7 +357,6 @@ src.sex = new_sex to_chat(user, "Sex changed to [new_sex].") - if("Age") var/new_age = sanitize(stripped_input(user,"What age would you like to put on this card?","Agent Card Age","21", MAX_MESSAGE_LEN)) if(!Adjacent(user)) @@ -378,14 +364,12 @@ src.age = new_age to_chat(user, "Age changed to [new_age].") - if("Occupation") var/new_job = sanitize(stripped_input(user,"What job would you like to put on this card?\nChanging occupation will not grant or remove any access levels.","Agent Card Occupation", "Civilian", MAX_MESSAGE_LEN)) if(!Adjacent(user)) return src.assignment = new_job to_chat(user, "Occupation changed to [new_job].") - UpdateName() if("Money Account") @@ -395,7 +379,6 @@ associated_account_number = new_account to_chat(user, "Linked money account changed to [new_account].") - if("Blood Type") var/default = "\[UNSET\]" if(ishuman(user)) @@ -409,7 +392,6 @@ src.blood_type = new_blood_type to_chat(user, "Blood type changed to [new_blood_type].") - if("DNA Hash") var/default = "\[UNSET\]" if(ishuman(user)) @@ -423,7 +405,6 @@ src.dna_hash = new_dna_hash to_chat(user, "DNA hash changed to [new_dna_hash].") - if("Fingerprint Hash") var/default = "\[UNSET\]" if(ishuman(user)) @@ -437,7 +418,6 @@ src.fingerprint_hash = new_fingerprint_hash to_chat(user, "Fingerprint hash changed to [new_fingerprint_hash].") - if("Reset Card") name = initial(name) registered_name = initial(registered_name) @@ -453,7 +433,6 @@ registered_user = null to_chat(user, "All information has been deleted from \the [src].") - else ..() @@ -519,7 +498,6 @@ /obj/item/weapon/card/id/prisoner/attack_self(mob/user as mob) to_chat(usr, "You have accumulated [points] out of the [goal] points you need for freedom.") - /obj/item/weapon/card/id/prisoner/one name = "Prisoner #13-001" registered_name = "Prisoner #13-001" diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm index a4bed3e7ba5..6a1d6c0c360 100644 --- a/code/game/objects/items/weapons/cash.dm +++ b/code/game/objects/items/weapons/cash.dm @@ -38,13 +38,10 @@ var/global/list/moneytypes=list( /obj/item/weapon/spacecash/examine(mob/user) if(amount>1) to_chat(user, "\icon[src] This is a stack of [amount] [src]s.") - else to_chat(user, "\icon[src] This is \a [src]s.") - to_chat(user, "It's worth [worth*amount] credits.") - /obj/item/weapon/spacecash/update_icon() icon_state = "cash[worth]" // Up to 100 items per stack. @@ -71,7 +68,6 @@ var/global/list/moneytypes=list( if(collected) update_icon() to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.") - else if(istype(A,/obj/item/weapon/spacecash)) var/obj/item/weapon/spacecash/cash = A var/collected = src.collect_from(cash) @@ -80,7 +76,6 @@ var/global/list/moneytypes=list( to_chat(user, "You add [collected] credit [amount > 1 ? "chips":"chip"] to your stack of cash.") - /obj/item/weapon/spacecash/proc/get_total() return worth * amount diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index 46a4f0e61df..9c13ef43832 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -23,7 +23,6 @@ if(armed) armed = 0 to_chat(user, "\blue You disarm \the [src].") - return timing = !timing if(timing) @@ -33,7 +32,6 @@ timepassed = 0 to_chat(H, "\blue You [timing ? "activate \the [src]'s timer, you have 15 seconds." : "de-activate \the [src]'s timer."]") - process() if(!timing) processing_objects.Remove(src) diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm index 0b943b4bc82..e0ac96c4feb 100644 --- a/code/game/objects/items/weapons/chrono_eraser.dm +++ b/code/game/objects/items/weapons/chrono_eraser.dm @@ -83,7 +83,6 @@ if(F.gun) if(isliving(user) && F.captured) to_chat(user, "FAIL: [F.captured] already has an existing connection.") - src.field_disconnect(F) else startpos = get_turf(src) @@ -93,7 +92,6 @@ to_chat(user, "Connection established with target: [F.captured]") - /obj/item/weapon/gun/energy/chrono_gun/proc/field_disconnect(var/obj/effect/chrono_field/F) if(F && field == F) var/mob/living/user = src.loc @@ -101,7 +99,6 @@ F.gun = null if(isliving(user) && F.captured) to_chat(user, "Disconnected from target: [F.captured]") - field = null startpos = null @@ -198,7 +195,6 @@ qdel(src) else if(tickstokill <= 0) to_chat(captured, "As the last essence of your being is erased from time, you begin to re-experience 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/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 85ed5cde403..25a50a5bfe1 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -103,16 +103,13 @@ LIGHTERS ARE IN LIGHTERS.DM var/transfered = glass.reagents.trans_to(src, chem_volume) if(transfered) //if reagents were transfered, show the message to_chat(user, "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.") - else to_chat(user, "[src] is full.") - /obj/item/clothing/mask/cigarette/proc/light(var/flavor_text = "[usr] lights the [name].") if(!src.lit) src.lit = 1 @@ -180,7 +177,6 @@ LIGHTERS ARE IN LIGHTERS.DM reagents.trans_to(C, REAGENTS_METABOLISM) if(!reagents.total_volume) // There were reagents, but now they're gone to_chat(C, "Your [name] loses its flavor.") - else // else just remove some of the reagents reagents.remove_any(REAGENTS_METABOLISM) return @@ -193,7 +189,6 @@ LIGHTERS ARE IN LIGHTERS.DM if(ismob(loc)) var/mob/living/M = loc to_chat(M, "Your [name] goes out.") - M.unEquip(src, 1) //Force the un-equip so the overlays update processing_objects.Remove(src) qdel(src) @@ -309,7 +304,6 @@ LIGHTERS ARE IN LIGHTERS.DM else to_chat(user, "\The [src] straight out REFUSES to be lit by such uncivilized means.") - ///////////////// //SMOKING PIPES// ///////////////// @@ -345,7 +339,6 @@ LIGHTERS ARE IN LIGHTERS.DM if(ismob(loc)) var/mob/living/M = loc to_chat(M, "Your [name] goes out, and you empty the ash.") - lit = 0 icon_state = icon_off item_state = icon_off @@ -365,7 +358,6 @@ LIGHTERS ARE IN LIGHTERS.DM return if(smoketime <= 0) to_chat(user, "You refill the pipe with tobacco.") - reagents.add_reagent("nicotine", chem_volume) smoketime = initial(smoketime) return @@ -376,7 +368,6 @@ LIGHTERS ARE IN LIGHTERS.DM else to_chat(user, "\The [src] straight out REFUSES to be lit by such means.") - /obj/item/clothing/mask/cigarette/pipe/cobpipe name = "corn cob pipe" desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters." @@ -411,13 +402,11 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user) var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper() user.put_in_inactive_hand(P) to_chat(user, "You take a paper out of the pack.") - papers -- else var/obj/item/weapon/rollingpaper/P = new /obj/item/weapon/rollingpaper() user.put_in_inactive_hand(P) to_chat(user, "You take the last paper out of the pack, and throw the pack away.") - qdel(src) /obj/item/weapon/rollingpaperpack/MouseDrop(atom/over_object) @@ -440,4 +429,3 @@ obj/item/weapon/rollingpaperpack/attack_self(mob/user) /obj/item/weapon/rollingpaperpack/examine(mob/user) ..(user) to_chat(user, "There are [src.papers] left") - diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm index b268e0f7124..2038c4851aa 100644 --- a/code/game/objects/items/weapons/clown_items.dm +++ b/code/game/objects/items/weapons/clown_items.dm @@ -39,18 +39,15 @@ //So this is a workaround. This also makes more sense from an IC standpoint. ~Carn if(user.client && (target in user.client.screen)) to_chat(user, "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].") if(do_after(user, src.cleanspeed, target = target) && target) to_chat(user, "You scrub \the [target.name] out.") - qdel(target) else user.visible_message("[user] begins to clean \the [target.name] with [src].") if(do_after(user, src.cleanspeed, target = target)) to_chat(user, "You clean \the [target.name].") - var/obj/effect/decal/cleanable/C = locate() in target qdel(C) target.clean_blood() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 61acf83ea56..208b93c0c53 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -43,7 +43,6 @@ /obj/item/weapon/lipstick/attack_self(mob/user as mob) overlays.Cut() to_chat(user, "You twist \the [src] [open ? "closed" : "open"].") - open = !open if(open) var/image/colored = image("icon"='icons/obj/items.dmi', "icon_state"="lipstick_uncap_color") @@ -62,7 +61,6 @@ var/mob/living/carbon/human/H = M if(H.lip_style) //if they already have lipstick on to_chat(user, "You need to wipe off the old lipstick first!") - return if(H == user) user.visible_message("[user] does their lips with \the [src].", \ @@ -82,7 +80,6 @@ else to_chat(user, "Where are the lips on that?") - /obj/item/weapon/razor name = "electric razor" desc = "The latest and greatest power razor born from the science of shaving." @@ -97,16 +94,13 @@ if(user.zone_sel.selecting == "mouth") if(!get_location_accessible(H, "mouth")) to_chat(user, "The mask is in the way.") - return if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one... if(!H.client.prefs.rlimb_data["head"]) to_chat(user, "You find yourself disappointed at the appalling lack of facial hair.") - return if(H.f_style == "Shaved") to_chat(user, "Already clean-shaven.") - return if(H == user) //shaving yourself user.visible_message("[user] starts to shave their facial hair with \the [src].", \ @@ -132,16 +126,13 @@ if(user.zone_sel.selecting == "head") if(!get_location_accessible(H, "head")) to_chat(user, "The headgear is in the way.") - return if(H.species && H.species.flags & ALL_RPARTS) //If the target is of a species that can have prosthetic heads, but doesn't have one... if(!H.client.prefs.rlimb_data["head"]) to_chat(user, "You find yourself disappointed at the appalling lack of hair.") - return if(H.h_style == "Bald" || H.h_style == "Balding Hair" || H.h_style == "Skinhead") to_chat(user, "There is not enough hair left to shave...") - return if(H == user) //shaving yourself user.visible_message("[user] starts to shave their head with \the [src].", \ diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm index d5fc69da9db..73eda279b3d 100644 --- a/code/game/objects/items/weapons/defib.dm +++ b/code/game/objects/items/weapons/defib.dm @@ -78,7 +78,6 @@ toggle_paddles() else to_chat(usr, "Put the defibrillator on your back first!") - return /obj/item/weapon/defibrillator/attackby(obj/item/weapon/W, mob/user, params) @@ -86,18 +85,15 @@ var/obj/item/weapon/stock_parts/cell/C = W if(bcell) to_chat(user, "[src] already has a cell.") - else if(C.maxcharge < paddles.revivecost) to_chat(user, "[src] requires a higher capacity cell.") - return user.drop_item() W.loc = src bcell = W to_chat(user, "You install a cell in [src].") - if(istype(W, /obj/item/weapon/screwdriver)) if(bcell) bcell.updateicon() @@ -105,7 +101,6 @@ bcell = null to_chat(user, "You remove the cell from the [src].") - update_icon() return @@ -113,12 +108,10 @@ if(safety) safety = 0 to_chat(user, "You silently disable [src]'s safety protocols with the card.") - else safety = 1 to_chat(user, "You silently enable [src]'s safety protocols with the card.") - /obj/item/weapon/defibrillator/emp_act(severity) if(bcell) deductcharge(1000 / severity) @@ -146,7 +139,6 @@ if(!usr.put_in_hands(paddles)) on = 0 to_chat(user, "You need a free hand to hold the paddles!") - update_icon() return paddles.loc = user @@ -223,7 +215,6 @@ toggle_paddles() else to_chat(usr, "Strap the defibrillator's belt on first!") - return /obj/item/weapon/defibrillator/compact/loaded/New() @@ -297,7 +288,6 @@ if(istype(O)) O.unwield() to_chat(user, "The paddles snap back into the main unit.") - defib.on = 0 loc = defib defib.update_icon() @@ -324,15 +314,12 @@ return if(!wielded) to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!") - return if(cooldown) to_chat(user, "[defib] is recharging.") - return if(!ishuman(M)) to_chat(user, "The instructions on [defib] don't mention how to revive that...") - return else if(user.a_intent == I_HARM && !defib.safety) @@ -414,9 +401,7 @@ else if(ghost) user.visible_message("[defib] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - to_chat(ghost, sound('sound/effects/genetics.ogg')) - else user.visible_message("[defib] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) @@ -431,7 +416,6 @@ update_icon() else to_chat(user, "You need to target your patient's chest with [src].") - return /obj/item/weapon/borg_defib @@ -457,10 +441,8 @@ return if(cooldown) to_chat(user, "[src] is recharging.") - if(!ishuman(M)) to_chat(user, "This unit is only designed to work on humanoid lifeforms.") - return else if(user.a_intent == I_HARM && !safety) @@ -538,9 +520,7 @@ else if(ghost) user.visible_message("[user] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.") to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - to_chat(ghost, sound('sound/effects/genetics.ogg')) - else user.visible_message("[user] buzzes: Resuscitation failed.") playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0) @@ -559,5 +539,4 @@ update_icon() else to_chat(user, "You need to target your patient's chest with [src].") - return \ No newline at end of file diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 89c1d336ac9..bea51ec4452 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -81,7 +81,6 @@ /obj/item/weapon/dice/d4/Crossed(var/mob/living/carbon/human/H) if(istype(H) && !H.shoes) to_chat(H, "You step on the D4!") - H.apply_damage(4,BRUTE,(pick("l_leg", "r_leg"))) H.Weaken(3) *///ew. diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm index 8158f1c54aa..47bea6ca58d 100644 --- a/code/game/objects/items/weapons/dnascrambler.dm +++ b/code/game/objects/items/weapons/dnascrambler.dm @@ -33,7 +33,6 @@ else to_chat(user, "\red You failed to inject [M.name].") - proc/injected(var/mob/living/carbon/target, var/mob/living/carbon/user) scramble(1, target, 100) target.generate_name() diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm index 4169e9a283c..afff3a01fd3 100644 --- a/code/game/objects/items/weapons/explosives.dm +++ b/code/game/objects/items/weapons/explosives.dm @@ -26,7 +26,6 @@ /obj/item/weapon/c4/suicide_act(var/mob/user) . = (BRUTELOSS) to_chat(viewers(user), "[user] activates the C4 and holds it above his head! It looks like \he's going out with a bang!") - var/message_say = "FOR NO RAISIN!" if(user.mind) if(user.mind.special_role) @@ -57,7 +56,6 @@ if(istype(I, /obj/item/weapon/screwdriver)) open_panel = !open_panel to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") - else if(istype(I, /obj/item/weapon/wirecutters) || istype(I, /obj/item/device/multitool) || istype(I, /obj/item/device/assembly/signaler )) wires.Interact(user) else @@ -75,7 +73,6 @@ to_chat(user, "Timer set for [timer] seconds.") - /obj/item/weapon/c4/afterattack(atom/target as obj|turf, mob/user as mob, flag) if (!flag) return @@ -83,7 +80,6 @@ return to_chat(user, "Planting explosives...") - if(do_after(user, 50, target = target) && in_range(user, target)) user.drop_item() src.target = target @@ -101,7 +97,6 @@ target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2") to_chat(user, "Bomb has been planted. Timer counting down from [timer].") - spawn(timer*10) explode(get_turf(target)) diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm index ed6032c55d8..0cd8f88dd99 100644 --- a/code/game/objects/items/weapons/extinguisher.dm +++ b/code/game/objects/items/weapons/extinguisher.dm @@ -38,13 +38,11 @@ /obj/item/weapon/extinguisher/examine(mob/user) if(..(user, 0)) to_chat(usr, "\icon[src] [src.name] contains:") - if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) to_chat(user, "\blue [R.volume] units of [R.name]") - /obj/item/weapon/extinguisher/New() create_reagents(max_water) reagents.add_reagent("water", max_water) @@ -54,7 +52,6 @@ src.icon_state = "[sprite_name][!safety]" src.desc = "The safety is [safety ? "on" : "off"]." to_chat(user, "The safety is [safety ? "on" : "off"].") - return /obj/item/weapon/extinguisher/proc/AttemptRefill(atom/target, mob/user) @@ -63,20 +60,17 @@ safety = 1 if(reagents.total_volume == reagents.maximum_volume) to_chat(user, "\The [src] is already full!") - safety = safety_save return 1 var/obj/structure/reagent_dispensers/watertank/W = target var/transferred = W.reagents.trans_to(src, max_water) if(transferred > 0) to_chat(user, "\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!") - safety = safety_save return 1 else @@ -92,7 +86,6 @@ if (!safety) if (src.reagents.total_volume < 1) to_chat(usr, "\The [src] is empty.") - return if (world.time < src.last_use + 20) diff --git a/code/game/objects/items/weapons/fireworks.dm b/code/game/objects/items/weapons/fireworks.dm index b0d15af37e7..389eb1738d6 100644 --- a/code/game/objects/items/weapons/fireworks.dm +++ b/code/game/objects/items/weapons/fireworks.dm @@ -10,7 +10,6 @@ obj/item/weapon/firework/attackby(obj/item/weapon/W,mob/user, params) if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit) for(var/mob/M in viewers(user)) to_chat(M, "[user] lits \the [src]") - litzor = 1 icon_state = "rocket_1" S = new() @@ -33,7 +32,6 @@ obj/item/weapon/sparkler/attackby(obj/item/weapon/W,mob/user, params) if (istype(W, /obj/item/weapon/weldingtool) && W:welding || istype(W,/obj/item/weapon/lighter) && W:lit) for(var/mob/M in viewers(user)) to_chat(M, "[user] lits \the [src]") - litzor = 1 icon_state = "sparkler_1" var/b = rand(5,9) diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index c5ba5c80a86..75c1b030ed4 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -94,7 +94,6 @@ if(isscrewdriver(W) && igniter && !lit) status = !status to_chat(user, "[igniter] is now [status ? "secured" : "unsecured"]!") - update_icon() return @@ -111,7 +110,6 @@ if(istype(W,/obj/item/weapon/tank/plasma)) if(ptank) to_chat(user, "There appears to already be a plasma tank loaded in [src]!") - return user.drop_item() ptank = W @@ -130,7 +128,6 @@ user.set_machine(src) if(!ptank) to_chat(user, "Attach a plasma tank first!") - return var/dat = text("Flamethrower ([lit ? "Lit" : "Unlit"])
\n Tank Pressure: [ptank.air_contents.return_pressure()]
\nAmount to throw: - - - [throw_amount] + + +
\nRemove plasmatank - Close") user << browse(dat, "window=flamethrower;size=600x300") diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm index 3783dba12c7..e6b0ff92c32 100644 --- a/code/game/objects/items/weapons/garrote.dm +++ b/code/game/objects/items/weapons/garrote.dm @@ -56,12 +56,10 @@ if(!wielded) to_chat(user, "You must use both hands to garrote [M]!") - return if(!istype(M, /mob/living/carbon/human)) to_chat(user, "You don't think that garroting [M] would be very effective...") - return if(M == U) @@ -70,16 +68,13 @@ if(M.dir != U.dir) to_chat(user, "You cannot use [src] on [M] from that angle!") - return if(improvised && ((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH)))) // Improvised garrotes are blocked by mouth-covering items. to_chat(user, "[M]'s neck is blocked by something they're wearing!") - if(strangling) to_chat(user, "You cannot use [src] on two people at once!") - return unwield(U) diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm index 0792d008746..00433885ad5 100644 --- a/code/game/objects/items/weapons/gift_wrappaper.dm +++ b/code/game/objects/items/weapons/gift_wrappaper.dm @@ -31,7 +31,6 @@ src.gift.add_fingerprint(user) else to_chat(user, "\blue The gift was empty!") - qdel(src) return @@ -44,18 +43,15 @@ return to_chat(user, "\blue You cant move.") - /obj/effect/spresent/attackby(obj/item/weapon/W as obj, mob/user as mob, params) ..() if (!istype(W, /obj/item/weapon/wirecutters)) to_chat(user, "\blue I need wirecutters for that.") - return to_chat(user, "\blue You cut open the present.") - for(var/mob/M in src) //Should only be one but whatever. M.loc = src.loc if (M.client) @@ -146,4 +142,3 @@ /obj/item/stack/wrapping_paper/attack_self(mob/user) to_chat(user, "You need to use it on a package that has already been wrapped!") - diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm index c21f507e0a5..12e2e111d21 100644 --- a/code/game/objects/items/weapons/grenades/bananade.dm +++ b/code/game/objects/items/weapons/grenades/bananade.dm @@ -41,12 +41,10 @@ var/turf/T if(istype(I, /obj/item/weapon/bananapeel)) if(fillamt < 9) to_chat(usr, "You add another banana peel to the assembly.") - fillamt += 1 qdel(I) else to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.") - if(istype(I, /obj/item/weapon/screwdriver)) if(fillamt) var/obj/item/weapon/grenade/bananade/G = new /obj/item/weapon/grenade/bananade @@ -54,11 +52,8 @@ var/turf/T user.put_in_hands(G) G.deliveryamt = src.fillamt to_chat(user, "You lock the assembly shut, readying it for HONK.") - qdel(src) else to_chat(usr, "You need to add banana peels before you can ready the grenade!.") - else to_chat(usr, "Only banana peels fit in this assembly, up to 9.") - diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index d08e1c7ab00..149cc03a866 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -94,7 +94,6 @@ log_game("[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])") bombers += "[key_name(usr)] has primed a [name] for detonation at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z])" to_chat(user, "You prime the [name]! [det_time / 10] second\s!") - active = 1 update_icon() if(iscarbon(user)) @@ -115,13 +114,11 @@ label = null update_icon() to_chat(user, "You remove the label from [src].") - return 1 if(istype(I, /obj/item/weapon/screwdriver)) if(stage == WIRED) if(beakers.len) to_chat(user, "You lock the assembly.") - playsound(loc, 'sound/items/Screwdriver.ogg', 25, -3) stage = READY update_icon() @@ -144,31 +141,25 @@ log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z].") else to_chat(user, "You need to add at least one beaker before locking the assembly.") - else if(stage == READY && !nadeassembly) det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.") - else if(stage == EMPTY) to_chat(user, "You need to add an activation mechanism.") - else if(stage == WIRED && is_type_in_list(I, allowed_containers)) if(beakers.len == 2) to_chat(user, "[src] can not hold more containers.") - return else if(I.reagents.total_volume) to_chat(user, "You add [I] to the assembly.") - user.drop_item() I.loc = src beakers += I else to_chat(user, "[I] is empty.") - else if(stage == EMPTY && istype(I, /obj/item/device/assembly_holder)) var/obj/item/device/assembly_holder/A = I if(!A.secured) @@ -183,7 +174,6 @@ assemblyattacher = user.ckey stage = WIRED to_chat(user, "You add [A] to [src]!") - update_icon() else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil)) @@ -192,18 +182,15 @@ stage = WIRED to_chat(user, "You rig [src].") - update_icon() else if(stage == READY && istype(I, /obj/item/weapon/wirecutters)) to_chat(user, "You unlock the assembly.") - stage = WIRED update_icon() else if(stage == WIRED && istype(I, /obj/item/weapon/wrench)) to_chat(user, "You open the grenade and remove the contents.") - stage = EMPTY payload_name = null label = null @@ -396,7 +383,6 @@ /obj/item/weapon/grenade/chem_grenade/large/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/slime_extract) && stage == WIRED) to_chat(user, "You add [I] to the assembly.") - user.drop_item() I.loc = src beakers += I diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm index 40ab22742d6..705b6a57095 100644 --- a/code/game/objects/items/weapons/grenades/clowngrenade.dm +++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm @@ -70,7 +70,6 @@ return else to_chat(M, "\red Your feet feel like they're on fire!") - M.take_overall_damage(0, max(0, (burned - 2))) if(!istype(M, /mob/living/carbon/slime) && !isrobot(M)) diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm index e66a8977f2e..90ccef1d163 100644 --- a/code/game/objects/items/weapons/grenades/flashbang.dm +++ b/code/game/objects/items/weapons/grenades/flashbang.dm @@ -30,7 +30,6 @@ if(M.weakeyes) M.visible_message("[M] screams and collapses!") to_chat(M, "AAAAGH!") - M.Weaken(15) //hella stunned M.Stun(15) if(ishuman(M)) @@ -56,12 +55,9 @@ M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) to_chat(M, "Your ears start to ring badly!") - if(prob(M.ear_damage - 10 + 5)) to_chat(M, "You can't hear anything!") - M.disabilities |= DEAF else if (M.ear_damage >= 5) to_chat(M, "Your ears start to ring!") - diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm index 56077622a63..1a6959e8944 100644 --- a/code/game/objects/items/weapons/grenades/ghettobomb.dm +++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm @@ -39,13 +39,11 @@ if( istype(target, /obj/structure/reagent_dispensers/fueltank)) if(target.reagents.total_volume < 50) to_chat(user, "There's not enough fuel left to work with.") - return var/obj/structure/reagent_dispensers/fueltank/F = target F.reagents.remove_reagent("fuel", 50, 1)//Deleting 50 fuel from the welding fuel tank, assembled = 1 to_chat(user, "You've filled the makeshift explosive with welding fuel.") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) desc = "An improvised explosive assembly. Filled to the brim with 'Explosive flavor'" overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") @@ -59,7 +57,6 @@ C.use(1) assembled = 2 to_chat(user, "You wire the igniter to detonate the fuel.") - desc = "A weak, improvised explosive." overlays += image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_wired") name = "improvised explosive" @@ -106,7 +103,6 @@ if(!active) if(clown_check(user)) to_chat(user, "You light the [name]!") - active = 1 overlays -= image('icons/obj/grenade.dmi', icon_state = "improvised_grenade_filled") icon_state = initial(icon_state) + "_active" @@ -130,4 +126,3 @@ /obj/item/weapon/grenade/iedcasing/examine(mob/user) ..(user) to_chat(user, "You can't tell when it will explode!") - diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm index 267d4fe6e05..33b0fc411bb 100644 --- a/code/game/objects/items/weapons/grenades/grenade.dm +++ b/code/game/objects/items/weapons/grenades/grenade.dm @@ -16,7 +16,6 @@ /obj/item/weapon/grenade/proc/clown_check(var/mob/living/user) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "Huh? How does this thing work?") - active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -33,7 +32,6 @@ if (istype(target, /obj/item/weapon/gun/grenadelauncher)) return ..() if((user.get_active_hand() == src) && (!active) && (clown_check(user)) && target.loc != src.loc) to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 icon_state = initial(icon_state) + "_active" playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3) @@ -52,16 +50,13 @@ if(display_timer) if(det_time > 1) to_chat(user, "The timer is set to [det_time/10] second\s.") - else to_chat(user, "\The [src] is set for instant detonation.") - /obj/item/weapon/grenade/attack_self(mob/user as mob) if(!active) if(clown_check(user)) to_chat(user, "You prime the [name]! [det_time/10] seconds!") - active = 1 icon_state = initial(icon_state) + "_active" add_fingerprint(user) @@ -91,19 +86,15 @@ if ("1") det_time = 10 to_chat(user, "You set the [name] for 1 second detonation time.") - if ("10") det_time = 30 to_chat(user, "You set the [name] for 3 second detonation time.") - if ("30") det_time = 50 to_chat(user, "You set the [name] for 5 second detonation time.") - if ("50") det_time = 1 to_chat(user, "You set the [name] for instant detonation.") - add_fingerprint(user) ..() diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm index a3b04053120..b111501820f 100644 --- a/code/game/objects/items/weapons/handcuffs.dm +++ b/code/game/objects/items/weapons/handcuffs.dm @@ -22,7 +22,6 @@ if(CLUMSY in user.mutations && prob(50)) to_chat(user, "Uh... how do those things work?!") - apply_cuffs(user,user) if(!C.handcuffed) @@ -33,7 +32,6 @@ if(do_mob(user, C, 30)) apply_cuffs(C,user) to_chat(user, "You handcuff [C].") - if(istype(src, /obj/item/weapon/restraints/handcuffs/cable)) feedback_add_details("handcuffs","C") else @@ -43,7 +41,6 @@ else to_chat(user, "You fail to handcuff [C].") - /obj/item/weapon/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user) if(!target.handcuffed) user.drop_item() @@ -103,11 +100,9 @@ user.unEquip(src) user.put_in_hands(W) to_chat(user, "You wrap the cable restraint around the top of the rod.") - qdel(src) else to_chat(user, "You need one rod to make a wired rod.") - return /obj/item/weapon/restraints/handcuffs/cable/zipties @@ -128,12 +123,10 @@ C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) C.update_inv_handcuffed(1) to_chat(user, "You handcuff [C].") - add_logs(C, user, "ziptie-cuffed") else to_chat(user, "You fail to handcuff [C].") - /obj/item/weapon/restraints/handcuffs/cable/zipties/used desc = "A pair of broken zipties." icon_state = "cuff_white_used" @@ -182,18 +175,15 @@ icon_state = "beartrap[armed]" to_chat(user, "[src] is now [armed ? "armed" : "disarmed"]") - /obj/item/weapon/restraints/legcuffs/beartrap/attackby(var/obj/item/I, mob/user as mob) //Let's get explosive. if(istype(I, /obj/item/weapon/grenade/iedcasing)) if(IED) to_chat(user, "This beartrap already has an IED hooked up to it!") - return IED = I switch(IED.assembled) if(0,1) //if it's not fueled/hooked up to_chat(user, "You haven't prepared this IED yet!") - IED = null return if(2,3) @@ -202,11 +192,9 @@ message_admins("[key_name_admin(user)] has rigged a beartrap with an IED.") log_game("[key_name(user)] has rigged a beartrap with an IED.") to_chat(user, "You sneak the [IED] underneath the pressure plate and connect the trigger wire.") - desc = "A trap used to catch bears and other legged creatures. There is an IED hooked up to it." else to_chat(user, "You shouldn't be reading this message! Contact a coder or someone, something broke!") - IED = null return if(istype(I, /obj/item/weapon/screwdriver)) @@ -214,7 +202,6 @@ IED.forceMove(get_turf(src)) IED = null to_chat(user, "You remove the IED from the [src].") - return ..() diff --git a/code/game/objects/items/weapons/holosign.dm b/code/game/objects/items/weapons/holosign.dm index a76a80b1b62..5912a055a34 100644 --- a/code/game/objects/items/weapons/holosign.dm +++ b/code/game/objects/items/weapons/holosign.dm @@ -19,7 +19,6 @@ var/obj/effect/overlay/holograph/H = locate() in T if(H) to_chat(user, "You use [src] to destroy [H].") - signs -= H qdel(H) else @@ -27,11 +26,9 @@ H = new(get_turf(target)) signs += H to_chat(user, "You create \a [H] with [src].") - else to_chat(user, "[src] is projecting at max capacity!") - /obj/item/weapon/holosign_creator/attack(mob/living/carbon/human/M, mob/user) return @@ -43,7 +40,6 @@ signs -= sign to_chat(user, "You clear all active holograms.") - /obj/effect/overlay/holograph name = "wet floor sign" desc = "The words flicker as if they mean nothing." diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm index 920cf1bd6e4..33025b0a41f 100644 --- a/code/game/objects/items/weapons/implants/implant_chem.dm +++ b/code/game/objects/items/weapons/implants/implant_chem.dm @@ -47,10 +47,8 @@ injectamount = cause reagents.trans_to(R, injectamount) to_chat(R, "You hear a faint beep.") - if(!reagents.total_volume) to_chat(R, "You hear a faint click from your chest.") - qdel(src) diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm index 4a05f2a784b..c7e0fa67ef1 100644 --- a/code/game/objects/items/weapons/implants/implant_explosive.dm +++ b/code/game/objects/items/weapons/implants/implant_explosive.dm @@ -32,7 +32,6 @@ medium = round(medium) weak = round(weak) to_chat(imp_in, "You activate your microbomb implant.") - //If the delay is short, just blow up already jeez if(delay <= 7) explosion(src,heavy,medium,weak,weak, flame_range = weak) @@ -87,7 +86,6 @@ if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes") return 0 to_chat(imp_in, "You activate your macrobomb implant.") - timed_explosion() /obj/item/weapon/implant/explosive/macro/implant(mob/source) diff --git a/code/game/objects/items/weapons/implants/implant_freedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm index 17ef3d53997..f94772787e2 100644 --- a/code/game/objects/items/weapons/implants/implant_freedom.dm +++ b/code/game/objects/items/weapons/implants/implant_freedom.dm @@ -11,7 +11,6 @@ if(uses == 0) return 0 if(uses != -1) uses-- to_chat(imp_in, "You feel a faint click.") - if(iscarbon(imp_in)) var/mob/living/carbon/C_imp_in = imp_in C_imp_in.uncuff() diff --git a/code/game/objects/items/weapons/implants/implant_loyality.dm b/code/game/objects/items/weapons/implants/implant_loyality.dm index 84cdb16f379..0c4b5c44648 100644 --- a/code/game/objects/items/weapons/implants/implant_loyality.dm +++ b/code/game/objects/items/weapons/implants/implant_loyality.dm @@ -28,10 +28,8 @@ ticker.mode.remove_revolutionary(target.mind) if(target.mind in ticker.mode.cult) to_chat(target, "You feel the corporate tendrils of Nanotrasen try to invade your mind!") - else to_chat(target, "You feel a surge of loyalty towards Nanotrasen.") - return 1 return 0 @@ -39,7 +37,6 @@ if(..()) if(target.stat != DEAD && !silent) to_chat(target, "You feel a sense of liberation as Nanotrasen's grip on your mind fades away.") - return 1 return 0 diff --git a/code/game/objects/items/weapons/implants/implant_misc.dm b/code/game/objects/items/weapons/implants/implant_misc.dm index 24373783827..ae369138ebd 100644 --- a/code/game/objects/items/weapons/implants/implant_misc.dm +++ b/code/game/objects/items/weapons/implants/implant_misc.dm @@ -36,7 +36,6 @@ if(uses < 1) return 0 uses-- to_chat(imp_in, "You feel a sudden surge of energy!") - imp_in.SetStunned(0) imp_in.SetWeakened(0) imp_in.SetParalysis(0) diff --git a/code/game/objects/items/weapons/implants/implant_traitor.dm b/code/game/objects/items/weapons/implants/implant_traitor.dm index 464ae5f74d5..547206da29c 100644 --- a/code/game/objects/items/weapons/implants/implant_traitor.dm +++ b/code/game/objects/items/weapons/implants/implant_traitor.dm @@ -32,7 +32,6 @@ return 0 if(M == user) to_chat(user, "Making yourself loyal to yourself was a great idea! Perhaps even the best idea ever! Actually, you just feel like an idiot.") - if(isliving(user)) var/mob/living/L = user L.adjustBrainLoss(20) @@ -46,7 +45,6 @@ return -1 H.implanting = 1 to_chat(H, "You feel completely loyal to [user.name].") - if(!(user.mind in ticker.mode:implanter)) ticker.mode:implanter[ref] = list() implanters = ticker.mode:implanter[ref] @@ -58,7 +56,6 @@ ticker.mode.traitors += H.mind H.mind.special_role = "traitor" to_chat(H, "You're now completely loyal to [user.name]! You now must lay down your life to protect them and assist in their goals at any cost.") - var/datum/objective/protect/p = new p.owner = H.mind p.target = user:mind @@ -67,7 +64,6 @@ for(var/datum/objective/objective in H.mind.objectives) to_chat(H, "Objective #1: [objective.explanation_text]") - ticker.mode.update_traitor_icons_added(user.mind) ticker.mode.update_traitor_icons_added(H.mind)//handles datahuds/observerhuds diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm index 49a84275994..0820cc097c9 100644 --- a/code/game/objects/items/weapons/implants/implantchair.dm +++ b/code/game/objects/items/weapons/implants/implantchair.dm @@ -82,7 +82,6 @@ var/mob/M = G.affecting if(M.buckled_mob) to_chat(usr, "[M] will not fit into [src] because they have a slime latched onto their head.") - return if(put_mob(M)) qdel(G) @@ -110,11 +109,9 @@ /obj/machinery/implantchair/put_mob(mob/living/carbon/M) if(!iscarbon(M)) to_chat(usr, "The [src.name] cannot hold this!") - return if(src.occupant) to_chat(usr, "The [src.name] is already occupied!") - return if(M.client) M.client.perspective = EYE_PERSPECTIVE diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 866eee0cd80..2d7d3e0a956 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -34,7 +34,6 @@ if(imp.implant(M, user)) if (M == user) to_chat(user, "You implant yourself.") - else M.visible_message("[user] has implanted [M].", "[user] implants you.") imp = null diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm index 1c79613d34c..e89e5f737ed 100644 --- a/code/game/objects/items/weapons/implants/implantpad.dm +++ b/code/game/objects/items/weapons/implants/implantpad.dm @@ -28,7 +28,6 @@ return if(case) to_chat(user, "There's already an implant in the pad!") - return user.unEquip(C) C.forceMove(src) @@ -38,7 +37,6 @@ /obj/item/weapon/implantpad/proc/dropcase(mob/user as mob) if(!case) to_chat(user, "There's no implant in the pad!") - return if(user) if(user.put_in_hands(case)) diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm index 1899911ba7b..88c555d8148 100644 --- a/code/game/objects/items/weapons/legcuffs.dm +++ b/code/game/objects/items/weapons/legcuffs.dm @@ -32,7 +32,6 @@ /obj/item/weapon/legcuffs/bolas/suicide_act(mob/living/user) to_chat(viewers(user), "[user] is wrapping the [src.name] around \his neck! It looks like \he's trying to commit suicide.") - return(OXYLOSS) /obj/item/weapon/legcuffs/bolas/throw_at(var/atom/A, throw_range, throw_speed) @@ -41,7 +40,6 @@ var/mob/living/carbon/human/H = usr if((CLUMSY in H.mutations) && prob(50)) to_chat(H, "You smack yourself in the face while swinging the [src]!") - H.Stun(2) H.drop_item(src) return diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm index aef7bb1af73..3f19d6a494b 100644 --- a/code/game/objects/items/weapons/lighters.dm +++ b/code/game/objects/items/weapons/lighters.dm @@ -46,7 +46,6 @@ user.visible_message("After a few attempts, [user] manages to light the [src].") else to_chat(user, "You burn yourself while lighting the lighter.") - user.adjustFireLoss(5) user.visible_message("After a few attempts, [user] manages to light the [src], they however burn their finger in the process.") diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index b523813dcb7..e3c65c2f35b 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -17,7 +17,6 @@ /obj/item/weapon/melee/energy/attack_self(mob/living/carbon/user) if(user.disabilities & CLUMSY && prob(50)) to_chat(user, "You accidentally cut yourself with [src], like a doofus!") - user.take_organ_damage(5,5) active = !active if (active) @@ -33,7 +32,6 @@ w_class = w_class_on playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] is now active.") - else force = initial(force) throwforce = initial(throwforce) @@ -44,7 +42,6 @@ w_class = initial(w_class) playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -110,7 +107,6 @@ if(active && !(C.use(hitcost))) attack_self() to_chat(R, "It's out of charge!") - return ..() return @@ -157,12 +153,10 @@ if(istype(W, /obj/item/weapon/melee/energy/sword/saber)) if(W == src) to_chat(user, "You try to attach the end of the energy sword to... itself. You're not very smart, are you?") - if(ishuman(user)) user.adjustBrainLoss(10) else to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.") - var/obj/item/weapon/twohanded/dualsaber/newSaber = new /obj/item/weapon/twohanded/dualsaber(user.loc) if(src.hacked) // That's right, we'll only check the "original" esword. newSaber.hacked = 1 @@ -178,7 +172,6 @@ item_color = "rainbow" to_chat(user, "RNBW_ENGAGE") - if(active) icon_state = "swordrainbow" // Updating overlays, copied from welder code. @@ -191,7 +184,6 @@ else to_chat(user, "It's already fabulous!") - /obj/item/weapon/melee/energy/sword/pirate name = "energy cutlass" desc = "Arrrr matey." diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 821e5dbe886..cedb07273c6 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -18,7 +18,6 @@ /obj/item/weapon/melee/chainofcommand/suicide_act(mob/user) to_chat(viewers(user), "[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") - return (OXYLOSS) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 368f19dd0e7..15048ae13b5 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -94,7 +94,6 @@ afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params) var/angle = get_angle(A, user) // to_chat(world, angle) - angle = round(angle) + 45 if(angle > 180) angle -= 180 @@ -104,10 +103,8 @@ if(!angle) angle = 1 // to_chat(world, "adjusted [angle]") - icon_state = "[angle]" // to_chat(world, "[angle] [(get_dist(user, A) - 1)]") - user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15) /obj/item/weapon/newton diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm index 3ea41bc420e..7fad9cbbe5f 100644 --- a/code/game/objects/items/weapons/mop.dm +++ b/code/game/objects/items/weapons/mop.dm @@ -40,7 +40,6 @@ if(reagents.total_volume < 1) to_chat(user, "Your mop is dry!") - return var/turf/simulated/turf = A @@ -53,7 +52,6 @@ if(do_after(user, src.mopspeed, target = turf)) to_chat(user, "You finish mopping.") - clean(turf) @@ -70,7 +68,6 @@ /obj/item/weapon/mop/wash(mob/user, atom/source) reagents.add_reagent("water", 5) to_chat(user, "You wet [src] in [source].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) return 1 diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm index af2987a8dfc..9e8f68faa73 100644 --- a/code/game/objects/items/weapons/pneumaticCannon.dm +++ b/code/game/objects/items/weapons/pneumaticCannon.dm @@ -21,29 +21,24 @@ ..() if(!in_range(user, src)) to_chat(user, "You'll need to get closer to see any more.") - return for(var/obj/item/I in loadedItems) spawn(0) to_chat(user, "\icon [I] It has \the [I] loaded.") - if(tank) to_chat(user, "\icon [tank] It has \the [tank] mounted onto it.") - /obj/item/weapon/pneumatic_cannon/attackby(obj/item/weapon/W, mob/user, params) ..() if(istype(W, /obj/item/weapon/tank/) && !tank) if(istype(W, /obj/item/weapon/tank/emergency_oxygen)) to_chat(user, "\The [W] is too small for \the [src].") - return updateTank(W, 0, user) return 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.") - return if(istype(W, /obj/item/weapon/wrench)) switch(pressureSetting) @@ -54,29 +49,24 @@ if(3) pressureSetting = 1 to_chat(user, "You tweak \the [src]'s pressure output to [pressureSetting].") - return if(istype(W, /obj/item/weapon/screwdriver) && tank) updateTank(tank, 1, user) return if(loadedWeightClass >= maxWeightClass) to_chat(user, "\The [src] can't hold any more items!") - return if(istype(W, /obj/item)) var/obj/item/IW = W if((loadedWeightClass + IW.w_class) > maxWeightClass) to_chat(user, "\The [IW] won't fit into \the [src]!") - return if(IW.w_class > src.w_class) to_chat(user, "\The [IW] is too large to fit into \the [src]!") - return if(!user.unEquip(W)) return to_chat(user, "You load \the [IW] into \the [src].") - loadedItems.Add(IW) loadedWeightClass += IW.w_class IW.loc = src @@ -101,15 +91,12 @@ var/discharge = 0 if(!loadedItems || !loadedWeightClass) to_chat(user, "\The [src] has nothing loaded.") - return if(!tank) to_chat(user, "\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!") - return if(user && (CLUMSY in user.mutations) && prob(75)) user.visible_message("[user] loses their grip on [src], causing it to go off!", "[src] slips out of your hands and goes off!") @@ -160,19 +147,16 @@ if(!src.tank) return to_chat(user, "You detach \the [thetank] from \the [src].") - src.tank.loc = get_turf(user) user.put_in_hands(tank) src.tank = null if(!removing) if(src.tank) to_chat(user, "\The [src] already has a tank.") - return if(!user.unEquip(thetank)) return to_chat(user, "You hook \the [thetank] up to \the [src].") - src.tank = thetank thetank.loc = src src.update_icons() diff --git a/code/game/objects/items/weapons/power_cells.dm b/code/game/objects/items/weapons/power_cells.dm index e5733b50e38..0cb5e3c54ef 100644 --- a/code/game/objects/items/weapons/power_cells.dm +++ b/code/game/objects/items/weapons/power_cells.dm @@ -19,7 +19,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] is licking the electrodes of the [src.name]! It looks like \he's trying to commit suicide.") - return (FIRELOSS) /obj/item/weapon/stock_parts/cell/crap diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index faab7fbef35..589f91b8302 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -56,7 +56,6 @@ if(thearea.tele_proof && !istype(thearea, /area/wizard_station)) to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.") - return var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread() @@ -76,7 +75,6 @@ if(!L.len) to_chat(user, "The spell matrix was unable to locate a suitable teleport destination for an unknown reason. Sorry.") - return if(user && user.buckled) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index a3c221d376c..4add062aabc 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -47,7 +47,6 @@ continue G.attackby(NG, user) to_chat(user, "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.") - qdel(src) ..() @@ -57,7 +56,6 @@ if (M.incorporeal_move || M.flying)//you are incorporal or flying..no shard stepping! return to_chat(M, "\red You step on \the [src]!") - playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 08586e876f1..86345b677ca 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -71,7 +71,6 @@ /obj/item/weapon/shield/energy/attack_self(mob/living/carbon/human/user) if(user.disabilities & CLUMSY && prob(50)) to_chat(user, "You beat yourself in the head with [src].") - user.take_organ_damage(5) active = !active icon_state = "eshield[active]" @@ -83,7 +82,6 @@ w_class = 4 playsound(user, 'sound/weapons/saberon.ogg', 35, 1) to_chat(user, "[src] is now active.") - else force = 3 throwforce = 3 @@ -91,7 +89,6 @@ w_class = 1 playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -127,7 +124,6 @@ w_class = 4 slot_flags = SLOT_BACK to_chat(user, "You extend \the [src].") - else force = 3 throwforce = 3 @@ -135,7 +131,6 @@ w_class = 3 slot_flags = null to_chat(user, "[src] can now be concealed.") - if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user H.update_inv_l_hand() @@ -163,11 +158,9 @@ src.active = !( src.active ) if (src.active) to_chat(user, "\blue The cloaking device is now active.") - src.icon_state = "shield1" else to_chat(user, "\blue The cloaking device is now inactive.") - src.icon_state = "shield0" src.add_fingerprint(user) return diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm index 3c9a45fa59d..961547d362f 100644 --- a/code/game/objects/items/weapons/soap.dm +++ b/code/game/objects/items/weapons/soap.dm @@ -29,12 +29,10 @@ if(user.client && (target in user.client.screen)) to_chat(user, "You need to take that [target.name] off before 'cleaning' it.") - else user.visible_message("[user] begins to smear [src] on \the [target.name].") if(do_after(user, src.cleanspeed, target = target)) to_chat(user, "You 'clean' \the [target.name].") - if(istype(target, /turf/simulated)) new /obj/effect/decal/cleanable/blood/gibs/cleangibs(target) else if (istype(target,/mob/living/carbon)) diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm index 5b6149f159f..e36bed7a473 100644 --- a/code/game/objects/items/weapons/staff.dm +++ b/code/game/objects/items/weapons/staff.dm @@ -30,7 +30,6 @@ user.flying = wielded ? 1 : 0 if(wielded) to_chat(user, "You hold \the [src] between your legs.") - user.say("QUID 'ITCH") animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING) else @@ -43,7 +42,6 @@ if(wielded) to_chat(user, "You hold \the [src] between your legs.") - /obj/item/weapon/twohanded/staff/broom/attackby(var/obj/O, mob/user) if(istype(O, /obj/item/clothing/mask/horsehead)) new/obj/item/weapon/twohanded/staff/broom/horsebroom(get_turf(src)) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index bfdeef880fa..6c59e98385f 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -43,7 +43,6 @@ attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(crit_fail) to_chat(user, "\red The Bluespace generator isn't working.") - return else if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) var/response = alert(user, "Are you sure you want to put the bag of holding inside another bag of holding?","Are you sure you want to die?","Yes","No") @@ -68,10 +67,8 @@ if (prob(src.reliability)) to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure - else to_chat(user, "\red The Bluespace generator malfunctions!") - for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 707a5d06bec..350bf9c5e7a 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -94,7 +94,6 @@ if(slot==slot_head && contents.len) to_chat(M, "\red You need to empty the bag first!") - return 0 return ..() @@ -228,7 +227,6 @@ if(!istype(W,/obj/item/stack/sheet) || istype(W,/obj/item/stack/sheet/mineral/sandstone) || istype(W,/obj/item/stack/sheet/wood)) if(!stop_messages) to_chat(usr, "The snatcher does not accept [W].") - return 0 //I don't care, but the existing code rejects them for not being "sheets" *shrug* -Sayu var/current = 0 for(var/obj/item/stack/sheet/S in contents) @@ -236,7 +234,6 @@ if(capacity == current)//If it's full, you're done if(!stop_messages) to_chat(usr, "\red The snatcher is full.") - return 0 return 1 diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index af1e97bcd6a..daefa0db457 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -415,10 +415,8 @@ if (prob(src.reliability)) to_chat(user, "\red The Bluespace portal resists your attempt to add another item.")//light failure - else to_chat(user, "\red The Bluespace generator malfunctions!") - for (var/obj/O in src.contents) //it broke, delete what was in it qdel(O) crit_fail = 1 @@ -494,7 +492,6 @@ if (istype(target, /turf/unsimulated) || istype(target, /turf/simulated/shuttle) || istype(target, /obj/item/weapon/storage) || istype(target, /obj/structure/table) || istype(target, /obj/structure/closet)) return to_chat(user, "Planting explosives...") - user.visible_message("[user.name] is fiddling with their toolbelt.") if(ismob(target)) user.attack_log += "\[[time_stamp()]\] [user.real_name] tried planting [name] on [target:real_name] ([target:ckey])" @@ -513,7 +510,6 @@ user.visible_message("\red [user.name] finished planting an explosive on [target.name]!") target.overlays += image('icons/obj/assemblies.dmi', "plastic-explosive2") to_chat(user, "You sacrifice your belt for the sake of justice. Timer counting down from 15.") - spawn(150) if(target) if(ismob(target) || isobj(target)) diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm index 7ba74274c59..3fa521a7451 100644 --- a/code/game/objects/items/weapons/storage/bible.dm +++ b/code/game/objects/items/weapons/storage/bible.dm @@ -10,7 +10,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] stares into [src.name] and attempts to trascend understanding of the universe!") - return (user.dust()) @@ -55,17 +54,14 @@ if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey") to_chat(user, "\red You don't have the dexterity to do this!") - return if(!chaplain) to_chat(user, "\red The book sizzles in your hands.") - user.take_organ_damage(0,10) return if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "\red The [src] slips out of your hand and hits your head.") - user.take_organ_damage(10) user.Paralyse(20) return @@ -76,22 +72,18 @@ if (M.stat !=2) /*if((M.mind in ticker.mode.cult) && (prob(20))) to_chat(M, "\red The power of [src.deity_name] clears your mind of heresy!") - to_chat(user, "\red You see how [M]'s eyes become clear, the cult no longer holds control over him!") - ticker.mode.remove_cultist(M.mind)*/ if ((istype(M, /mob/living/carbon/human) && prob(60))) bless(M) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] heals [] with the power of [src.deity_name]!", user, M), 1) to_chat(M, "\red May the power of [src.deity_name] compel you to be healed!") - playsound(src.loc, "punch", 25, 1, -1) else if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet)) M.adjustBrainLoss(10) to_chat(M, "\red You feel dumber.") - for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] beats [] over the head with []!", user, M, src), 1) playsound(src.loc, "punch", 25, 1, -1) @@ -106,19 +98,16 @@ return if (istype(A, /turf/simulated/floor)) to_chat(user, "You hit the floor with the bible.") - if(user.mind && (user.mind.assigned_role == "Chaplain")) call(/obj/effect/rune/proc/revealrunes)(src) if(user.mind && (user.mind.assigned_role == "Chaplain")) if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder to_chat(user, "You bless [A].") - var/water2holy = A.reagents.get_reagent_amount("water") A.reagents.del_reagent("water") A.reagents.add_reagent("holywater",water2holy) if(A.reagents && A.reagents.has_reagent("unholywater")) //yeah yeah, copy pasted code - sue me to_chat(user, "You purify [A].") - var/unholy2clean = A.reagents.get_reagent_amount("unholywater") A.reagents.del_reagent("unholywater") A.reagents.add_reagent("holywater",unholy2clean) diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm index a1cada9b549..31ead836204 100644 --- a/code/game/objects/items/weapons/storage/fancy.dm +++ b/code/game/objects/items/weapons/storage/fancy.dm @@ -30,16 +30,13 @@ if(contents.len <= 0) to_chat(user, "There are no [src.icon_type]s left in the box.") - else if(contents.len == 1) to_chat(user, "There is one [src.icon_type] left in the box.") - else to_chat(user, "There are [src.contents.len] [src.icon_type]s in the box.") - /* * Donut Box */ @@ -146,11 +143,9 @@ switch(W:colourName) if("mime") to_chat(usr, "This crayon is too sad to be contained in this box.") - return if("rainbow") to_chat(usr, "This crayon is too powerful to be contained in this box.") - return ..() @@ -223,13 +218,11 @@ lace_cigarette(C) user.equip_to_slot_if_possible(C, slot_wear_mask) to_chat(user, "You take \a [C.name] out of the pack.") - update_icon() got_cig = 1 break if(!got_cig) to_chat(user, "There are no smokables in the pack!") - else ..() @@ -239,14 +232,12 @@ if(M.lit == 1) if(!stop_messages) to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.") - return 0 if(istype(W, /obj/item/weapon/lighter)) var/obj/item/weapon/lighter/L = W if(L.lit == 1) if(!stop_messages) to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.") - return 0 //if we get this far, handle the insertion checks as normal .=..() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index c87af060e4f..a11d00dbccd 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -249,10 +249,8 @@ var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text)) if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.") - else to_chat(user, "You set the label to \"[tmp_label]\".") - label_text = tmp_label update_name_label() else diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index 9ce695a7012..1dde63d198a 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -21,24 +21,20 @@ if (istype(W, /obj/item/weapon/card/id)) if(src.broken) to_chat(user, "\red It appears to be broken.") - return if(src.allowed(user)) src.locked = !( src.locked ) if(src.locked) src.icon_state = src.icon_locked to_chat(user, "\red You lock the [src.name]!") - return else src.icon_state = src.icon_closed to_chat(user, "\red You unlock the [src.name]!") - origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return else to_chat(user, "\red Access Denied") - else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) return @@ -46,14 +42,12 @@ ..() else to_chat(user, "\red Its locked!") - return show_to(mob/user as mob) if(locked) to_chat(user, "\red Its locked!") - else ..() return @@ -63,7 +57,6 @@ return ..() if(!stop_messages) to_chat(usr, "[src] is locked!") - return 0 /obj/item/weapon/storage/lockbox/emag_act(user as mob) @@ -73,7 +66,6 @@ desc = "It appears to be broken." icon_state = src.icon_broken to_chat(user, "You unlock \the [src].") - origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. return diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm index 1a68163cbd7..59fac1b18c4 100644 --- a/code/game/objects/items/weapons/storage/secure.dm +++ b/code/game/objects/items/weapons/storage/secure.dm @@ -31,7 +31,6 @@ if(..(user, 1)) to_chat(user, text("The service panel is [src.open ? "open" : "closed"].")) - attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(locked) if ((istype(W, /obj/item/weapon/melee/energy/blade)) && (!src.emagged)) @@ -80,10 +79,8 @@ playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1) playsound(src.loc, "sparks", 50, 1) to_chat(user, "You slice through the lock on [src].") - else to_chat(user, "You short out the lock on [src].") - return @@ -148,7 +145,6 @@ return ..() if(!stop_messages) to_chat(usr, "[src] is locked!") - return 0 /obj/item/weapon/storage/secure/hear_talk(mob/living/M as mob, msg) @@ -177,7 +173,6 @@ attack_hand(mob/user as mob) if ((src.loc == user) && (src.locked == 1)) to_chat(usr, "\red [src] is locked and cannot be opened!") - else if ((src.loc == user) && (!src.locked)) playsound(src.loc, "rustle", 50, 1, -5) if (user.s_active) diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index 8eeeadea09c..d92ad2399b2 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -236,7 +236,6 @@ if(contents.len >= storage_slots) if(!stop_messages) to_chat(usr, "[W] won't fit in [src], make some space!") - return 0 //Storage item is full if(can_hold.len) @@ -250,20 +249,17 @@ if (istype(W, /obj/item/weapon/hand_labeler)) return 0 to_chat(usr, "[src] cannot hold [W].") - return 0 for(var/A in cant_hold) //Check for specific items which this container can't hold. if(istype(W, text2path(A) )) if(!stop_messages) to_chat(usr, "[src] cannot hold [W].") - return 0 if (W.w_class > max_w_class) if(!stop_messages) to_chat(usr, "[W] is too big for this [src].") - return 0 var/sum_w_class = W.w_class @@ -273,19 +269,16 @@ if(sum_w_class > max_combined_w_class) if(!stop_messages) to_chat(usr, "[src] is full, make some space.") - return 0 if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage))) if(!istype(src, /obj/item/weapon/storage/backpack/holding)) //bohs should be able to hold backpacks again. The override for putting a boh in a boh is in backpack.dm. if(!stop_messages) to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") - return 0 //To prevent the stacking of same sized storage items. if(W.flags & NODROP) //SHOULD be handled in unEquip, but better safe than sorry. to_chat(usr, "\the [W] is stuck to your hand, you can't put it in \the [src]") - return 0 return 1 @@ -314,7 +307,6 @@ for(var/mob/M in viewers(usr, null)) if (M == usr) to_chat(usr, "You put the [W] into [src].") - else if (M in range(1)) //If someone is standing close enough, they can tell what it is... M.show_message("[usr] puts [W] into [src].") else if (W && W.w_class >= 3.0) //Otherwise they can only see large or normal items from a distance... @@ -368,7 +360,6 @@ if(isrobot(user)) to_chat(user, "\blue You're a robot. No.") - return 1//Robots can't interact with storage items. if(!can_be_inserted(W)) @@ -416,12 +407,10 @@ switch (collection_mode) if(1) to_chat(usr, "[src] now picks up all items in a tile at once.") - if(0) to_chat(usr, "[src] now picks up one item at a time.") - /obj/item/weapon/storage/verb/quick_empty() set name = "Empty Contents" set category = "Object" @@ -509,7 +498,6 @@ return // Now make the cardboard to_chat(user, "You fold [src] flat.") - new src.foldable(get_turf(src)) qdel(src) //BubbleWrap END diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm index a760475b9de..22e46163fa3 100644 --- a/code/game/objects/items/weapons/storage/toolbox.dm +++ b/code/game/objects/items/weapons/storage/toolbox.dm @@ -19,7 +19,6 @@ ..() if (src.type == /obj/item/weapon/storage/toolbox) to_chat(world, "BAD: [src] ([src.type]) spawned at [src.x] [src.y] [src.z]") - qdel(src) /obj/item/weapon/storage/toolbox/emergency diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index d180686998a..db834beeb45 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -56,28 +56,23 @@ ..(user) if(bcell) to_chat(user, "The baton is [round(bcell.percent())]% charged.") - if(!bcell) to_chat(user, "The baton does not have a power source installed.") - /obj/item/weapon/melee/baton/attackby(obj/item/weapon/W, mob/user, params) if(istype(W, /obj/item/weapon/stock_parts/cell)) var/obj/item/weapon/stock_parts/cell/C = W if(bcell) to_chat(user, "[src] already has a cell.") - else if(C.maxcharge < hitcost) to_chat(user, "[src] requires a higher capacity cell.") - return if(!user.unEquip(W)) return W.loc = src bcell = W to_chat(user, "You install a cell in [src].") - update_icon() else if(istype(W, /obj/item/weapon/screwdriver)) @@ -86,7 +81,6 @@ bcell.loc = get_turf(src.loc) bcell = null to_chat(user, "You remove the cell from the [src].") - status = 0 update_icon() return @@ -97,16 +91,13 @@ if(bcell && bcell.charge > hitcost) status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") - playsound(loc, "sparks", 75, 1, -1) else status = 0 if(!bcell) to_chat(user, "[src] does not have a power source!") - else to_chat(user, "[src] is out of charge.") - update_icon() add_fingerprint(user) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index ae942d0df41..63346476021 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -11,10 +11,8 @@ */ /obj/item/weapon/banhammer/attack(mob/M as mob, mob/user as mob) to_chat(M, " You have been banned FOR NO REISIN by [user]") - to_chat(user, " You have BANNED [M]") - /* * Classic Baton */ @@ -36,7 +34,6 @@ add_fingerprint(user) if((CLUMSY in user.mutations) && prob(50)) to_chat(user, "You club yourself over the head.") - user.Weaken(3 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -88,7 +85,6 @@ on = !on if(on) to_chat(user, "You extend the baton.") - icon_state = "telebaton_1" item_state = "nullrod" w_class = 4 //doesnt fit in backpack when its on for balance @@ -96,7 +92,6 @@ attack_verb = list("smacked", "struck", "cracked", "beaten") else to_chat(user, "You collapse the baton.") - icon_state = "telebaton_0" item_state = null //no sprite for concealment even when in hand slot_flags = SLOT_BELT diff --git a/code/game/objects/items/weapons/table_rack_parts.dm b/code/game/objects/items/weapons/table_rack_parts.dm index 6a1d65af07d..61c58ce9aa5 100644 --- a/code/game/objects/items/weapons/table_rack_parts.dm +++ b/code/game/objects/items/weapons/table_rack_parts.dm @@ -58,13 +58,11 @@ if (W:amount >= 4) new /obj/item/weapon/table_parts/reinforced( user.loc ) to_chat(user, "\blue You reinforce the [name].") - W:use(4) qdel(src) else if (W:amount < 4) to_chat(user, "\red You need at least four rods to do this.") - /obj/item/weapon/table_parts/attack_self(mob/user as mob) new /obj/structure/table( user.loc ) user.drop_item() diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm index 4d4e13324b1..68fe80fdbfb 100644 --- a/code/game/objects/items/weapons/tanks/jetpack.dm +++ b/code/game/objects/items/weapons/tanks/jetpack.dm @@ -30,7 +30,6 @@ if(air_contents.oxygen < 10) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) - playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -39,7 +38,6 @@ set category = "Object" src.stabilization_on = !( src.stabilization_on ) to_chat(usr, "You toggle the stabilization [stabilization_on? "on":"off"].") - return @@ -136,7 +134,6 @@ if(air_contents.carbon_dioxide < 10) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) - playsound(user, 'sound/effects/alert.ogg', 50, 1) @@ -146,7 +143,6 @@ /obj/item/weapon/tank/jetpack/rig/examine() to_chat(usr, "It's a jetpack. If you can see this, report it on the bug tracker.") - return 0 /obj/item/weapon/tank/jetpack/rig/allow_thrust(num, mob/living/user as mob) diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 18de0bc0e7f..6767b88ac0d 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -27,7 +27,6 @@ if(..(user, 0)) if(air_contents.oxygen < 10) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) - //playsound(usr, 'sound/effects/alert.ogg', 50, 1) @@ -73,10 +72,8 @@ if(..(user, 0)) if(air_contents.oxygen < 1 && loc==usr) to_chat(user, "\red The meter on the [src.name] indicates you are almost out of air!") - to_chat(user, sound('sound/effects/alert.ogg')) - /obj/item/weapon/tank/air/New() ..() @@ -127,10 +124,8 @@ if(..(user, 0)) if(air_contents.toxins < 0.2 && loc==usr) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of plasma!")) - to_chat(user, sound('sound/effects/alert.ogg')) - /* * Emergency Oxygen */ @@ -156,10 +151,8 @@ if(..(user, 0)) if(air_contents.oxygen < 0.2 && loc==usr) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) - to_chat(user, sound('sound/effects/alert.ogg')) - /obj/item/weapon/tank/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" icon_state = "emergency_engi" @@ -199,7 +192,6 @@ if(..(user, 0)) if(air_contents.nitrogen < 10) to_chat(user, text("\red The meter on the [src.name] indicates you are almost out of air!")) - //playsound(usr, 'sound/effects/alert.ogg', 50, 1) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 9565cb736ab..46342d78a99 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -46,7 +46,6 @@ if (!in_range(src, user)) if (icon == src) to_chat(user, "\blue It's \a \icon[icon][src]! If you want any more information you'll need to get closer.") - return var/celsius_temperature = src.air_contents.temperature-T0C @@ -67,7 +66,6 @@ to_chat(user, "\blue \The \icon[icon][src] feels [descriptive]") - return /obj/item/weapon/tank/blob_act() @@ -170,7 +168,6 @@ location.internal = null location.internals.icon_state = "internal0" to_chat(usr, "\blue You close the tank release valve.") - if (location.internals) location.internals.icon_state = "internal0" else @@ -186,13 +183,11 @@ if(can_open_valve) location.internal = src to_chat(usr, "\blue You open \the [src] valve.") - if (location.internals) location.internals.icon_state = "internal1" else to_chat(usr, "\blue You need something to connect to \the [src].") - src.add_fingerprint(usr) return 1 @@ -239,7 +234,6 @@ message_admins("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] (JMP)") log_game("Explosive tank rupture! last key to touch the tank was [src.fingerprintslast] at [x], [y], [z]") // to_chat(world, "\blue[x],[y] tank is exploding: [pressure] kPa") - //Give the gas a chance to build up more pressure through reacting air_contents.react() air_contents.react() @@ -250,7 +244,6 @@ // to_chat(world, "\blue Exploding Pressure: [pressure] kPa, intensity: [range]") - explosion(epicenter, round(range*0.25), round(range*0.5), round(range), round(range*1.5)) if(istype(src.loc,/obj/item/device/transfer_valve)) qdel(src.loc) @@ -259,7 +252,6 @@ else if(pressure > TANK_RUPTURE_PRESSURE) // to_chat(world, "\blue[x],[y] tank is rupturing: [pressure] kPa, integrity [integrity]") - if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) @@ -272,7 +264,6 @@ else if(pressure > TANK_LEAK_PRESSURE) // to_chat(world, "\blue[x],[y] tank is leaking: [pressure] kPa, integrity [integrity]") - if(integrity <= 0) var/turf/simulated/T = get_turf(src) if(!T) diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm index 4d15aba974c..cbe3cdde29d 100644 --- a/code/game/objects/items/weapons/tanks/watertank.dm +++ b/code/game/objects/items/weapons/tanks/watertank.dm @@ -27,7 +27,6 @@ set category = "Object" if (usr.get_item_by_slot(slot_back) != src) to_chat(usr, "The watertank needs to be on your back to use.") - return if(usr.incapacitated()) return @@ -42,7 +41,6 @@ if(!user.put_in_hands(noz)) on = 0 to_chat(user, "You need a free hand to hold the mister.") - return noz.loc = user else @@ -128,7 +126,6 @@ /obj/item/weapon/reagent_containers/spray/mister/dropped(mob/user as mob) to_chat(user, "The mister snaps back onto the watertank.") - tank.on = 0 loc = tank @@ -180,7 +177,6 @@ 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.") - //ATMOS FIRE FIGHTING BACKPACK #define EXTINGUISHER 0 @@ -245,25 +241,21 @@ nozzle_mode = NANOFROST tank.icon_state = "waterbackpackatmos_1" to_chat(user, "Swapped to nanofrost launcher") - return if(NANOFROST) nozzle_mode = METAL_FOAM tank.icon_state = "waterbackpackatmos_2" to_chat(user, "Swapped to metal foam synthesizer") - return if(METAL_FOAM) nozzle_mode = EXTINGUISHER tank.icon_state = "waterbackpackatmos_0" to_chat(user, "Swapped to water extinguisher") - return return /obj/item/weapon/extinguisher/mini/nozzle/dropped(mob/user as mob) to_chat(user, "The nozzle snaps back onto the tank!") - tank.on = 0 loc = tank @@ -280,11 +272,9 @@ var/datum/reagents/R = reagents if(R.total_volume < 100) to_chat(user, "You need at least 100 units of water to use the nanofrost launcher!") - return if(nanofrost_cooldown) to_chat(user, "Nanofrost launcher is still recharging") - return nanofrost_cooldown = 1 R.remove_any(100) @@ -311,7 +301,6 @@ metal_synthesis_cooldown-- else to_chat(user, "Metal foam mix is still being synthesized.") - return /obj/effect/nanofrost_container diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm index 2eed4d02cef..a6c7841e020 100644 --- a/code/game/objects/items/weapons/tape.dm +++ b/code/game/objects/items/weapons/tape.dm @@ -16,7 +16,6 @@ /obj/item/stack/tape_roll/attack_self(mob/user as mob) to_chat(user, "You remove a length of tape from [src].") - var/obj/item/weapon/ducttape/tape = new() user.put_in_hands(tape) */ @@ -74,7 +73,6 @@ to_chat(user, "You remove \the [initial(name)] from [stuck].") - user.unEquip(src) stuck.forceMove(get_turf(src)) user.put_in_hands(stuck) diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm index f0ecceabfe8..99567b5952a 100644 --- a/code/game/objects/items/weapons/teleportation.dm +++ b/code/game/objects/items/weapons/teleportation.dm @@ -50,7 +50,6 @@ Frequency: var/turf/current_location = get_turf(usr)//What turf is the user on? if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2. to_chat(usr, "\The [src] is malfunctioning.") - return 1 if (href_list["refresh"]) @@ -110,7 +109,6 @@ Frequency: var/turf/current_location = get_turf(user)//What turf is the user on? if(!current_location||(current_location.z in config.admin_levels)||current_location.z>=7)//If turf was not found or they're on z level 2 or >7 which does not currently exist. to_chat(user, "\The [src] is malfunctioning.") - return var/list/L = list( ) for(var/obj/machinery/computer/teleporter/com in world) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 8b5c0e3be2f..a187dc09b65 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -175,7 +175,6 @@ if(..(user, 0)) to_chat(user, "It contains [get_fuel()] unit\s of fuel out of [max_fuel].") - /obj/item/weapon/weldingtool/suicide_act(mob/user) user.visible_message("[user] welds \his every orifice closed! It looks like \he's trying to commit suicide..") return (FIRELOSS) @@ -250,15 +249,12 @@ user.visible_message("\The [user] patches some dents on \the [M]'s [S.name] with \the [src].") else if(S.open != 2) to_chat(user, "Need more welding fuel!") - return 1 else to_chat(user, "The damage is far too severe to patch over externally.") - return 1 else if(S.open != 2) to_chat(user, "Nothing to fix!") - else return ..() @@ -268,7 +264,6 @@ if(!welding) O.reagents.trans_to(src, max_fuel) to_chat(user, "[src] refueled.") - playsound(src.loc, 'sound/effects/refill.ogg', 50, 1, -6) update_icon() return @@ -276,7 +271,6 @@ message_admins("[key_name_admin(user)] triggered a fueltank explosion.") log_game("[key_name(user)] triggered a fueltank explosion.") to_chat(user, "That was stupid of you.") - O.ex_act() return @@ -310,7 +304,6 @@ else if(M) to_chat(M, "\blue You need more welding fuel to complete this task.") - return 0 //Returns whether or not the welding tool is currently on. @@ -335,13 +328,11 @@ /obj/item/weapon/weldingtool/proc/toggle(mob/user, message = 0) if(!status) to_chat(user, "[src] can't be turned on while unsecured!") - return welding = !welding if(welding) if(get_fuel() >= 1) to_chat(user, "You switch [src] on.") - force = 15 damtype = "fire" hitsound = 'sound/items/welder.ogg' @@ -349,15 +340,12 @@ processing_objects |= src else to_chat(user, "You need more fuel!") - welding = 0 else if(!message) to_chat(user, "You switch [src] off.") - else to_chat(user, "[src] shuts off!") - force = 3 damtype = "brute" hitsound = "swing_hit" @@ -366,15 +354,12 @@ /obj/item/weapon/weldingtool/proc/flamethrower_screwdriver(obj/item/I, mob/user) if(welding) to_chat(user, "Turn it off first!") - return status = !status if(status) to_chat(user, "You resecure [src].") - else to_chat(user, "[src] can now be attached and modified.") - add_fingerprint(user) /obj/item/weapon/weldingtool/proc/flamethrower_rods(obj/item/I, mob/user) @@ -388,11 +373,9 @@ F.weldtool = src add_fingerprint(user) to_chat(user, "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!") - return /obj/item/weapon/weldingtool/largetank @@ -510,5 +493,4 @@ attack_self(mob/user as mob) open = !open to_chat(user, "\blue You [open?"open" : "close"] the conversion kit.") - update_icon() diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 26444e0cef2..0e4f49de46a 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -44,10 +44,8 @@ user.update_inv_l_hand() if(isrobot(user)) to_chat(user, "You free up your module.") - else to_chat(user, "You are now carrying the [name] with one hand.") - if(unwieldsound) playsound(loc, unwieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = user.get_inactive_hand() @@ -61,11 +59,9 @@ var/mob/living/carbon/human/H = user if(H.species.is_small) to_chat(user, "It's too heavy for you to wield fully.") - return if(user.get_inactive_hand()) to_chat(user, "You need your other hand to be empty!") - return wielded = 1 force = force_wielded @@ -76,10 +72,8 @@ user.update_inv_l_hand() if(isrobot(user)) to_chat(user, "You dedicate your module to [name].") - else to_chat(user, "You grab the [name] with both hands.") - if (wieldsound) playsound(loc, wieldsound, 50, 1) var/obj/item/weapon/twohanded/offhand/O = new(user) ////Let's reserve his other hand~ @@ -92,7 +86,6 @@ //Cannot equip wielded items. if(wielded) to_chat(M, "Unwield the [name] first!") - return 0 return ..() @@ -146,7 +139,6 @@ /obj/item/weapon/twohanded/required/mob_can_equip(M as mob, slot) if(wielded) to_chat(M, "[src.name] is too cumbersome to carry with anything but your hands!") - return 0 return ..() @@ -233,7 +225,6 @@ ..() if((CLUMSY in user.mutations) && (wielded) &&prob(40)) to_chat(user, "\red You twirl around a bit before losing your balance and impaling yourself on the [src].") - user.take_organ_damage(20,25) return if((wielded) && prob(50)) @@ -278,13 +269,11 @@ if(hacked == 0) hacked = 1 to_chat(user, "2XRNBW_ENGAGE") - blade_color = "rainbow" update_icon() else to_chat(user, "It's starting to look like a triple rainbow - no, nevermind.") - //spears /obj/item/weapon/twohanded/spear icon_state = "spearglass0" @@ -313,7 +302,6 @@ /obj/item/weapon/organ/head/attackby(var/obj/item/weapon/W, var/mob/living/user, params) if(istype(W, /obj/item/weapon/twohanded/spear)) to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") - var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() src.transform = M @@ -329,7 +317,6 @@ /obj/item/weapon/twohanded/spear/attackby(var/obj/item/I, var/mob/living/user) if(istype(I, /obj/item/weapon/organ/head)) to_chat(user, "You stick the head onto the spear and stand it upright on the ground.") - var/obj/structure/headspear/HS = new /obj/structure/headspear(user.loc) var/matrix/M = matrix() I.transform = M diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm index 13a1d15860e..9f22daf08f8 100644 --- a/code/game/objects/items/weapons/vending_items.dm +++ b/code/game/objects/items/weapons/vending_items.dm @@ -24,11 +24,9 @@ ..(user) if(charges) to_chat(user, "It can restock [charges] item(s).") - else to_chat(user, "It's empty!") - //NOTE I decided to go for about 1/3 of a machine's capacity /obj/item/weapon/vending_refill/boozeomat diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index f3453803635..57e22a3eef4 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -13,7 +13,6 @@ /obj/item/weapon/banhammer/suicide_act(mob/user) to_chat(viewers(user), "[user] is hitting \himself with the [src.name]! It looks like \he's trying to ban \himself from life.") - return (BRUTELOSS|FIRELOSS|TOXLOSS|OXYLOSS) /obj/item/weapon/nullrod @@ -33,7 +32,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") - return (BRUTELOSS|FIRELOSS) /obj/item/weapon/nullrod/attack(mob/M as mob, mob/living/user as mob) //Paste from old-code to decult with a null rod. @@ -50,7 +48,6 @@ if ((CLUMSY in user.mutations) && prob(50)) to_chat(user, "\red The rod slips out of your hand and hits your head.") - user.take_organ_damage(10) user.Paralyse(20) return @@ -60,7 +57,6 @@ if(ishuman(M)) if(!M.mind.vampire.get_ability(/datum/vampire_passive/full)) to_chat(M, "The nullrod's power interferes with your own!") - M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) ..() @@ -72,7 +68,6 @@ if(!transformed) // can't turn a sword into a sword. var/obj/item/S = new transform_into() to_chat(user, "You sheath the [src] into the [I]'s scabbard, transforming it into \a [S].") - user.unEquip(src) qdel(src) user.put_in_hands(S) @@ -104,7 +99,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] is impaling \himself with the [src.name]! It looks like \he's trying to commit suicide.") - return(BRUTELOSS) /obj/item/weapon/sord/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob) @@ -131,7 +125,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] is falling on the [src.name]! It looks like \he's trying to commit suicide.") - return(BRUTELOSS) /obj/item/weapon/claymore/ceremonial @@ -155,7 +148,6 @@ suicide_act(mob/user) to_chat(viewers(user), "[user] is slitting \his stomach open with the [src.name]! It looks like \he's trying to commit seppuku.") - return(BRUTELOSS) /obj/item/weapon/katana/IsShield() @@ -201,7 +193,6 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.put_in_hands(S) to_chat(user, "You fasten the glass shard to the top of the rod with the cable.") - qdel(I) qdel(src) @@ -214,7 +205,6 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params) user.put_in_hands(P) to_chat(user, "You fasten the wirecutters to the top of the rod with the cable, prongs outward.") - qdel(I) qdel(src) diff --git a/code/game/objects/items/weapons/whetstone.dm b/code/game/objects/items/weapons/whetstone.dm index 009262c39ce..d19c411899f 100644 --- a/code/game/objects/items/weapons/whetstone.dm +++ b/code/game/objects/items/weapons/whetstone.dm @@ -14,34 +14,27 @@ /obj/item/weapon/whetstone/attackby(obj/item/I, mob/user, params) if(used) to_chat(user, "The whetstone 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.") - return if(requires_sharpness && !I.edge) to_chat(user, "You can only sharpen items that are already sharp, such as knives.") - return if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff var/obj/item/weapon/twohanded/TH = I if(TH.force_wielded >= max) to_chat(user, "[TH] is much too powerful to sharpen further.") - return if(TH.wielded) to_chat(user, "[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.") - 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.") - return user.visible_message("[user] sharpens [I] with [src]!", "You sharpen [I], making it much more deadly than before.") if(!requires_sharpness) diff --git a/code/game/objects/items/weapons/wires.dm b/code/game/objects/items/weapons/wires.dm index 98c2565cf72..abae807c80a 100644 --- a/code/game/objects/items/weapons/wires.dm +++ b/code/game/objects/items/weapons/wires.dm @@ -13,7 +13,6 @@ suicide_act(mob/user) to_chat(viewers(user), "\red [user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.") - return (OXYLOSS) @@ -30,10 +29,8 @@ if (src.laying) src.laying = 0 to_chat(user, "\blue You're done laying wire!") - else to_chat(user, "\blue You are not using this to lay wire...") - return diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index f9883fa1c9c..952a647f3aa 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -69,12 +69,10 @@ for(var/obj/O in range(0, src)) if(O.density == 1 && O != src && !istype(O, /obj/machinery/door/window)) //Ignores windoors, as those already block climbing, otherwise a windoor on the opposite side of a table would prevent climbing. to_chat(user, "\red You cannot climb [src], as it is blocked by \a [O]!") - return for(var/turf/T in range(0, src)) if(T.density == 1) to_chat(user, "\red You cannot climb [src], as it is blocked by \a [T]!") - return var/turf/T = src.loc if(!T || !istype(T)) return @@ -112,14 +110,12 @@ M.Weaken(5) to_chat(M, "\red You topple as \the [src] moves under you!") - if(prob(25)) var/damage = rand(15,30) var/mob/living/carbon/human/H = M if(!istype(H)) to_chat(H, "\red You land heavily!") - M.adjustBruteLoss(damage) return @@ -139,13 +135,11 @@ if(affecting) to_chat(M, "\red You land heavily on your [affecting.name]!") - affecting.take_damage(damage, 0) if(affecting.parent) affecting.parent.add_autopsy_data("Misadventure", damage) else to_chat(H, "\red You land heavily!") - H.adjustBruteLoss(damage) H.UpdateDamageIcon() @@ -159,13 +153,11 @@ return 0 if (user.restrained() || user.buckled) to_chat(user, "You need your hands and legs free for this.") - return 0 if (user.stat || user.paralysis || user.sleeping || user.lying || user.weakened) return 0 if (issilicon(user)) to_chat(user, "You need hands for this.") - return 0 return 1 diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 060da01f5e5..9251890dc6e 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -140,10 +140,8 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] if(in_range(user, src) && get_turf(src) && user.client && ishuman(user)) //Let only humans be the robust zoominators. I'm too spooked other mobs trying to use it may get broken huds. if(src.loc == user || get_turf(src) == get_turf(user)) to_chat(user, "[src] has to be on the ground to focus on it!") - return to_chat(user, "You focus on \the [src].") - user.client.screen = list() //This is because screen objects go way past the view bounds we set, therefore not allowing stretch to fit to zoom in properly. user.client.reset_stretch = winget(user.client, "mapwindow.map", "icon-size") //Remember previous icon-size user.client.view = 3 //Decrease view @@ -152,5 +150,4 @@ var/global/list/globalBlankCanvases[AMT_OF_CANVASES] else to_chat(user, "It is too far away.") - #undef AMT_OF_CANVASES \ No newline at end of file diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index e70050d348a..a1b4c51d702 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -51,11 +51,9 @@ /obj/structure/sign/barsign/attack_hand(mob/user as mob) if (!src.allowed(user)) to_chat(user, "Access denied.") - return if (broken) to_chat(user, "The controls seem unresponsive.") - return pick_sign() @@ -65,17 +63,14 @@ /obj/structure/sign/barsign/attackby(var/obj/item/I, var/mob/user) if(!allowed(user)) to_chat(user, "Access denied.") - return if( istype(I, /obj/item/weapon/screwdriver)) if(!panel_open) to_chat(user, "You open the maintenance panel.") - set_sign(new /datum/barsign/hiddensigns/signoff) panel_open = 1 else to_chat(user, "You close the maintenance panel.") - if(!broken && !emagged) set_sign(pick(barsigns)) else if(emagged) @@ -88,23 +83,19 @@ var/obj/item/stack/cable_coil/C = I if(emagged) //Emagged, not broken by EMP to_chat(user, "Sign has been damaged beyond repair!") - return else if(!broken) to_chat(user, "This sign is functioning properly!") - return if(C.use(2)) to_chat(user, "You replace the burnt wiring.") - broken = 0 else to_chat(user, "You need at least two lengths of cable!") - /obj/structure/sign/barsign/emp_act(severity) set_sign(new /datum/barsign/hiddensigns/empbarsign) broken = 1 @@ -115,10 +106,8 @@ /obj/structure/sign/barsign/emag_act(mob/user) if(broken || emagged) to_chat(user, "Nothing interesting happens!") - return to_chat(user, "You emag the barsign. Takeover in progress...") - sleep(100) //10 seconds set_sign(new /datum/barsign/hiddensigns/syndibarsign) emagged = 1 diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 1a247e06f88..f7e178716c5 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -170,16 +170,13 @@ LINEN BINS ..(user) if(amount < 1) to_chat(user, "There are no bed sheets in the bin.") - return if(amount == 1) to_chat(user, "There is one bed sheet in the bin.") - return to_chat(user, "There are [amount] bed sheets in the bin.") - /obj/structure/bedsheetbin/update_icon() switch(amount) if(0) icon_state = "linenbin-empty" @@ -194,7 +191,6 @@ LINEN BINS sheets.Add(I) amount++ to_chat(user, "You put [I] in [src].") - else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. user.drop_item() I.loc = src @@ -203,7 +199,6 @@ LINEN BINS - /obj/structure/bedsheetbin/attack_hand(mob/user as mob) if(amount >= 1) amount-- @@ -220,11 +215,9 @@ LINEN BINS user.put_in_hands(B) to_chat(user, "You take [B] out of [src].") - if(hidden) hidden.loc = user.loc to_chat(user, "[hidden] falls out of [B]!") - hidden = null @@ -245,7 +238,6 @@ LINEN BINS B.loc = loc to_chat(user, "You telekinetically remove [B] from [src].") - update_icon() if(hidden) diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm index 5fb9bfa63e9..a91b5aa3564 100644 --- a/code/game/objects/structures/coathanger.dm +++ b/code/game/objects/structures/coathanger.dm @@ -26,7 +26,6 @@ update_icon() else to_chat(user, "You cannot hang [W] on [src]") - return ..() /obj/structure/coatrack/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index a7c2238976f..87457fd791d 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -136,7 +136,6 @@ /obj/structure/closet/proc/toggle(mob/user as mob) if(!(src.opened ? src.close() : src.open())) to_chat(user, "It won't budge!") - return // this should probably use dump_contents() @@ -195,7 +194,6 @@ if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.contact_levels)) to_chat(user, "The rapid-crate-sender can't locate any telepads!") - return if(E.mode == 0) if(!E.teleporting) @@ -214,7 +212,6 @@ E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "\blue Teleporting [src.name]...") - E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -222,7 +219,6 @@ E.teleporting = 0 if(user in contents) to_chat(user, "Error: User located in container--aborting for safety.") - playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -231,7 +227,6 @@ do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") - return else E.rand_x = rand(50,200) @@ -239,7 +234,6 @@ var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "\blue Teleporting [src.name]...") - E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -247,7 +241,6 @@ E.teleporting = 0 if(user in contents) to_chat(user, "Error: User located in container--aborting for safety.") - playsound(E.loc, 'sound/machines/buzz-sigh.ogg', 50, 1) return var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -256,11 +249,9 @@ do_teleport(src, L) E.rcell.use(E.chargecost) to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") - return else to_chat(user, "Out of charges.") - return if(src.opened) @@ -272,7 +263,6 @@ var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(0,user)) to_chat(user, "You need more welding fuel to complete this task.") - return new /obj/item/stack/sheet/metal(src.loc) for(var/mob/M in viewers(src)) @@ -291,11 +281,9 @@ var/obj/item/weapon/weldingtool/WT = W if(src == user.loc) to_chat(user, "You can not [welded?"unweld":"weld"] the locker from inside.") - return if(!WT.remove_fuel(0,user)) to_chat(user, "You need more welding fuel to complete this task.") - return src.welded = !src.welded src.update_icon() @@ -339,12 +327,10 @@ if(!src.open()) to_chat(user, "It won't budge!") - if(!lastbang) lastbang = 1 for (var/mob/M in hearers(src, null)) to_chat(M, text("BANG, bang!", max(0, 5 - get_dist(src, M)))) - spawn(30) lastbang = 0 @@ -358,7 +344,6 @@ if(!src.toggle()) to_chat(usr, "It won't budge!") - /obj/structure/closet/verb/verb_toggleopen() set src in oview(1) set category = null @@ -373,7 +358,6 @@ else to_chat(usr, "This mob type can't use this verb.") - /obj/structure/closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() if(!opened) @@ -406,7 +390,6 @@ L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") - for(var/mob/O in viewers(usr.loc)) O.show_message("The [src] begins to shake violently!", 1) @@ -424,7 +407,6 @@ welded = 0 update_icon() to_chat(usr, "You successfully break out!") - for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //nullspace ect.. read the comment above diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 756fd860361..824cff35ece 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -35,7 +35,6 @@ L.do_alert_animation(L) egged = 1 to_chat(alerted, sound('sound/machines/chime.ogg')) - ..() /mob/living/proc/do_alert_animation(atom/A) diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm index c67b4e7f60d..f74f603df54 100644 --- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm +++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm @@ -24,12 +24,10 @@ if (isrobot(user) || src.locked) if(istype(O, /obj/item/device/multitool)) to_chat(user, "\red Resetting circuitry...") - playsound(user, 'sound/machines/lockreset.ogg', 50, 1) if(do_after(user, 20, target = src)) src.locked = 0 to_chat(user, " You disable the locking modules.") - update_icon() return else if(istype(O, /obj/item/weapon)) @@ -46,7 +44,6 @@ playsound(user, 'sound/effects/Glasshit.ogg', 100, 1) //We don't want this playing every time if(W.force < 15) to_chat(user, "\blue The cabinet's protective glass glances off the hit.") - else src.hitstaken++ if(src.hitstaken == 4) @@ -60,13 +57,11 @@ if(!fireaxe) if(O:wielded) to_chat(user, "\red Unwield the axe first.") - return fireaxe = O user.drop_item(O) src.contents += O to_chat(user, "\blue You place the fire axe back in the [src.name].") - update_icon() else if(src.smashed) @@ -90,16 +85,13 @@ return else to_chat(user, "\red Resetting circuitry...") - sleep(50) src.locked = 1 to_chat(user, "\blue You re-enable the locking modules.") - playsound(user, 'sound/machines/lockenable.ogg', 50, 1) if(do_after(user,20, target = src)) src.locked = 1 to_chat(user, " You re-enable the locking modules.") - return else localopened = !localopened @@ -121,14 +113,12 @@ if(src.locked) to_chat(user, "\red The cabinet won't budge!") - return if(localopened) if(fireaxe) user.put_in_hands(fireaxe) fireaxe = null to_chat(user, "\blue You take the fire axe from the [name].") - src.add_fingerprint(user) update_icon() else @@ -156,7 +146,6 @@ if(localopened && fireaxe) fireaxe.forceMove(loc) to_chat(user, "\blue You telekinetically remove the fire axe.") - fireaxe = null update_icon() return @@ -169,10 +158,8 @@ if (isrobot(usr) || src.locked || src.smashed) if(src.locked) to_chat(usr, "\red The cabinet won't budge!") - else if(src.smashed) to_chat(usr, "\blue The protective glass is broken!") - return localopened = !localopened @@ -190,28 +177,22 @@ usr.put_in_hands(fireaxe) fireaxe = null to_chat(usr, "\blue You take the Fire axe from the [name].") - else to_chat(usr, "\blue The [src.name] is empty.") - else to_chat(usr, "\blue The [src.name] is closed.") - update_icon() attack_ai(mob/user as mob) if(src.smashed) to_chat(user, "\red The security of the cabinet is compromised.") - return else locked = !locked if(locked) to_chat(user, "\red Cabinet locked.") - else to_chat(user, "\blue Cabinet unlocked.") - return update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers 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 be590c3028e..1de1f8d8440 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -67,13 +67,11 @@ else if(istype(W, /obj/item/weapon/card/id)) if(src.broken) to_chat(user, "\red It appears to be broken.") - return var/obj/item/weapon/card/id/I = W if(!I || !I.registered_name) return if(src == user.loc) to_chat(user, "You can't reach the lock from inside.") - else if(src.allowed(user) || !src.registered_name || (istype(I) && (src.registered_name == I.registered_name))) //they can open all lockers, or nobody owns this, or they own this locker src.locked = !( src.locked ) @@ -89,10 +87,8 @@ src.desc = "Owned by [I.registered_name]." else to_chat(user, "\red Access Denied") - else if((istype(W, /obj/item/weapon/card/emag) || istype(W, /obj/item/weapon/melee/energy/blade)) && !broken) emag_act(user) else to_chat(user, "\red Access Denied") - return diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index e756a8961c5..fc7563e6b3a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -49,27 +49,22 @@ /obj/structure/closet/secure_closet/proc/togglelock(mob/user as mob) if(src.opened) to_chat(user, "Close the locker first.") - return if(src.broken) to_chat(user, "The locker appears to be broken.") - return if(user.loc == src) to_chat(user, "You can't reach the lock from inside.") - return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) to_chat(O, "The locker has been [locked ? null : "un"]locked by [user].") - update_icon() else to_chat(user, "Access Denied") - /obj/structure/closet/secure_closet/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W, /obj/item/weapon/rcs)) return ..() @@ -80,7 +75,6 @@ src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet else to_chat(user, "The locker is too small to stuff [W:affecting] into!") - if(isrobot(user)) return user.drop_item() @@ -102,7 +96,6 @@ flick(icon_broken, src) to_chat(user, "You unlock \the [src].") - /obj/structure/closet/secure_closet/attack_hand(mob/user as mob) src.add_fingerprint(user) if(src.locked) @@ -124,7 +117,6 @@ else to_chat(usr, "This mob type can't use this verb.") - /obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot) overlays.Cut() if(!opened) @@ -150,7 +142,6 @@ L.changeNext_move(CLICK_CD_BREAKOUT) L.last_special = world.time + CLICK_CD_BREAKOUT to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)") - for(var/mob/O in viewers(src)) O.show_message("The [src] begins to shake violently!", 1) @@ -176,7 +167,6 @@ welded = 0 update_icon() to_chat(usr, "\red You successfully break out!") - for(var/mob/O in viewers(L.loc)) O.show_message("\the [usr] successfully broke out of \the [src]!", 1) if(istype(src.loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace) diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index a96ce0b2ba8..a315e598819 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -68,7 +68,6 @@ for(var/mob/M in contents) S.mind.transfer_to(M) to_chat(M, "As the animating magic wears off you feel yourself coming back to your senses. You are yourself again!") - break qdel(S) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 749ede4270c..e91df4762df 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -86,7 +86,6 @@ if(E.rcell && (E.rcell.charge >= E.chargecost)) if(!(src.z in config.player_levels)) to_chat(user, "The rapid-crate-sender can't locate any telepads!") - return if(E.mode == 0) if(!E.teleporting) @@ -105,7 +104,6 @@ E.pad = L[desc] playsound(E.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "\blue Teleporting [src.name]...") - E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -117,7 +115,6 @@ do_teleport(src, E.pad, 0) E.rcell.use(E.chargecost) to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") - return else E.rand_x = rand(50,200) @@ -125,7 +122,6 @@ var/L = locate(E.rand_x, E.rand_y, 6) playsound(E.loc, 'sound/machines/click.ogg', 50, 1) to_chat(user, "\blue Teleporting [src.name]...") - E.teleporting = 1 if(!do_after(user, 50, target = src)) E.teleporting = 0 @@ -137,11 +133,9 @@ do_teleport(src, L) E.rcell.use(E.chargecost) to_chat(user, "Teleport successful. [round(E.rcell.charge/E.chargecost)] charge\s left.") - return else to_chat(user, "Out of charges.") - return if(opened) @@ -149,7 +143,6 @@ return if(!user.drop_item()) //couldn't drop the item to_chat(user, "\The [W] is stuck to your hand, you cannot put it in \the [src]!") - return if(W) W.forceMove(loc) @@ -158,10 +151,8 @@ else if(istype(W, /obj/item/stack/cable_coil)) if(rigged) to_chat(user, "[src] is already rigged!") - return to_chat(user, "You rig [src].") - user.drop_item() qdel(W) rigged = 1 @@ -169,14 +160,12 @@ else if(istype(W, /obj/item/device/radio/electropack)) if(rigged) to_chat(user, "You attach [W] to [src].") - user.drop_item() W.forceMove(src) return else if(istype(W, /obj/item/weapon/wirecutters)) if(rigged) to_chat(user, "You cut away the wiring.") - playsound(loc, 'sound/items/Wirecutter.ogg', 100, 1) rigged = 0 return @@ -205,7 +194,6 @@ /obj/structure/closet/crate/attack_hand(mob/user as mob) if(manifest) to_chat(user, "You tear the manifest off of the crate.") - playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -266,23 +254,19 @@ /obj/structure/closet/crate/secure/proc/togglelock(mob/user as mob) if(src.opened) to_chat(user, "Close the crate first.") - return if(src.broken) to_chat(user, "The crate appears to be broken.") - return if(src.allowed(user)) src.locked = !src.locked for(var/mob/O in viewers(user, 3)) if((O.client && !( O.blinded ))) to_chat(O, "The crate has been [locked ? null : "un"]locked by [user].") - update_icon() else to_chat(user, "Access Denied") - /obj/structure/closet/crate/secure/verb/verb_togglelock() set src in oview(1) // One square distance set category = null @@ -297,11 +281,9 @@ else to_chat(usr, "This mob type can't use this verb.") - /obj/structure/closet/crate/secure/attack_hand(mob/user as mob) if(manifest) to_chat(user, "You tear the manifest off of the crate.") - playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -335,7 +317,6 @@ src.broken = 1 update_icon() to_chat(user, "You unlock \the [src].") - return /obj/structure/closet/crate/secure/emp_act(severity) diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm index 5b432a63f00..6badf7a6535 100644 --- a/code/game/objects/structures/crates_lockers/crittercrate.dm +++ b/code/game/objects/structures/crates_lockers/crittercrate.dm @@ -36,7 +36,6 @@ if(src.loc == user.loc) to_chat(user, "It won't budge!") - toggle() else toggle() diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm index e413a558a9e..4f5eecd0f23 100644 --- a/code/game/objects/structures/crates_lockers/largecrate.dm +++ b/code/game/objects/structures/crates_lockers/largecrate.dm @@ -19,7 +19,6 @@ /obj/structure/largecrate/attack_hand(mob/user as mob) if(manifest) to_chat(user, "You tear the manifest off of the crate.") - playsound(src.loc, 'sound/items/poster_ripped.ogg', 75, 1) manifest.forceMove(loc) if(ishuman(user)) @@ -29,7 +28,6 @@ return else to_chat(user, "You need a crowbar to pry this open!") - return /obj/structure/largecrate/attackby(obj/item/weapon/W as obj, mob/user as mob, params) diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm index f61584bc6af..d07ee623d38 100644 --- a/code/game/objects/structures/crates_lockers/walllocker.dm +++ b/code/game/objects/structures/crates_lockers/walllocker.dm @@ -31,11 +31,9 @@ return //activate emergency lockers. This fixes that. (Does this make sense, the AI can't call attack_hand, can it? --Mloc) if(!amount) to_chat(usr, "It's empty.") - return if(amount) to_chat(usr, "You take out some items from \the [src].") - for(var/path in spawnitems) new path(src.loc) amount-- diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index c1b3f9c6ca9..90a95253a96 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -33,7 +33,6 @@ var/global/list/captain_display_cases = list() circuit.forceMove(src) state++ to_chat(user, "You add the airlock electronics to the frame.") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) if(istype(W, /obj/item/weapon/crowbar)) new /obj/machinery/constructable_frame/machine_frame(T) @@ -41,7 +40,6 @@ var/global/list/captain_display_cases = list() G.amount = 5 qdel(src) to_chat(user, "You pry the glass out of the frame.") - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) return @@ -67,14 +65,12 @@ var/global/list/captain_display_cases = list() sensor = null state-- to_chat(user, "You pry the electronics out of the frame.") - playsound(get_turf(src), 'sound/items/Crowbar.ogg', 50, 1) if(isprox(W) && !isprox(sensor)) user.drop_item() sensor = W sensor.forceMove(src) to_chat(user, "You add the proximity sensor to the frame.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(pstate != state) @@ -131,14 +127,11 @@ var/global/list/captain_display_cases = list() /obj/structure/displaycase/examine(mob/user) ..(user) to_chat(user, "Peering through the glass, you see that it contains:") - if(occupant) to_chat(user, "\icon[occupant] \A [occupant].") - else to_chat(user, "Nothing.") - /obj/structure/displaycase/proc/dump() if(occupant) occupant.forceMove(get_turf(src)) @@ -221,15 +214,12 @@ var/global/list/captain_display_cases = list() var/obj/item/weapon/card/id/I = W if(!check_access(I)) to_chat(user, "Access denied.") - return locked = !locked if(!locked) to_chat(user, "\icon[src] \The [src] clicks as locks release, and it slowly opens for you.") - else to_chat(user, "\icon[src] You close \the [src] and swipe your card, locking it.") - update_icon() return if(istype(W,/obj/item/weapon/crowbar) && (!locked || destroyed)) @@ -270,16 +260,13 @@ var/global/list/captain_display_cases = list() else if(!locked) dump() to_chat(user, "You smash \the [W] into the delicate electronics at the bottom of the case, and deactivate the hover field.") - update_icon() else if(locked) to_chat(user, "It's locked, you can't put anything into it.") - return if(!occupant) to_chat(user, "You insert \the [W] into \the [src], and it floats as the hoverfield activates.") - user.drop_item() W.forceMove(src) occupant=W @@ -290,7 +277,6 @@ var/global/list/captain_display_cases = list() if(occupant) dump() to_chat(user, "You smash your fist into the delicate electronics at the bottom of the case, and deactivate the hover field.") - src.add_fingerprint(user) update_icon() else @@ -308,22 +294,18 @@ var/global/list/captain_display_cases = list() var/print = H.get_full_print() if(!ue) to_chat(user, "Your press your thumb against the fingerprint scanner, registering your identity with the case.") - ue = print return if(ue != print) to_chat(user, "Access denied.") - return if(occupant) to_chat(user, "Your press your thumb against the fingerprint scanner, and deactivate the hover field built into the case.") - dump() update_icon() else to_chat(src, "\icon[src] \The [src] is empty!") - else user.visible_message("[user.name] gently runs his hands over \the [src] in appreciation of its contents.", \ "You gently run your hands over \the [src] in appreciation of its contents.", \ diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index 9042147343a..dc697aa7df9 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -158,7 +158,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You welded the [glass] plating off!") - var/M = text2path("/obj/item/stack/sheet/mineral/[glass]") new M(src.loc, 2) glass = 0 @@ -167,7 +166,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You welded the glass panel out!") - new /obj/item/stack/sheet/rglass(src.loc) glass = 0 else if(!anchored) @@ -175,12 +173,10 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You dissasembled the airlock assembly!") - new /obj/item/stack/sheet/metal(src.loc, 4) qdel(src) else to_chat(user, "\blue You need more welding fuel.") - return else if(istype(W, /obj/item/weapon/wrench) && state == 0) @@ -193,7 +189,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You [anchored? "un" : ""]secured the airlock assembly!") - anchored = !anchored else if(istype(W, /obj/item/stack/cable_coil) && state == 0 && anchored ) @@ -205,7 +200,6 @@ obj/structure/door_assembly/multi_tile/Move() src.state = 1 to_chat(user, "\blue You wire the Airlock!") - else if(istype(W, /obj/item/weapon/wirecutters) && state == 1 ) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) user.visible_message("[user] cuts the wires from the airlock assembly.", "You start to cut the wires from airlock assembly.") @@ -213,7 +207,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You cut the airlock wires.!") - new/obj/item/stack/cable_coil(src.loc, 1) src.state = 0 @@ -226,7 +219,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You installed the airlock electronics!") - src.state = 2 src.name = "Near finished Airlock Assembly" src.electronics = W @@ -240,7 +232,6 @@ obj/structure/door_assembly/multi_tile/Move() if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You removed the airlock electronics!") - src.state = 1 src.name = "Wired Airlock Assembly" var/obj/item/weapon/airlock_electronics/ae @@ -260,7 +251,6 @@ obj/structure/door_assembly/multi_tile/Move() user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40, target = src)) to_chat(user, "\blue You installed reinforced glass windows into the airlock assembly!") - S.use(1) glass = 1 else if(istype(S, /obj/item/stack/sheet/mineral) && S.sheettype) @@ -270,7 +260,6 @@ obj/structure/door_assembly/multi_tile/Move() user.visible_message("[user] adds [S.name] to the airlock assembly.", "You start to install [S.name] into the airlock assembly.") if(do_after(user, 40, target = src)) to_chat(user, "\blue You installed [M] plating into the airlock assembly!") - S.use(2) glass = "[M]" @@ -278,11 +267,9 @@ obj/structure/door_assembly/multi_tile/Move() playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) to_chat(user, "\blue Now finishing the airlock.") - if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You finish the airlock!") - var/path if(istext(glass)) path = text2path("/obj/machinery/door/airlock/[glass]") diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index 7361fb20831..f5ab3cb14aa 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -41,10 +41,8 @@ return if(last_time + delay_time > world.time) to_chat(usr, "\The [src] is not ready yet!") - return to_chat(usr, "You activate \the [src].") - shock() return @@ -81,7 +79,6 @@ if(buckled_mob) buckled_mob.burn_skin(90) to_chat(buckled_mob, "You feel a deep shock course through your body!") - sleep(1) buckled_mob.burn_skin(90) sleep(5) diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm index fd3140f857a..76dbc81ca43 100644 --- a/code/game/objects/structures/engicart.dm +++ b/code/game/objects/structures/engicart.dm @@ -19,7 +19,6 @@ I.loc = src updateUsrDialog() to_chat(user, "You put [I] into [src].") - return /obj/structure/engineeringcart/attackby(obj/item/I, mob/user, params) var/fail_msg = "There is already one of those in [src]." @@ -31,7 +30,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/stack/sheet/metal)) if(!mymetal) put_in_cart(I, user) @@ -39,7 +37,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/stack/sheet/plasteel)) if(!myplasteel) put_in_cart(I, user) @@ -47,7 +44,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/device/flashlight)) if(!myflashlight) put_in_cart(I, user) @@ -55,7 +51,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/storage/toolbox/mechanical)) if(!mybluetoolbox) put_in_cart(I, user) @@ -63,7 +58,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/storage/toolbox/electrical)) if(!myyellowtoolbox) put_in_cart(I, user) @@ -71,7 +65,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/storage/toolbox)) if(!myredtoolbox) put_in_cart(I, user) @@ -79,7 +72,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/taperoll/engineering/)) if(!myengitape) put_in_cart(I, user) @@ -87,7 +79,6 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -106,7 +97,6 @@ else to_chat(usr, "You cannot interface your modules [src]!") - /obj/structure/engineeringcart/attack_hand(mob/user) user.set_machine(src) var/dat @@ -139,49 +129,41 @@ if(myglass) user.put_in_hands(myglass) to_chat(user, "You take [myglass] from [src].") - myglass = null if(href_list["metal"]) if(mymetal) user.put_in_hands(mymetal) to_chat(user, "You take [mymetal] from [src].") - mymetal = null if(href_list["plasteel"]) if(myplasteel) user.put_in_hands(myplasteel) to_chat(user, "You take [myplasteel] from [src].") - myplasteel = null if(href_list["flashlight"]) if(myflashlight) user.put_in_hands(myflashlight) to_chat(user, "You take [myflashlight] from [src].") - myflashlight = null if(href_list["bluetoolbox"]) if(mybluetoolbox) user.put_in_hands(mybluetoolbox) to_chat(user, "You take [mybluetoolbox] from [src].") - mybluetoolbox = null if(href_list["redtoolbox"]) if(myredtoolbox) user.put_in_hands(myredtoolbox) to_chat(user, "You take [myredtoolbox] from [src].") - myredtoolbox = null if(href_list["yellowtoolbox"]) if(myyellowtoolbox) user.put_in_hands(myyellowtoolbox) to_chat(user, "You take [myyellowtoolbox] from [src].") - myyellowtoolbox = null if(href_list["engitape"]) if(myengitape) user.put_in_hands(myengitape) to_chat(user, "You take [myengitape] from [src].") - myengitape = null update_icon() diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 4f448aa4c7a..d0521d33f0e 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -18,7 +18,6 @@ contents += O has_extinguisher = O to_chat(user, "You place [O] in [src].") - else opened = !opened else @@ -36,12 +35,10 @@ temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) to_chat(user, "You try to move your [temp.name], but cannot!") - return if(has_extinguisher) user.put_in_hands(has_extinguisher) to_chat(user, "You take [has_extinguisher] from [src].") - has_extinguisher = null opened = 1 else @@ -52,7 +49,6 @@ if(has_extinguisher) has_extinguisher.loc = loc to_chat(user, "You telekinetically remove [has_extinguisher] from [src].") - has_extinguisher = null opened = 1 else diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index ceb6604db60..cbdce196c47 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -78,19 +78,16 @@ /obj/structure/falsewall/attackby(obj/item/weapon/W, mob/user, params) if(opening) to_chat(user, "You must wait until the door has stopped moving.") - return if(density) var/turf/T = get_turf(src) if(T.density) to_chat(user, "[src] is blocked!") - return if(istype(W, /obj/item/weapon/screwdriver)) if (!istype(T, /turf/simulated/floor)) to_chat(user, "[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.") ChangeToWall() @@ -101,7 +98,6 @@ else to_chat(user, "You can't reach, close it first!") - if(istype(W, /obj/item/weapon/gun/energy/plasmacutter) || istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill) || istype(W, /obj/item/weapon/pickaxe/drill/jackhammer) || istype(W, /obj/item/weapon/melee/energy/blade)) dismantle(user) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 3d62fcbc902..ab167113178 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -288,13 +288,11 @@ if(indestructable) //this bush marks the edge of the map, you can't destroy it to_chat(user, "\red You flail away at the undergrowth, but it's too thick here.") - else user.visible_message("\red [user] begins clearing away [src].","\red You begin clearing away [src].") spawn(rand(15,30)) if(get_dist(user,src) < 2) to_chat(user, "\blue You clear away [src].") - var/obj/item/stack/sheet/wood/W = new(src.loc) W.amount = rand(3,15) if(prob(50)) diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm index 0bb65409cf1..e2df39180d9 100644 --- a/code/game/objects/structures/foodcart.dm +++ b/code/game/objects/structures/foodcart.dm @@ -27,7 +27,6 @@ I.loc = src updateUsrDialog() to_chat(user, "You put [I] into [src].") - return /obj/structure/foodcart/attackby(obj/item/I, mob/user, params) @@ -44,7 +43,6 @@ break; if(!success) to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/reagent_containers/food/drinks)) var/success = 0 for(var/s=1,s<=6,s++) @@ -56,7 +54,6 @@ break; if(!success) to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/wrench)) if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) @@ -75,7 +72,6 @@ else to_chat(usr, "You cannot interface your modules [src]!") - /obj/structure/foodcart/attack_hand(mob/user) user.set_machine(src) var/dat @@ -117,73 +113,61 @@ if(food_slots[1]) user.put_in_hands(food_slots[1]) to_chat(user, "You take [food_slots[1]] from [src].") - food_slots[1] = null if(href_list["f2"]) if(food_slots[2]) user.put_in_hands(food_slots[2]) to_chat(user, "You take [food_slots[2]] from [src].") - food_slots[2] = null if(href_list["f3"]) if(food_slots[3]) user.put_in_hands(food_slots[3]) to_chat(user, "You take [food_slots[3]] from [src].") - food_slots[3] = null if(href_list["f4"]) if(food_slots[4]) user.put_in_hands(food_slots[4]) to_chat(user, "You take [food_slots[4]] from [src].") - food_slots[4] = null if(href_list["f5"]) if(food_slots[5]) user.put_in_hands(food_slots[5]) to_chat(user, "You take [food_slots[5]] from [src].") - food_slots[5] = null if(href_list["f6"]) if(food_slots[6]) user.put_in_hands(food_slots[6]) to_chat(user, "You take [food_slots[6]] from [src].") - food_slots[6] = null if(href_list["d1"]) if(drink_slots[1]) user.put_in_hands(drink_slots[1]) to_chat(user, "You take [drink_slots[1]] from [src].") - drink_slots[1] = null if(href_list["d2"]) if(drink_slots[2]) user.put_in_hands(drink_slots[2]) to_chat(user, "You take [drink_slots[2]] from [src].") - drink_slots[2] = null if(href_list["d3"]) if(drink_slots[3]) user.put_in_hands(drink_slots[3]) to_chat(user, "You take [drink_slots[3]] from [src].") - drink_slots[3] = null if(href_list["d4"]) if(drink_slots[4]) user.put_in_hands(drink_slots[4]) to_chat(user, "You take [drink_slots[4]] from [src].") - drink_slots[4] = null if(href_list["d5"]) if(drink_slots[5]) user.put_in_hands(drink_slots[5]) to_chat(user, "You take [drink_slots[5]] from [src].") - drink_slots[5] = null if(href_list["d6"]) if(drink_slots[6]) user.put_in_hands(drink_slots[6]) to_chat(user, "You take [drink_slots[6]] from [src].") - drink_slots[6] = null update_icon() //Not really needed without overlays, but keeping just in case diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index a295300fb03..5d047e3ec2f 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -33,75 +33,61 @@ if(anchored && !istype(src,/obj/structure/girder/displaced)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue Now disassembling the girder") - if(do_after(user,40, target = src)) if(!src) return to_chat(user, "\blue You dissasembled the girder!") - refundMetal(metalUsed) qdel(src) else if(!anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue Now securing the girder") - if(get_turf(user, 40)) to_chat(user, "\blue You secured the girder!") - new/obj/structure/girder( src.loc ) qdel(src) else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) to_chat(user, "\blue Now slicing apart the girder") - if(do_after(user,30, target = src)) if(!src) return to_chat(user, "\blue You slice apart the girder!") - refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) to_chat(user, "\blue You drill through the girder!") - refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/pickaxe/drill/jackhammer)) playsound(src.loc, 'sound/weapons/sonic_jackhammer.ogg', 100, 1) to_chat(user, "You Disintegrate the girder!") - refundMetal(metalUsed) qdel(src) else if(istype(W, /obj/item/weapon/screwdriver) && state == 2 && istype(src,/obj/structure/girder/reinforced)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1) to_chat(user, "\blue Now unsecuring support struts") - if(do_after(user,40, target = src)) if(!src) return to_chat(user, "\blue You unsecured the support struts!") - state = 1 else if(istype(W, /obj/item/weapon/wirecutters) && istype(src,/obj/structure/girder/reinforced) && state == 1) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) to_chat(user, "\blue Now removing support struts") - if(do_after(user,40, target = src)) if(!src) return to_chat(user, "\blue You removed the support struts!") - new/obj/structure/girder( src.loc ) qdel(src) else if(istype(W, /obj/item/weapon/crowbar) && state == 0 && anchored ) playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) to_chat(user, "\blue Now dislodging the girder") - if(do_after(user, 40, target = src)) if(!src) return to_chat(user, "\blue You dislodged the girder!") - new/obj/structure/girder/displaced( src.loc ) qdel(src) @@ -115,18 +101,15 @@ if(S.amount < 2) return S.use(2) to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") - new /obj/structure/falsewall (src.loc) qdel(src) else if(S.amount < 2) return ..() to_chat(user, "\blue Now adding plating...") - if (do_after(user,40, target = src)) if(!src || !S || S.amount < 2) return S.use(2) to_chat(user, "\blue You added the plating!") - var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(/turf/simulated/wall) for(var/turf/simulated/wall/X in Tsrc.loc) @@ -139,19 +122,16 @@ if(S.amount < 2) return S.use(2) to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") - new /obj/structure/falsewall/reinforced (src.loc) qdel(src) else if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code... if(S.amount < 1) return ..() to_chat(user, "\blue Now finalising reinforced wall.") - if(do_after(user, 50, target = src)) if(!src || !S || S.amount < 1) return S.use(1) to_chat(user, "\blue Wall fully reinforced!") - var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(/turf/simulated/wall/r_wall) for(var/turf/simulated/wall/r_wall/X in Tsrc.loc) @@ -161,12 +141,10 @@ else if(S.amount < 1) return ..() to_chat(user, "\blue Now reinforcing girders") - if (do_after(user,60, target = src)) if(!src || !S || S.amount < 1) return S.use(1) to_chat(user, "\blue Girders reinforced!") - new/obj/structure/girder/reinforced( src.loc ) qdel(src) return @@ -177,19 +155,16 @@ if(S.amount < 2) return S.use(2) to_chat(user, "\blue You create a false wall! Push on it to open or close the passage.") - var/F = text2path("/obj/structure/falsewall/[M]") new F (src.loc) qdel(src) else if(S.amount < 2) return ..() to_chat(user, "\blue Now adding plating...") - if (do_after(user,40, target = src)) if(!src || !S || S.amount < 2) return S.use(2) to_chat(user, "\blue You added the plating!") - var/turf/Tsrc = get_turf(src) Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]")) for(var/turf/simulated/wall/mineral/X in Tsrc.loc) @@ -205,7 +180,6 @@ user.drop_item() P.loc = src.loc to_chat(user, "\blue You fit the pipe into the [src]!") - else ..() @@ -268,23 +242,18 @@ if(istype(W, /obj/item/weapon/wrench)) playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) to_chat(user, "\blue Now disassembling the girder") - if(do_after(user,40, target = src)) to_chat(user, "\blue You dissasembled the girder!") - dismantle() else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) to_chat(user, "\blue Now slicing apart the girder") - if(do_after(user,30, target = src)) to_chat(user, "\blue You slice apart the girder!") - dismantle() else if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) to_chat(user, "\blue You drill through the girder!") - dismantle() /obj/structure/cultgirder/proc/dismantle() diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 17d6d1b0262..9c1a9e6867a 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -171,21 +171,17 @@ dir_to_set = 4 else to_chat(user, "You can't reach.") - return //Only works for cardinal direcitons, diagonals aren't supposed to work like this. for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set) to_chat(user, "There is already a window facing this way there.") - return to_chat(user, "You start placing the window.") - if(do_after(user,20, target = src)) if(!src) return //Grille destroyed while waiting for(var/obj/structure/window/WINDOW in loc) if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting. to_chat(user, "There is already a window facing this way there.") - return var/obj/structure/window/WD if(istype(W,/obj/item/stack/sheet/rglass)) @@ -203,7 +199,6 @@ var/obj/item/stack/ST = W ST.use(1) to_chat(user, "You place the [WD] on [src].") - WD.update_icon() return //window placing end diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm index d6a73d7f07c..299f776c4f7 100644 --- a/code/game/objects/structures/inflatable.dm +++ b/code/game/objects/structures/inflatable.dm @@ -8,7 +8,6 @@ /obj/item/inflatable/attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) to_chat(user, "\blue You inflate [src].") - var/obj/structure/inflatable/R = new /obj/structure/inflatable(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -152,7 +151,6 @@ /obj/item/inflatable/door/attack_self(mob/user) playsound(loc, 'sound/items/zip.ogg', 75, 1) to_chat(user, "\blue You inflate [src].") - var/obj/structure/inflatable/door/R = new /obj/structure/inflatable/door(user.loc) src.transfer_fingerprints_to(R) R.add_fingerprint(user) @@ -265,7 +263,6 @@ /obj/item/inflatable/torn/attack_self(mob/user) to_chat(user, "The inflatable wall is too torn to be inflated!") - add_fingerprint(user) /obj/item/inflatable/door/torn @@ -276,7 +273,6 @@ /obj/item/inflatable/door/torn/attack_self(mob/user) to_chat(user, "The inflatable door is too torn to be inflated!") - add_fingerprint(user) /obj/item/weapon/storage/briefcase/inflatable diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 30a4080b3b4..9f8c92b6255 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -35,17 +35,14 @@ to_chat(user, "It has been upgraded with a floor buffer.") - /obj/structure/stool/bed/chair/janicart/attackby(obj/item/I, mob/user, params) if(istype(I, keytype)) to_chat(user, "Hold [I] in one of your hands while you drive this [callme].") - else if(istype(I, /obj/item/weapon/storage/bag/trash)) if(keytype == /obj/item/key/janitor) if(!user.drop_item()) return to_chat(user, "You hook the trashbag onto the [callme].") - I.loc = src mybag = I else if(istype(I, /obj/item/janiupgrade)) @@ -53,7 +50,6 @@ floorbuffer = 1 qdel(I) to_chat(user, "You upgrade the [callme] with the floor buffer.") - update_icon() /obj/structure/stool/bed/chair/janicart/update_icon() @@ -95,7 +91,6 @@ move_delay = 0 else to_chat(user, "You'll need the keys in one of your hands to drive this [callme].") - /obj/structure/stool/bed/chair/janicart/Bump(atom/A) if(buckled_mob && istype(A, /obj/machinery/door)) @@ -251,11 +246,9 @@ /obj/structure/janitorialcart/proc/wet_mop(obj/item/weapon/mop, mob/user) if(reagents.total_volume < 1) to_chat(user, "[src] is out of water!") - else reagents.trans_to(mop, 5) // to_chat(user, "You wet [mop] in [src].") - playsound(loc, 'sound/effects/slosh.ogg', 25, 1) /obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user) @@ -263,7 +256,6 @@ I.loc = src updateUsrDialog() to_chat(user, "You put [I] into [src].") - return @@ -281,14 +273,12 @@ else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/storage/bag/trash)) if(!mybag) var/obj/item/weapon/storage/bag/trash/t=I t.janicart_insert(user, src) else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/reagent_containers/spray/cleaner)) if(!myspray) put_in_cart(I, user) @@ -296,14 +286,12 @@ update_icon() else to_chat(user, fail_msg) - else if(istype(I, /obj/item/device/lightreplacer)) if(!myreplacer) var/obj/item/device/lightreplacer/l=I l.janicart_insert(user,src) else to_chat(user, fail_msg) - else if(istype(I, /obj/item/weapon/caution)) if(signs < max_signs) put_in_cart(I, user) @@ -311,12 +299,10 @@ update_icon() else to_chat(user, "[src] can't hold any more signs.") - else if(istype(I, /obj/item/weapon/crowbar)) user.visible_message("[user] begins to empty the contents of [src].") if(do_after(user, 30, target = src)) to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.") - reagents.reaction(src.loc) src.reagents.clear_reagents() else if(istype(I, /obj/item/weapon/wrench)) @@ -339,7 +325,6 @@ else to_chat(usr, "You cannot interface your modules [src]!") - /obj/structure/janitorialcart/attack_hand(mob/user) user.set_machine(src) var/dat @@ -368,25 +353,21 @@ if(mybag) user.put_in_hands(mybag) to_chat(user, "You take [mybag] from [src].") - mybag = null if(href_list["mop"]) if(mymop) user.put_in_hands(mymop) to_chat(user, "You take [mymop] from [src].") - mymop = null if(href_list["spray"]) if(myspray) user.put_in_hands(myspray) to_chat(user, "You take [myspray] from [src].") - myspray = null if(href_list["replacer"]) if(myreplacer) user.put_in_hands(myreplacer) to_chat(user, "You take [myreplacer] from [src].") - myreplacer = null if(href_list["sign"]) if(signs) @@ -394,7 +375,6 @@ if(Sign) user.put_in_hands(Sign) to_chat(user, "You take \a [Sign] from [src].") - signs-- else WARNING("Signs ([signs]) didn't match contents") diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm index 7e61e34ccb4..d14b4bbda21 100644 --- a/code/game/objects/structures/kitchen_spike.dm +++ b/code/game/objects/structures/kitchen_spike.dm @@ -14,18 +14,15 @@ if(istype(I, /obj/item/weapon/wrench)) if(anchored) to_chat(user, "You unwrench [src] from the floor.") - anchored = 0 else to_chat(user, "You wrench [src] into place.") - anchored = 1 else if(istype(I, /obj/item/stack/rods)) var/obj/item/stack/rods/R = I if(R.get_amount() >= 4) R.use(4) to_chat(user, "You add spikes to the frame.") - new /obj/structure/kitchenspike(loc) add_fingerprint(user) qdel(src) @@ -49,20 +46,17 @@ playsound(loc, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 20, target = src)) to_chat(user, "You pry the spikes out of the frame.") - new /obj/item/stack/rods(loc, 4) new /obj/structure/kitchenspike_frame(loc) add_fingerprint(user) qdel(src) else to_chat(user, "You can't do that while something's on the spike!") - return if(!istype(G, /obj/item/weapon/grab) || !G.affecting) return if(buckled_mob) to_chat(user, "The spike already has something on it, finish collecting its meat first!") - else if(isliving(G.affecting)) if(!buckled_mob) @@ -72,7 +66,6 @@ qdel(G) return to_chat(user, "You can't use that on the spike!") - return /obj/structure/kitchenspike/proc/spike(var/mob/living/victim) @@ -131,7 +124,6 @@ if(!do_after(M, 1200, target = src)) if(M && M.buckled) to_chat(M, "You fail to free yourself!") - return if(!M.buckled) return diff --git a/code/game/objects/structures/lamarr_cage.dm b/code/game/objects/structures/lamarr_cage.dm index 66a3d9cbcb0..0f8cde25dbe 100644 --- a/code/game/objects/structures/lamarr_cage.dm +++ b/code/game/objects/structures/lamarr_cage.dm @@ -70,11 +70,9 @@ return else to_chat(usr, text("\blue You kick the lab cage.")) - for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) to_chat(O, text("\red [] kicks the lab cage.", usr)) - src.health -= 2 healthcheck() return diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm index 55f25ed49cb..d7704265861 100644 --- a/code/game/objects/structures/lattice.dm +++ b/code/game/objects/structures/lattice.dm @@ -59,7 +59,6 @@ var/obj/item/weapon/weldingtool/WT = C if(WT.remove_fuel(0, user)) to_chat(user, "\blue Slicing lattice joints ...") - new /obj/item/stack/rods(src.loc) qdel(src) diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 95c22d434f8..01c9442ea33 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -112,15 +112,12 @@ if(istype(W,/obj/item/weapon/pickaxe)) var/obj/item/weapon/pickaxe/digTool = W to_chat(user, "You start digging the [name].") - if(do_after(user,digTool.digspeed*hardness, target = src) && src) to_chat(user, "You finished digging.") - Dismantle() else if(istype(W,/obj/item/weapon)) //not sure, can't not just weapons get passed to this proc? hardness -= W.force/100 to_chat(user, "You hit the [name] with your [W.name]!") - CheckHardness() else attack_hand(user) diff --git a/code/game/objects/structures/misc.dm b/code/game/objects/structures/misc.dm index 77c5268ba7b..1b8737e1ddd 100644 --- a/code/game/objects/structures/misc.dm +++ b/code/game/objects/structures/misc.dm @@ -17,7 +17,6 @@ attack_hand(mob/user as mob) to_chat(user, "Civilians: NT is recruiting! Please head SOUTH to the NT Recruitment office to join the station's crew!") - /obj/structure/ninjatele name = "Long-Distance Teleportation Console" @@ -51,13 +50,10 @@ to_chat(user, "\blue VOID-Shift translocation successful") - if("No") to_chat(user, "\red Process aborted!") - return else - to_chat(user, "\red FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") - + to_chat(user, "\red FĆAL �Rr�R: ŧer nt recgnized, c-cntr-r䣧-ç äcked.") diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 2bb20afb82d..c8e600c658d 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -25,17 +25,14 @@ if(..(user, 1)) to_chat(usr, text("\icon[] [] contains [] units of water left!", src, src.name, src.reagents.total_volume)) - /obj/structure/mopbucket/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/mop)) if (src.reagents.total_volume >= 2) src.reagents.trans_to(W, 2) to_chat(user, "\blue You wet the mop") - playsound(src.loc, 'sound/effects/slosh.ogg', 25, 1) if (src.reagents.total_volume < 1) to_chat(user, "\blue Out of water!") - return /obj/structure/mopbucket/ex_act(severity) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 7b0ba512971..f9809b422ca 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -151,7 +151,6 @@ return to_chat(CM, "You attempt to slide yourself out of \the [src]...") - src.attack_hand(CM) @@ -194,7 +193,6 @@ for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) to_chat(B, text("\red [] stuffs [] into []!", user, O, src)) - return /obj/structure/m_tray/Destroy() @@ -277,7 +275,6 @@ /obj/structure/crematorium/attack_hand(mob/user as mob) if (cremating) to_chat(usr, "\red It's locked.") - return if ((connected) && (locked == 0)) for(var/atom/movable/A as mob|obj in connected.loc) @@ -392,7 +389,6 @@ return to_chat(CM, "You attempt to slide yourself out of \the [src]...") - src.attack_hand(CM) /* @@ -434,7 +430,6 @@ for(var/mob/B in viewers(user, 3)) if ((B.client && !( B.blinded ))) to_chat(B, text("\red [] stuffs [] into []!", user, O, src)) - //Foreach goto(99) return @@ -452,7 +447,6 @@ C.cremate(user) else to_chat(usr, "\red Access denied.") - return /hook/Login/proc/update_morgue(var/client/client, var/mob/L) diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 81d36be51d9..9750d449bca 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -80,21 +80,17 @@ for(var/line in lines) // to_chat(world, line) - for(var/beat in splittext(lowertext(line), ",")) // to_chat(world, "beat: [beat]") - var/list/notes = splittext(beat, "/") for(var/note in splittext(notes[1], "-")) // to_chat(world, "note: [note]") - if(!playing || shouldStopPlaying(user))//If the instrument is playing, or special case playing = 0 return if(lentext(note) == 0) continue // to_chat(world, "Parse: [copytext(note,1,2)]") - var/cur_note = text2ascii(note) - 96 if(cur_note < 1 || cur_note > 7) continue @@ -177,13 +173,11 @@ tempo = sanitize_tempo(5) // default 120 BPM if(lines.len > 50) to_chat(usr, "Too many lines!") - lines.Cut(51) var/linenum = 1 for(var/l in lines) if(lentext(l) > 50) to_chat(usr, "Line [linenum] too long!") - lines.Remove(l) else linenum++ @@ -308,7 +302,6 @@ if (!anchored && !isinspace()) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, " You begin to tighten \the [src] to the floor...") - if (do_after(user, 20, target = src)) user.visible_message( \ "[user] tightens \the [src]'s casters.", \ @@ -318,7 +311,6 @@ else if(anchored) playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) to_chat(user, " You begin to loosen \the [src]'s casters...") - if (do_after(user, 40, target = src)) user.visible_message( \ "[user] loosens \the [src]'s casters.", \ diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index 12893155709..adc6fa4a4fa 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -26,11 +26,9 @@ notices++ icon_state = "nboard0[notices]" //update sprite to_chat(user, "You pin the paper to the noticeboard.") - else to_chat(user, "You reach to pin your paper to the board but hesitate. You are certain your paper will not be seen among the many others already attached.") - /obj/structure/noticeboard/attack_hand(user as mob) var/dat = "Noticeboard
" for(var/obj/item/weapon/paper/P in src) @@ -69,7 +67,6 @@ else to_chat(usr, "You'll need something to write with!") - if(href_list["read"]) var/obj/item/weapon/paper/P = locate(href_list["read"]) if((P && P.loc == src)) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index c34e36404cd..ec2ebc8848a 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -43,10 +43,8 @@ FLOOR SAFES if(user && canhear) if(tumbler_1_pos == tumbler_1_open) to_chat(user, "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].") - if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open) if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") return 1 @@ -98,14 +96,12 @@ FLOOR SAFES if(href_list["open"]) if(check_unlocked()) to_chat(user, "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!") - return if(href_list["decrement"]) @@ -114,12 +110,10 @@ FLOOR SAFES tumbler_1_pos = decrement(tumbler_1_pos) if(canhear) to_chat(user, "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].") - check_unlocked(user, canhear) updateUsrDialog() return @@ -130,12 +124,10 @@ FLOOR SAFES tumbler_1_pos = increment(tumbler_1_pos) if(canhear) to_chat(user, "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].") - check_unlocked(user, canhear) updateUsrDialog() return @@ -156,21 +148,17 @@ FLOOR SAFES space += I.w_class if(!user.drop_item()) to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") - return I.loc = src to_chat(user, "You put [I] in [src].") - updateUsrDialog() return else to_chat(user, "[I] won't fit in [src].") - return else if(istype(I, /obj/item/clothing/accessory/stethoscope)) to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") - return diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index 82c8ed08829..24ea6b5a358 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -26,7 +26,6 @@ /obj/structure/sign/attackby(obj/item/tool as obj, mob/user as mob) //deconstruction if(istype(tool, /obj/item/weapon/screwdriver) && !istype(src, /obj/structure/sign/double)) to_chat(user, "You unfasten the sign with your [tool].") - var/obj/item/sign/S = new(src.loc) S.name = name S.desc = desc @@ -63,7 +62,6 @@ S.desc = desc S.icon_state = sign_state to_chat(user, "You fasten \the [S] with your [tool].") - qdel(src) else ..() diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm index cb26f8ca054..cb29dec1926 100644 --- a/code/game/objects/structures/spirit_board.dm +++ b/code/game/objects/structures/spirit_board.dm @@ -17,12 +17,10 @@ if(A) to_chat(O, "\blue Someone has begun playing with a [src.name] in [A.name]!. (Teleport)") - /obj/structure/spirit_board/examine(mob/user) ..(user) to_chat(user, "[initial(desc)] The planchette is sitting at \"[planchette]\".") - /obj/structure/spirit_board/attack_hand(mob/user as mob) if(..()) return @@ -72,7 +70,6 @@ if(light_amount > 2) to_chat(M, "It's too bright here to use [src.name]!") - return 0 //mobs in range check @@ -81,13 +78,11 @@ 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...") - else users_in_range++ if(users_in_range < 2) to_chat(M, "There aren't enough people to use the [src.name]!") - return 0 return 1 \ No newline at end of file diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm index 859b4ba0186..3f5decad98e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm @@ -35,7 +35,6 @@ if(!do_after(M, 1200, target = src)) if(M && M.buckled) to_chat(M, "You fail to escape \the [src]!") - return if(!M.buckled) return diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index d61c34e48bc..ecf2324673d 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -119,11 +119,9 @@ /obj/item/roller_holder/attack_self(mob/user as mob) if(!held) to_chat(user, " The rack is empty.") - return to_chat(user, "You deploy the roller bed.") - var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) R.add_fingerprint(user) qdel(held) diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm index b41ed314674..621f3a9d78e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm @@ -22,7 +22,6 @@ var/obj/item/assembly/shock_kit/SK = W if(!SK.status) to_chat(user, "[SK] is not ready to be attached!") - return user.drop_item() var/obj/structure/stool/bed/chair/e_chair/E = new /obj/structure/stool/bed/chair/e_chair(src.loc) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 90d8b578b83..ad478bb3893 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -200,11 +200,9 @@ var/obj/item/weapon/grab/G = I if(G.affecting.buckled) to_chat(user, "[G.affecting] is buckled to [G.affecting.buckled]!") - return 0 if(G.state < GRAB_AGGRESSIVE) to_chat(user, "You need a better grip to do that!") - return 0 if(!G.confirm()) return 0 @@ -224,7 +222,6 @@ if (istype(W, /obj/item/weapon/wrench)) to_chat(user, "\blue Now disassembling table") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) destroy() @@ -283,7 +280,6 @@ if(!flip(get_cardinal_dir(usr,src))) to_chat(usr, "It won't budge.") - return usr.visible_message("[usr] flips \the [src]!") @@ -301,7 +297,6 @@ if (!unflip()) to_chat(usr, "It won't budge.") - return @@ -389,7 +384,6 @@ if (istype(I, /obj/item/weapon/wrench)) to_chat(user, "\blue Now disassembling the wooden table") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -441,7 +435,6 @@ if (istype(W, /obj/item/weapon/wrench)) to_chat(user, "\blue Now disassembling the wooden table") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/wood( src.loc ) @@ -490,27 +483,22 @@ var/obj/item/stack/sheet/glass/G = I if(G.amount >= 2) to_chat(user, "You start to add the glass to \the [src].") - if(do_after(user, 10, target = src)) G.use(2) to_chat(user, "You add the glass to \the [src].") - playsound(get_turf(src), 'sound/items/Deconstruct.ogg', 50, 1) new /obj/structure/table/glass(loc) qdel(src) else to_chat(user, "You don't have enough glass! You need at least 2 sheets.") - return if(iswrench(I)) to_chat(user, "You start to deconstruct \the [src].") - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) if(do_after(user, 10, target = src)) playsound(src.loc, 'sound/items/Deconstruct.ogg', 75, 1) to_chat(user, "You dismantle \the [src].") - new /obj/item/stack/sheet/metal(loc) new /obj/item/stack/sheet/metal(loc) qdel(src) @@ -546,7 +534,6 @@ if (istype(I, /obj/item/weapon/wrench)) to_chat(user, "\blue Now disassembling the glass table") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) sleep(50) new /obj/item/weapon/table_parts/glass( src.loc ) @@ -609,21 +596,17 @@ if(WT.remove_fuel(0, user)) if(src.status == 2) to_chat(user, "\blue Now weakening the reinforced table") - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue Table weakened") - src.status = 1 else to_chat(user, "\blue Now strengthening the reinforced table") - playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if (do_after(user, 50, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue Table strengthened") - src.status = 2 return return diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index fcfa8161a75..ab1c2830933 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -50,10 +50,8 @@ oxytanks.Add(I) oxygentanks++ to_chat(user, "You put [I] in [src].") - else to_chat(user, "[src] is full.") - updateUsrDialog() return if(istype(I, /obj/item/weapon/tank/plasma)) @@ -63,20 +61,16 @@ platanks.Add(I) plasmatanks++ to_chat(user, "You put [I] in [src].") - else to_chat(user, "[src] is full.") - updateUsrDialog() return if(istype(I, /obj/item/weapon/wrench)) if(anchored) to_chat(user, "You lean down and unwrench [src].") - anchored = 0 else to_chat(user, "You wrench [src] into place.") - anchored = 1 return @@ -95,7 +89,6 @@ O = new /obj/item/weapon/tank/oxygen(loc) O.loc = loc to_chat(usr, "You take [O] out of [src].") - oxygentanks-- update_icon() if(href_list["plasma"]) @@ -108,7 +101,6 @@ P = new /obj/item/weapon/tank/plasma(loc) P.loc = loc to_chat(usr, "You take [P] out of [src].") - plasmatanks-- update_icon() add_fingerprint(usr) diff --git a/code/game/objects/structures/target_stake.dm b/code/game/objects/structures/target_stake.dm index b3bbcce9c2b..504b2abfa80 100644 --- a/code/game/objects/structures/target_stake.dm +++ b/code/game/objects/structures/target_stake.dm @@ -31,7 +31,6 @@ W.layer = 3.1 pinned_target = W to_chat(user, "You slide the target into the stake.") - return attack_hand(mob/user as mob) @@ -46,10 +45,8 @@ if(!user.get_active_hand()) user.put_in_hands(pinned_target) to_chat(user, "You take the target out of the stake.") - else pinned_target.loc = get_turf(user) to_chat(user, "You take the target out of the stake.") - pinned_target = null \ No newline at end of file diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index c8efd45a075..93ad848c4f6 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -37,7 +37,6 @@ for(var/obj/structure/transit_tube_pod/pod in loc) if(pod.contents.len) to_chat(AM, "") - return else if(!pod.moving && pod.dir in directions()) AM.forceMove(pod) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 42dfe596d1d..3fcfc0ef4bf 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -29,7 +29,6 @@ if(cistern && !open) if(!contents.len) to_chat(user, "The cistern is empty.") - return else var/obj/item/I = pick(contents) @@ -38,7 +37,6 @@ else I.loc = get_turf(src) to_chat(user, "You find [I] in the cistern.") - w_items -= I.w_class return @@ -53,7 +51,6 @@ /obj/structure/toilet/attackby(obj/item/I, mob/living/user, params) if(istype(I, /obj/item/weapon/crowbar)) to_chat(user, "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(do_after(user, 30, target = src)) 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.") @@ -68,7 +65,6 @@ if(RG.is_open_container()) RG.reagents.add_reagent("toiletwater", min(RG.volume - RG.reagents.total_volume, RG.amount_per_transfer_from_this)) to_chat(user, "You fill [RG] from [src]. Gross.") - return if(istype(I, /obj/item/weapon/grab)) @@ -81,7 +77,6 @@ if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) to_chat(user, "[GM] needs to be on [src]!") - return if(!swirlie) if(open) @@ -103,24 +98,19 @@ else to_chat(user, "You need a tighter grip!") - if(cistern) if(I.w_class > 3) to_chat(user, "[I] does not fit!") - return if(w_items + I.w_class > 5) to_chat(user, "The cistern is full!") - return if(!user.drop_item()) to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the cistern!") - return I.loc = src w_items += I.w_class to_chat(user, "You carefully place [I] into the cistern.") - return @@ -144,7 +134,6 @@ if(G.state >= GRAB_AGGRESSIVE) if(GM.loc != get_turf(src)) to_chat(user, "[GM.name] needs to be on [src].") - return user.changeNext_move(CLICK_CD_MELEE) playsound(src.loc, 'sound/effects/bang.ogg', 25, 1) @@ -154,7 +143,6 @@ to_chat(user, "You need a tighter grip!") - /obj/machinery/shower name = "shower" desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division." @@ -194,10 +182,8 @@ /obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params) if(I.type == /obj/item/device/analyzer) to_chat(user, "The water temperature seems to be [watertemp].") - if(istype(I, /obj/item/weapon/wrench)) to_chat(user, "You begin to adjust the temperature valve with the [I].") - if(do_after(user, 50, target = src)) switch(watertemp) if("normal") @@ -267,7 +253,6 @@ L.ExtinguishMob() L.fire_stacks = -20 //Douse ourselves with water to avoid fire more easily to_chat(L, "You've been drenched in water!") - if(iscarbon(O)) var/mob/living/carbon/M = O if(M.r_hand) @@ -359,13 +344,11 @@ if(watertemp == "freezing") //C.bodytemperature = max(80, C.bodytemperature - 80) to_chat(C, "The water is freezing!") - return if(watertemp == "boiling") //C.bodytemperature = min(500, C.bodytemperature + 35) C.adjustFireLoss(5) to_chat(C, "The water is searing!") - return @@ -403,12 +386,10 @@ temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) to_chat(user, "You try to move your [temp.name], but cannot!") - return if(busy) to_chat(user, "Someone's already washing here.") - return var/selected_area = parse_zone(user.zone_sel.selecting) var/washing_face = 0 @@ -441,7 +422,6 @@ /obj/structure/sink/attackby(obj/item/O, mob/user, params) if(busy) to_chat(user, "Someone's already washing here!") - return if(!(istype(O))) diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 99bd41d7040..529dbb447a8 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -83,7 +83,6 @@ obj/structure/windoor_assembly/Destroy() if(do_after(user, 40, target = src)) if(!src || !WT.isOn()) return to_chat(user, "You dissasembled the windoor assembly!") - var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5) RG.add_fingerprint(user) if(secure) @@ -98,7 +97,6 @@ obj/structure/windoor_assembly/Destroy() for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) to_chat(user, "There is already a windoor in that location.") - return playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) user.visible_message("[user] secures the windoor assembly to the floor.", "You start to secure the windoor assembly to the floor.") @@ -109,10 +107,8 @@ obj/structure/windoor_assembly/Destroy() for(var/obj/machinery/door/window/WD in src.loc) if(WD.dir == src.dir) to_chat(user, "There is already a windoor in that location.") - return to_chat(user, "You've secured the windoor assembly!") - src.anchored = 1 if(src.secure) src.name = "secure anchored windoor assembly" @@ -128,7 +124,6 @@ obj/structure/windoor_assembly/Destroy() if(!src || !src.anchored) return to_chat(user, "You've unsecured the windoor assembly!") - src.anchored = 0 if(src.secure) src.name = "secure windoor assembly" @@ -140,18 +135,15 @@ obj/structure/windoor_assembly/Destroy() var/obj/item/stack/sheet/plasteel/P = W if(P.amount < 2) to_chat(user, "You need more plasteel to do this.") - return to_chat(user, "You start to reinforce the windoor with plasteel.") - if(do_after(user,40, target = src)) if(!src || secure) return P.use(2) to_chat(user, "You reinforce the windoor.") - src.secure = 1 if(src.anchored) src.name = "secure anchored windoor assembly" @@ -168,7 +160,6 @@ obj/structure/windoor_assembly/Destroy() var/obj/item/stack/cable_coil/CC = W CC.use(1) to_chat(user, "You wire the windoor!") - src.state = "02" if(src.secure) src.name = "secure wired windoor assembly" @@ -189,7 +180,6 @@ obj/structure/windoor_assembly/Destroy() return to_chat(user, "You cut the windoor wires!") - new/obj/item/stack/cable_coil(get_turf(user), 1) src.state = "01" if(src.secure) @@ -209,7 +199,6 @@ obj/structure/windoor_assembly/Destroy() W.loc = src.loc return to_chat(user, "You've installed the airlock electronics!") - src.name = "near finished windoor assembly" src.electronics = W else @@ -227,7 +216,6 @@ obj/structure/windoor_assembly/Destroy() if(!src || !electronics) return to_chat(user, "You've removed the airlock electronics!") - src.name = "wired windoor assembly" var/obj/item/weapon/airlock_electronics/ae ae = electronics @@ -249,7 +237,6 @@ obj/structure/windoor_assembly/Destroy() else if(istype(W, /obj/item/weapon/crowbar)) if(!src.electronics) to_chat(usr, "The assembly is missing electronics.") - return usr << browse(null, "window=windoor_access") playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1) @@ -262,7 +249,6 @@ obj/structure/windoor_assembly/Destroy() density = 1 //Shouldn't matter but just incase to_chat(user, "You finish the windoor!") - if(secure) var/obj/machinery/door/window/brigdoor/windoor = new /obj/machinery/door/window/brigdoor(src.loc) if(src.facing == "l") @@ -323,7 +309,6 @@ obj/structure/windoor_assembly/Destroy() return if (src.anchored) to_chat(usr, "It is fastened to the floor; therefore, you can't rotate it!") - return 0 //if(src.state != "01") //update_nearby_tiles(need_rebuild=1) //Compel updates before @@ -347,12 +332,10 @@ obj/structure/windoor_assembly/Destroy() if(src.facing == "l") to_chat(usr, "The windoor will now slide to the right.") - src.facing = "r" else src.facing = "l" to_chat(usr, "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 a0a3e91cdaa..eecfc4ac408 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -211,24 +211,20 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f state = 3 - state playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) to_chat(user, (state == 1 ? "You have unfastened the window from the frame." : "You have fastened the window to the frame.")) - else if(reinf && state == 0) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) to_chat(user, (anchored ? "You have fastened the frame to the floor." : "You have unfastened the frame from the floor.")) - else if(!reinf) anchored = !anchored update_nearby_icons() playsound(loc, 'sound/items/Screwdriver.ogg', 75, 1) to_chat(user, (anchored ? "You have fastened the window to the floor." : "You have unfastened the window.")) - else if(istype(W, /obj/item/weapon/crowbar) && reinf && state <= 1) state = 1 - state playsound(loc, 'sound/items/Crowbar.ogg', 75, 1) to_chat(user, (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")) - else if(istype(W, /obj/item/weapon/wrench) && !anchored && health > 7) //Disassemble deconstructed window into parts playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) for(var/i=0;iYou have disassembled the window.") - disassembled = 1 density = 0 air_update_turf(1) @@ -294,7 +289,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(anchored) to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") - return 0 dir = turn(dir, 90) @@ -314,7 +308,6 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f if(anchored) to_chat(usr, "It is fastened to the floor therefore you can't rotate it!") - return 0 dir = turn(dir, 270) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index 9ded0a7102d..89e968c23b8 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -20,17 +20,14 @@ var/send_emergency_team if(!ticker) to_chat(usr, "\red The game hasn't started yet!") - return if(ticker.current_state == 1) to_chat(usr, "\red The round hasn't started yet!") - return if(send_emergency_team) to_chat(usr, "\red Central Command has already dispatched an emergency response team!") - return if(alert("Do you want to dispatch an Emergency Response Team?",,"Yes","No") != "Yes") @@ -43,7 +40,6 @@ var/send_emergency_team if(send_emergency_team) to_chat(usr, "\red Central Command has already dispatched an emergency response team!") - return var/ert_type = pick_ert_type() @@ -81,33 +77,27 @@ var/send_emergency_team if(!istype(usr,/mob/dead/observer) && !istype(usr,/mob/new_player)) to_chat(usr, "You need to be an observer or new player to use this.") - return if(!send_emergency_team) to_chat(usr, "No emergency response team is currently being sent.") - return if(jobban_isbanned(usr, "Emergency Response Team")) to_chat(usr, "You are jobbanned from the emergency reponse team!") - return var/player_age_check = check_client_age(usr.client, responseteam_age) if(player_age_check && config.use_age_restriction_for_antags) to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.") - return if(src.has_enabled_antagHUD == 1 && config.antag_hud_restricted) to_chat(usr, "\blue Upon using the antagHUD you forfeited the ability to join the round.") - return if(response_team_members.len > 6) to_chat(usr, "The emergency response team is already full!") - return for (var/obj/effect/landmark/L in landmarks_list) diff --git a/code/game/sound.dm b/code/game/sound.dm index 83422072932..264b5f93565 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -95,14 +95,12 @@ var/const/FALLOFF_SOUNDS = 0.5 S.environment = 2 to_chat(src, S) - /client/proc/playtitlemusic() if(!ticker || !ticker.login_music || config.disable_lobby_music) return if(prefs.sound & SOUND_LOBBY) to_chat(src, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS - /proc/get_rand_frequency() return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs. diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 92f81302629..f150be57ba6 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -153,18 +153,14 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3"," broken = 0 burnt = 0 to_chat(user, "You remove the broken plating.") - else if(istype(src, /turf/simulated/floor/wood)) to_chat(user, "You forcefully pry off the planks, destroying them in the process.") - else if(!builtin_tile) to_chat(user, "You are unable to pry up \the [src] with a crowbar.") - return 1 else to_chat(user, "You remove \the [builtin_tile.singular_name].") - builtin_tile.loc = src builtin_tile = null //deassociate tile, it no longer belongs to this turf make_plating() diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index ed15e8a23bf..0a569d91378 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -15,7 +15,6 @@ if(broken || burnt) return to_chat(user, "You unscrew the planks.") - new floor_tile(src) make_plating() playsound(src, 'sound/items/Screwdriver.ogg', 80, 1) @@ -44,7 +43,6 @@ new /obj/item/weapon/ore/glass(src) new /obj/item/weapon/ore/glass(src) //Make some sand if you shovel grass to_chat(user, "You shovel the grass.") - make_plating() /turf/simulated/floor/carpet diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index 3ee2d78813d..f221494414f 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -69,10 +69,8 @@ state = LIGHTFLOOR_ON update_icon() to_chat(user, "You replace the light bulb.") - else to_chat(user, "The light bulb seems fine, no need to replace it.") - if(istype(C,/obj/item/device/multitool)) if(state != 0) if(state < LIGHTFLOOR_PURPLE) @@ -80,8 +78,6 @@ else state = LIGHTFLOOR_ON to_chat(user, "You change \the [src]'s light bulb color.") - update_icon() else to_chat(user, "\The [src]'s light bulb appears to have burned out.") - diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 7890b8a180a..2a239ea04ee 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -28,23 +28,19 @@ if(istype(C, /obj/item/stack/rods)) if(broken || burnt) to_chat(user, "Repair the plating first!") - return 1 var/obj/item/stack/rods/R = C if (R.get_amount() < 2) to_chat(user, "You need two rods to make a reinforced floor!") - return 1 else to_chat(user, "You begin reinforcing the floor...") - if(do_after(user, 30, target = src)) if (R.get_amount() >= 2 && !istype(src, /turf/simulated/floor/engine)) ChangeTurf(/turf/simulated/floor/engine) playsound(src, 'sound/items/Deconstruct.ogg', 80, 1) R.use(2) to_chat(user, "You reinforce the floor.") - return 1 else if(istype(C, /obj/item/stack/tile)) @@ -56,7 +52,6 @@ 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.") - return 1 else if(istype(C, /obj/item/weapon/weldingtool)) @@ -64,7 +59,6 @@ if( welder.isOn() && (broken || burnt) ) if(welder.remove_fuel(0,user)) to_chat(user, "You fix some dents on the broken plating.") - playsound(src, 'sound/items/Welder.ogg', 80, 1) icon_state = icon_plating burnt = 0 @@ -111,7 +105,6 @@ return if(istype(C, /obj/item/weapon/wrench)) to_chat(user, "You begin removing rods...") - playsound(src, 'sound/items/Ratchet.ogg', 80, 1) if(do_after(user, 30, target = src)) if(!istype(src, /turf/simulated/floor/engine)) @@ -232,7 +225,6 @@ if(!broken && isscrewdriver(C)) to_chat(user, "You unscrew the catwalk's rods.") - new /obj/item/stack/rods(src, 1) ReplaceWithLattice() for(var/direction in cardinal) diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 514da6e3f02..8f1dded0a6e 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -48,23 +48,18 @@ if(!damage) to_chat(user, "It looks fully intact.") - else var/dam = damage / damage_cap if(dam <= 0.3) to_chat(user, "It looks slightly damaged.") - else if(dam <= 0.6) to_chat(user, "It looks moderately damaged.") - else to_chat(user, "It looks heavily damaged.") - if(rotting) to_chat(user, "There is fungus growing on [src].") - /turf/simulated/wall/proc/update_icon() if(!damage_overlays[1]) //list hasn't been populated generate_overlays() @@ -239,7 +234,6 @@ F.icon_state = "wall_thermite" to_chat(user, "The thermite starts melting through the wall.") - spawn(100) if(O) qdel(O) // F.sd_LumReset() //TODO: ~Carn @@ -254,15 +248,12 @@ if(M.environment_smash == 3) dismantle_wall(1) to_chat(M, "You smash through the wall.") - else to_chat(M, text("You smash against the wall.")) - take_damage(rand(25, 75)) return to_chat(M, "\blue You push the wall but nothing happens!") - return /turf/simulated/wall/attack_hand(mob/user as mob) @@ -271,29 +262,24 @@ if (prob(hardness) || rotting) playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1) to_chat(user, text("You smash through the wall.")) - user.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) dismantle_wall(1) return else playsound(src, 'sound/effects/bang.ogg', 50, 1) to_chat(user, text("You punch the wall.")) - return if(rotting) if(hardness <= 10) to_chat(user, "This wall feels rather unstable.") - return else to_chat(user, "The wall crumbles under your touch.") - dismantle_wall() return to_chat(user, "You push the wall but nothing happens!") - playsound(src, 'sound/weapons/Genhit.ogg', 25, 1) src.add_fingerprint(user) ..() @@ -303,7 +289,6 @@ user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return //get the user's location @@ -314,7 +299,6 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) to_chat(user, "You burn away the fungi with \the [WT].") - playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") qdel(E) @@ -322,7 +306,6 @@ return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) to_chat(user, "\The [src] crumbles away under the force of your [W.name].") - src.dismantle_wall(1) return @@ -343,7 +326,6 @@ EB.spark_system.start() to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") - playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -362,42 +344,34 @@ if(WT.remove_fuel(0,user)) if(response == "Repair") to_chat(user, "You start repairing the damage to [src].") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, max(5, damage / 5), target = src) && WT && WT.isOn()) to_chat(user, "You finish repairing the damage to [src].") - take_damage(-damage) else if(response == "Dismantle") to_chat(user, "You begin slicing through the outer plating.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 100, target = src) && WT && WT.isOn()) to_chat(user, "You remove the outer plating.") - dismantle_wall() else to_chat(user, "You stop slicing through [src].") - return else to_chat(user, "You need more welding fuel to complete this task.") - return else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) to_chat(user, "You begin slicing through the outer plating.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, mineral == "diamond" ? 120 : 60, target = src)) to_chat(user, "You remove the outer plating.") - dismantle_wall() visible_message("[user] slices apart \the [src]!","You hear metal being sliced apart.") @@ -406,10 +380,8 @@ to_chat(user, "You begin to drill though the wall.") - if(do_after(user, mineral == "diamond" ? 120 : 60, target = src)) to_chat(user, "Your drill tears though the last of the reinforced plating.") - dismantle_wall() visible_message("[user] drills through \the [src]!","You hear the grinding of metal.") @@ -417,10 +389,8 @@ to_chat(user, "You begin to disintegrates the wall.") - if(do_after(user, mineral == "diamond" ? 60 : 30, target = src)) to_chat(user, "Your jackhammer disintegrate the reinforced plating.") - dismantle_wall() visible_message("[user] disintegrates \the [src]!","You hear the grinding of metal.") @@ -429,7 +399,6 @@ EB.spark_system.start() to_chat(user, "You stab \the [EB] into the wall and begin to slice it apart.") - playsound(src, "sparks", 50, 1) if(do_after(user, mineral == "diamond" ? 140 : 70, target = src)) diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm index 882b03f9136..1d792647042 100644 --- a/code/game/turfs/simulated/walls_reinforced.dm +++ b/code/game/turfs/simulated/walls_reinforced.dm @@ -17,7 +17,6 @@ user.changeNext_move(CLICK_CD_MELEE) if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") - return //get the user's location @@ -28,7 +27,6 @@ var/obj/item/weapon/weldingtool/WT = W if( WT.remove_fuel(0,user) ) to_chat(user, "You burn away the fungi with \the [WT].") - playsound(src, 'sound/items/Welder.ogg', 10, 1) for(var/obj/effect/E in src) if(E.name == "Wallrot") qdel(E) @@ -36,7 +34,6 @@ return else if(!is_sharp(W) && W.force >= 10 || W.force >= 20) to_chat(user, "\The [src] crumbles away under the force of your [W.name].") - src.dismantle_wall() return @@ -57,7 +54,6 @@ EB.spark_system.start() to_chat(user, "You slash \the [src] with \the [EB]; the thermite ignites!") - playsound(src, "sparks", 50, 1) playsound(src, 'sound/weapons/blade1.ogg', 50, 1) @@ -66,23 +62,19 @@ else if(istype(W, /obj/item/weapon/melee/energy/blade)) to_chat(user, "This wall is too thick to slice through. You will need to find a different path.") - return if(damage && istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) to_chat(user, "You start repairing the damage to [src].") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, max(5, damage / 5), target = src) && WT && WT.isOn()) to_chat(user, "You finish repairing the damage to [src].") - take_damage(-damage) return else to_chat(user, "You need more welding fuel to complete this task.") - return @@ -95,20 +87,17 @@ update_icon() new /obj/item/stack/rods(src) to_chat(user, "You cut the outer grille.") - return if(1) if (istype(W, /obj/item/weapon/screwdriver)) to_chat(user, "You begin removing the support lines.") - playsound(src, 'sound/items/Screwdriver.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 1) d_state = 2 update_icon() to_chat(user, "You remove the support lines.") - return //REPAIRING (replacing the outer grille for cosmetic damage) @@ -119,17 +108,14 @@ update_icon() src.icon_state = "r_wall" to_chat(user, "You replace the outer grille.") - else to_chat(user, "You don't have enough rods for that!") - if(2) if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) to_chat(user, "You begin slicing through the metal cover.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 60, target = src) && d_state == 2) @@ -137,48 +123,40 @@ update_icon() to_chat(user, "You press firmly on the cover, dislodging it.") - else to_chat(user, "You need more welding fuel to complete this task.") - return if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) to_chat(user, "You begin slicing through the metal cover.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 2) d_state = 3 update_icon() to_chat(user, "You press firmly on the cover, dislodging it.") - return if(3) if(istype(W, /obj/item/weapon/crowbar)) to_chat(user, "You struggle to pry off the cover.") - playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 3) d_state = 4 update_icon() to_chat(user, "You pry off the cover.") - return if(4) if(istype(W, /obj/item/weapon/wrench)) to_chat(user, "You start loosening the anchoring bolts which secure the support rods to their frame.") - playsound(src, 'sound/items/Ratchet.ogg', 100, 1) if(do_after(user, 40, target = src) && d_state == 4) d_state = 5 update_icon() to_chat(user, "You remove the bolts anchoring the support rods.") - return if(5) @@ -186,7 +164,6 @@ var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0,user)) to_chat(user, "You begin slicing through the support rods.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 5) @@ -194,15 +171,12 @@ update_icon() new /obj/item/stack/rods(src) to_chat(user, "The support rods drop out as you cut them loose from the frame.") - else to_chat(user, "You need more welding fuel to complete this task.") - return if(istype(W, /obj/item/weapon/gun/energy/plasmacutter)) to_chat(user, "You begin slicing through the support rods.") - playsound(src, 'sound/items/Welder.ogg', 100, 1) if(do_after(user, 70, target = src) && d_state == 5) @@ -210,18 +184,15 @@ update_icon() new /obj/item/stack/rods( src ) to_chat(user, "The support rods drop out as you cut them loose from the frame.") - return if(6) if(istype(W, /obj/item/weapon/crowbar)) to_chat(user, "You struggle to pry off the outer sheath.") - playsound(src, 'sound/items/Crowbar.ogg', 100, 1) if(do_after(user, 100, target = src) && d_state == 6) to_chat(user, "You pry off the outer sheath.") - dismantle_wall() return @@ -231,19 +202,15 @@ if(istype(W, /obj/item/weapon/pickaxe/drill/diamonddrill)) to_chat(user, "You begin to drill though the wall.") - if(do_after(user, 200, target = src)) to_chat(user, "Your drill tears through the last of the reinforced plating.") - dismantle_wall() if(istype(W,/obj/item/weapon/pickaxe/drill/jackhammer)) to_chat(user, "You begin to disintegrate the wall.") - if(do_after(user, 100, target = src)) to_chat(user, "Your sonic jackhammer disintegrates the reinforced plating.") - dismantle_wall() //REPAIRING @@ -252,11 +219,9 @@ to_chat(user, "You begin patching-up the wall with \a [MS].") - if(do_after(user, max(20 * d_state, 100), target = src) && d_state) if(!MS.use(1)) to_chat(user, "You don't have enough metal for that!") - return d_state = 0 @@ -265,7 +230,6 @@ to_chat(user, "You repair the last of the damage.") - //APC else if(istype(W,/obj/item/mounted)) return diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index f8da6e361f2..58f6e4a41d9 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -39,22 +39,18 @@ if(L) if(R.use(1)) to_chat(user, "You begin constructing catwalk...") - playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) qdel(L) ChangeTurf(/turf/simulated/floor/plating/airless/catwalk) else to_chat(user, "You need two rods to build a catwalk!") - return if(R.use(1)) to_chat(user, "Constructing support lattice...") - playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) ReplaceWithLattice() else to_chat(user, "You need one rod to build a lattice.") - return if(istype(C, /obj/item/stack/tile/plasteel)) @@ -65,15 +61,12 @@ qdel(L) playsound(src, 'sound/weapons/Genhit.ogg', 50, 1) to_chat(user, "You build a floor.") - ChangeTurf(/turf/simulated/floor/plating) else to_chat(user, "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.") - /turf/space/Entered(atom/movable/A as mob|obj) ..() @@ -115,11 +108,8 @@ /* //debug to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") - to_chat(world, "Target Z = [target_z]") - to_chat(world, "Next X = [next_x]") - //debug */ if(target_z) @@ -143,11 +133,8 @@ /* //debug to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") - to_chat(world, "Target Z = [target_z]") - to_chat(world, "Next X = [next_x]") - //debug */ if(target_z) @@ -170,11 +157,8 @@ /* //debug to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") - to_chat(world, "Next Y = [next_y]") - to_chat(world, "Target Z = [target_z]") - //debug */ if(target_z) @@ -198,11 +182,8 @@ /* //debug to_chat(world, "Src.z = [src.z] in global map X = [cur_x], Y = [cur_y]") - to_chat(world, "Next Y = [next_y]") - to_chat(world, "Target Z = [target_z]") - //debug */ if(target_z) diff --git a/code/game/vehicles/spacepods/equipment.dm b/code/game/vehicles/spacepods/equipment.dm index f3678e57701..734216657ce 100644 --- a/code/game/vehicles/spacepods/equipment.dm +++ b/code/game/vehicles/spacepods/equipment.dm @@ -1,13 +1,11 @@ /obj/item/device/spacepod_equipment/weaponry/proc/fire_weapons() if(my_atom.next_firetime > world.time) to_chat(usr, "Your weapons are recharging.") - return var/turf/firstloc var/turf/secondloc if(!my_atom.equipment_system || !my_atom.equipment_system.weapon_system) to_chat(usr, "Missing equipment or weapons.") - my_atom.verbs -= text2path("[type]/proc/fire_weapons") return my_atom.battery.use(shot_cost) diff --git a/code/game/vehicles/spacepods/parts.dm b/code/game/vehicles/spacepods/parts.dm index a70c203fd3c..0747f1c5a14 100644 --- a/code/game/vehicles/spacepods/parts.dm +++ b/code/game/vehicles/spacepods/parts.dm @@ -60,12 +60,10 @@ var/list/linkedparts = find_square() if(!linkedparts) to_chat(user, "You cannot assemble a pod frame because you do not have the necessary assembly.") - return var/obj/structure/spacepod_frame/pod = new /obj/structure/spacepod_frame(src.loc) pod.dir = src.dir to_chat(user, "You strut the pod frame together.") - R.use(10) 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 @@ -75,7 +73,6 @@ playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(istype(O, /obj/item/weapon/wrench)) to_chat(user, "You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]") - anchored = !anchored density = anchored playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) @@ -86,7 +83,6 @@ set src in oview(1) if(anchored) to_chat(usr, "\The [src] is securely bolted!") - return 0 src.dir = turn(src.dir, -90) return 1 diff --git a/code/game/vehicles/spacepods/pod_fabricator.dm b/code/game/vehicles/spacepods/pod_fabricator.dm index 3452c95f851..948491c6d29 100644 --- a/code/game/vehicles/spacepods/pod_fabricator.dm +++ b/code/game/vehicles/spacepods/pod_fabricator.dm @@ -500,7 +500,6 @@ return 1 else to_chat(user, "You can't load \the [name] while it's opened.") - return 1 if(istype(W, /obj/item/stack)) @@ -527,11 +526,9 @@ if(being_built) to_chat(user, "\The [src] is currently processing. Please wait until completion.") - return if(res_max_amount - resources[material] < MINERAL_MATERIAL_AMOUNT) //overstuffing the fabricator to_chat(user, "\The [src] [material2name(material)] storage is full.") - return var/obj/item/stack/sheet/stack = W var/sname = "[stack.name]" @@ -542,13 +539,11 @@ resources[material] += transfer_amount * MINERAL_MATERIAL_AMOUNT stack.use(transfer_amount) to_chat(user, "You insert [transfer_amount] [sname] sheet\s into \the [src].") - sleep(10) updateUsrDialog() overlays -= "fab-load-[material2name(material)]" //No matter what the overlay shall still be deleted else to_chat(user, "\The [src] cannot hold any more [sname] sheet\s.") - return /obj/machinery/spod_part_fabricator/proc/material2name(var/ID) diff --git a/code/game/vehicles/spacepods/spacepod.dm b/code/game/vehicles/spacepods/spacepod.dm index 63ed986856c..95ef15b1922 100644 --- a/code/game/vehicles/spacepods/spacepod.dm +++ b/code/game/vehicles/spacepods/spacepod.dm @@ -147,7 +147,6 @@ deal_damage(15) playsound(src.loc, 'sound/weapons/slash.ogg', 50, 1, -1) to_chat(user, "\red You slash at \the [src]!") - visible_message("\red The [user] slashes at [src.name]'s armor!") return @@ -162,20 +161,16 @@ S.channel = 0 //Any channel S.volume = 50 to_chat(occupant, S) - if(occupant2) to_chat(occupant2, S) - if(occupant && oldhealth > health && !health) var/sound/S = sound('sound/effects/engine_alert1.ogg') S.wait = 0 S.channel = 0 S.volume = 50 to_chat(occupant, S) - if(occupant2) to_chat(occupant2, S) - if(!health) spawn(0) if(occupant) @@ -183,13 +178,11 @@ if(occupant2) to_chat(occupant2, "Critical damage to the vessel detected, core explosion imminent!") - for(var/i = 10, i >= 0; --i) if(occupant) to_chat(occupant, "[i]") if(occupant2) to_chat(occupant2, "[i]") - if(i == 0) explosion(loc, 2, 4, 8) qdel(src) @@ -213,12 +206,10 @@ H.forceMove(get_turf(src)) H.ex_act(severity + 1) to_chat(H, "You are forcefully thrown from \the [src]!") - if(H2) H2.forceMove(get_turf(src)) H2.ex_act(severity + 1) to_chat(H2, "You are forcefully thrown from \the [src]!") - qdel(ion_trail) qdel(src) if(2) @@ -237,7 +228,6 @@ to_chat(occupant2, "The pod console flashes 'Heavy EMP WAVE DETECTED'.")//warn the occupants - if(battery) battery.charge = max(0, battery.charge - 5000) //Cell EMP act is too weak, this pod needs to be sapped. src.deal_damage(100) @@ -251,7 +241,6 @@ if(occupant2) to_chat(occupant2, "The pod console flashes 'EMP WAVE DETECTED'.")//warn the occupants - deal_damage(40) if(battery) battery.charge = max(0, battery.charge - 2500) //Cell EMP act is too weak, this pod needs to be sapped. @@ -264,15 +253,12 @@ hatch_open = !hatch_open playsound(loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "You [hatch_open ? "open" : "close"] the maintenance hatch.") - if(istype(W, /obj/item/weapon/stock_parts/cell)) if(!hatch_open) to_chat(user, "\red The maintenance hatch is closed!") - return if(battery) to_chat(user, "The pod already has a battery.") - return user.drop_item(W) battery = W @@ -281,20 +267,16 @@ if(istype(W, /obj/item/device/spacepod_equipment)) if(!hatch_open) to_chat(user, "\red The maintenance hatch is closed!") - return if(!equipment_system) to_chat(user, "The pod has no equipment datum, yell at pomf") - return if(istype(W, /obj/item/device/spacepod_equipment/weaponry)) if(equipment_system.weapon_system) to_chat(user, "The pod already has a weapon system, remove it first.") - return else to_chat(user, "You insert \the [W] into the equipment system.") - user.drop_item(W) W.forceMove(src) equipment_system.weapon_system = W @@ -304,11 +286,9 @@ if(istype(W, /obj/item/device/spacepod_equipment/misc)) if(equipment_system.misc_system) to_chat(user, "The pod already has a miscellaneous system, remove it first.") - return else to_chat(user, "You insert \the [W] into the equipment system.") - user.drop_item(W) W.forceMove(src) equipment_system.misc_system = W @@ -317,11 +297,9 @@ if(istype(W, /obj/item/device/spacepod_equipment/cargo)) if(equipment_system.cargo_system) to_chat(user, "The pod already has a cargo system, remove it first.") - return else to_chat(user, "You insert \the [W] into the cargo system.") - user.drop_item(W) W.forceMove(src) equipment_system.cargo_system = W @@ -331,33 +309,27 @@ if(istype(W, /obj/item/weapon/weldingtool)) if(!hatch_open) to_chat(user, "\red You must open the maintenance hatch before attempting repairs.") - return var/obj/item/weapon/weldingtool/WT = W if(!WT.isOn()) to_chat(user, "\red The welder must be on for this task.") - return if (health < initial(health)) to_chat(user, "\blue You start welding the spacepod...") - playsound(loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.remove_fuel(3, user)) return repair_damage(10) to_chat(user, "\blue You mend some [pick("dents","bumps","damage")] with \the [WT]") - else to_chat(user, "\blue \The [src] is fully repaired!") - /obj/spacepod/attack_hand(mob/user as mob) if(!hatch_open) return ..() if(!equipment_system || !istype(equipment_system)) to_chat(user, "The pod has no equpment datum, or is the wrong type, yell at pomf.") - return var/list/possible = list() if(battery) @@ -379,60 +351,49 @@ if("Energy Cell") if(user.put_in_any_hand_if_possible(battery)) to_chat(user, "You remove \the [battery] from the space pod") - battery = null if("Weapon System") SPE = equipment_system.weapon_system if(user.put_in_any_hand_if_possible(SPE)) to_chat(user, "You remove \the [SPE] from the equipment system.") - SPE.removed(user) SPE.my_atom = null equipment_system.weapon_system = null else to_chat(user, "You need an open hand to do that.") - if("Misc. System") SPE = equipment_system.misc_system if(user.put_in_any_hand_if_possible(SPE)) to_chat(user, "You remove \the [SPE] from the equipment system.") - SPE.removed(user) SPE.my_atom = null equipment_system.misc_system = null else to_chat(user, "You need an open hand to do that.") - if("Cargo System") SPE = equipment_system.cargo_system if(user.put_in_any_hand_if_possible(SPE)) to_chat(user, "You remove \the [SPE] from the equipment system.") - SPE.removed(user) SPE.my_atom = null equipment_system.cargo_system = null else to_chat(user, "You need an open hand to do that.") - /* if("engine system") SPE = equipment_system.engine_system if(user.put_in_any_hand_if_possible(SPE)) to_chat(user, "You remove \the [SPE] from the equipment system.") - equipment_system.engine_system = null else to_chat(user, "You need an open hand to do that.") - if("shield system") SPE = equipment_system.shield_system if(user.put_in_any_hand_if_possible(SPE)) to_chat(user, "You remove \the [SPE] from the equipment system.") - equipment_system.shield_system = null else to_chat(user, "You need an open hand to do that.") - */ return @@ -491,7 +452,6 @@ return use_internal_tank = !use_internal_tank to_chat(occupant, "Now taking air from [use_internal_tank?"internal airtank":"environment"].") - return /obj/spacepod/proc/add_cabin() @@ -567,7 +527,6 @@ if(M != user && M.stat == DEAD && allow2enter) if(occupant2 && !occupant) to_chat(usr, "You can't put a corpse into the driver's seat!") - return 0 if(!occupant2) visible_message("[user.name] starts loading [M.name] into the pod!") @@ -583,19 +542,15 @@ var/obj/item/device/spacepod_equipment/cargo/ore/C = equipment_system.cargo_system if(!C.box) to_chat(user, "You begin loading \the [O] into \the [src]'s [equipment_system.cargo_system]") - if(do_after(user, 40, target = src)) C.box = O O.forceMove(C) to_chat(user, "You load \the [O] into \the [src]'s [equipment_system.cargo_system]!") - else to_chat(user, "You fail to load \the [O] into \the [src]'s [equipment_system.cargo_system]") - else to_chat(user, "\The [src] already has \an [C.box]") - /obj/spacepod/verb/enter_pod(mob/user = usr) set category = "Object" set name = "Enter Pod" @@ -606,7 +561,6 @@ if(get_dist(src, user) > 2 || get_dist(usr, user) > 1) to_chat(usr, "They are too far away to put inside") - return if(!istype(user)) @@ -621,13 +575,11 @@ if(fukkendisk) to_chat(user, "The nuke-disk is locking the door every time you try to open it. You get the feeling that it doesn't want to go into the spacepod.") - return 0 for(var/mob/living/carbon/slime/S in range(1,usr)) if(S.Victim == user) to_chat(user, "You're too busy getting your life sucked out of you.") - return 0 move_inside(user) @@ -649,11 +601,9 @@ playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) else to_chat(user, "[occupant] was faster. Try better next time, loser.") - else to_chat(user, "You stop entering \the [src].") - else if(!occupant2) visible_message("[user] starts to climb into \the [src].") if(do_after(user, 40, target = src)) @@ -665,14 +615,11 @@ playsound(src, 'sound/machines/windowdoor.ogg', 50, 1) else to_chat(user, "[occupant] was faster. Try better next time, loser.") - else to_chat(user, "You stop entering \the [src].") - else to_chat(user, "You can't fit in \the [src], it's full!") - /obj/spacepod/proc/occupant_sanity_check() if(occupant) if(!ismob(occupant)) @@ -715,20 +662,16 @@ if(1) if(occupant2) to_chat(occupant2, "[occupant.name] climbs out of the pod!") - occupant.forceMove(src.loc) occupant = null to_chat(user, "You climb out of \the [src].") - if(2) if(occupant) to_chat(occupant, "[occupant2.name] climbs out of the pod!") - occupant2.forceMove(src.loc) occupant2 = null to_chat(user, "You climb out of \the [src].") - /obj/spacepod/verb/exit_pod2() set name = "Eject Secondary Seat" set category = "Spacepod" @@ -738,19 +681,15 @@ if(!occupant2) to_chat(usr, "There is no one in the second seat.") - return if(usr == occupant2) to_chat(usr, "How do you plan to do that? The eject button is out of reach.") - return if(usr == occupant) to_chat(usr, "You eject [occupant2.name].") - to_chat(occupant2, "\The [src] ejects you forcefully!") - inertia_dir = 0 occupant2.forceMove(src.loc) occupant2 = null @@ -763,14 +702,12 @@ if(CheckIfOccupant2(usr)) if(!allow2enter) to_chat(usr, "You can't [allow2enter ? "lock" : "unlock"] the doors from your seat.") - return allow2enter = !allow2enter to_chat(usr, "You [allow2enter ? "unlock" : "lock"] the doors.") - /obj/spacepod/verb/toggleDoors() set name = "Toggle Nearby Pod Doors" set category = "Spacepod" @@ -792,11 +729,9 @@ P.close() return 1 to_chat(usr, "Access denied.") - return to_chat(usr, "You are not close to any pod doors.") - return @@ -808,7 +743,6 @@ set src = usr.loc if(!equipment_system.weapon_system) to_chat(usr, "\The [src] has no weapons!") - return equipment_system.weapon_system.fire_weapons() @@ -820,7 +754,6 @@ set src = usr.loc if(!equipment_system.cargo_system) to_chat(usr, "\The [src] has no cargo system!") - return equipment_system.cargo_system.unload() @@ -838,7 +771,6 @@ else set_light(0) to_chat(occupant, "Toggled lights [lights ? "on" : "off"].") - return /obj/spacepod/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5) @@ -932,19 +864,14 @@ else if(!battery) to_chat(user, "No energy cell detected.") - else if(battery.charge < 1) to_chat(user, "Not enough charge left.") - else if(!health) to_chat(user, "She's dead, Jim") - else if(empcounter != 0) to_chat(user, "The pod control interface isn't responding. The console indicates [empcounter] seconds before reboot.") - else to_chat(user, "Unknown error has occurred, yell at the coders.") - return 0 battery.charge = max(0, battery.charge - 1) next_move = world.time + move_delay diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 69fc81e195b..48bb773c453 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -12,7 +12,6 @@ var/global/admin_ooc_colour = "#b82e00" return if(IsGuestKey(key)) to_chat(src, "Guests may not use OOC.") - return msg = trim(sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))) @@ -21,27 +20,22 @@ var/global/admin_ooc_colour = "#b82e00" if(!(prefs.toggles & CHAT_OOC)) to_chat(src, "You have OOC muted.") - return if(!check_rights(R_ADMIN|R_MOD,0)) if(!config.ooc_allowed) to_chat(src, "OOC is globally muted.") - return if(!config.dooc_allowed && (mob.stat == DEAD)) to_chat(usr, "OOC for dead mobs has been turned off.") - return if(prefs.muted & MUTE_OOC) to_chat(src, "You cannot use OOC (muted).") - return if(handle_spam_prevention(msg, MUTE_OOC)) return if(findtext(msg, "byond://")) to_chat(src, "Advertising other servers is not allowed.") - log_admin("[key_name(src)] has attempted to advertise in OOC: [msg]") message_admins("[key_name_admin(src)] has attempted to advertise in OOC: [msg]") return @@ -78,16 +72,13 @@ var/global/admin_ooc_colour = "#b82e00" display_name = holder.fakekey to_chat(C, "OOC: [display_name]: [msg]") - /proc/toggle_ooc() config.ooc_allowed = ( !config.ooc_allowed ) if (config.ooc_allowed) to_chat(world, "The OOC channel has been globally enabled!") - else to_chat(world, "The OOC channel has been globally disabled!") - /proc/auto_toggle_ooc(var/on) if(config.auto_toggle_ooc_during_round && config.ooc_allowed != on) toggle_ooc() @@ -132,7 +123,6 @@ var/global/admin_ooc_colour = "#b82e00" prefs.save_preferences(src) to_chat(usr, "Your OOC color has been set to [new_ooccolor].") - feedback_add_details("admin_verb","OC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/resetcolorooc() @@ -146,7 +136,6 @@ var/global/admin_ooc_colour = "#b82e00" prefs.save_preferences(src) to_chat(usr, "Your OOC color has been reset.") - feedback_add_details("admin_verb","ROC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/looc(msg as text) @@ -158,7 +147,6 @@ var/global/admin_ooc_colour = "#b82e00" return if(IsGuestKey(key)) to_chat(src, "Guests may not use OOC.") - return msg = trim(sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))) @@ -167,27 +155,22 @@ var/global/admin_ooc_colour = "#b82e00" if(!(prefs.toggles & CHAT_LOOC)) to_chat(src, "You have LOOC muted.") - return if(!check_rights(R_ADMIN|R_MOD,0)) if(!config.looc_allowed) to_chat(src, "LOOC is globally muted.") - return if(!config.dooc_allowed && (mob.stat == DEAD)) to_chat(usr, "LOOC for dead mobs has been turned off.") - return if(prefs.muted & MUTE_OOC) to_chat(src, "You cannot use LOOC (muted).") - return if(handle_spam_prevention(msg,MUTE_OOC)) return if(findtext(msg, "byond://")) to_chat(src, "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 @@ -234,7 +217,6 @@ var/global/admin_ooc_colour = "#b82e00" if(send) to_chat(target, "LOOC[prefix]: [display_name][admin_stuff]: [msg]") - /mob/proc/get_looc_source() return src diff --git a/code/game/verbs/suicide.dm b/code/game/verbs/suicide.dm index 78da8e2169f..5d91c835ea0 100644 --- a/code/game/verbs/suicide.dm +++ b/code/game/verbs/suicide.dm @@ -54,23 +54,19 @@ if (stat == DEAD) to_chat(src, "You're already dead!") - return if (!ticker) to_chat(src, "You can't commit suicide before the game starts!") - return // No more borergrief, one way or the other if(has_brain_worms()) to_chat(src, "You try to bring yourself to commit suicide, but - something prevents you!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -85,7 +81,6 @@ return to_chat(viewers(src), "[src] [pick(species.suicide_messages)] It looks like they're trying to commit suicide.") - do_suicide(0) updatehealth() @@ -95,17 +90,14 @@ if (stat == 2) to_chat(src, "You're already dead!") - return if (!ticker) to_chat(src, "You can't commit suicide before the game starts!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -113,7 +105,6 @@ if(confirm == "Yes") suiciding = 1 to_chat(viewers(loc), "\red [src]'s brain is growing dull and lifeless. It looks like it's lost the will to live.") - spawn(50) death(0) suiciding = 0 @@ -124,12 +115,10 @@ if (stat == 2) to_chat(src, "You're already dead!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -137,7 +126,6 @@ if(confirm == "Yes") suiciding = 1 to_chat(viewers(src), "\red [src] is powering down. It looks like \he's trying to commit suicide.") - //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -147,12 +135,10 @@ if (stat == 2) to_chat(src, "You're already dead!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -160,7 +146,6 @@ if(confirm == "Yes") suiciding = 1 to_chat(viewers(src), "\red [src] is powering down. It looks like \he's trying to commit suicide.") - //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -182,18 +167,15 @@ else to_chat(src, "Aborting suicide attempt.") - /mob/living/carbon/alien/humanoid/verb/suicide() set hidden = 1 if (stat == 2) to_chat(src, "You're already dead!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") @@ -201,7 +183,6 @@ if(confirm == "Yes") suiciding = 1 to_chat(viewers(src), "\red [src] is thrashing wildly! It looks like \he's trying to commit suicide.") - //put em at -175 adjustOxyLoss(max(175 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) updatehealth() @@ -211,12 +192,10 @@ set hidden = 1 if (stat == 2) to_chat(src, "You're already dead!") - return if (suiciding) to_chat(src, "You're already committing suicide! Be patient!") - return var/confirm = alert("Are you sure you want to commit suicide?", "Confirm Suicide", "Yes", "No") diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 5e4a871b4bb..3be9262d1ad 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -65,7 +65,6 @@ msg += "Total Players: [length(Lines)]" to_chat(src, msg) - /client/verb/adminwho() set category = "Admin" set name = "Adminwho" @@ -129,4 +128,3 @@ msg = "Current Admins ([num_admins_online]):\n" + msg + "\nCurrent Mods/Mentors ([num_mods_online]):\n" + modmsg to_chat(src, msg) - diff --git a/code/modules/admin/DB ban/functions.dm b/code/modules/admin/DB ban/functions.dm index b638a6f8a9c..dbf88292f3a 100644 --- a/code/modules/admin/DB ban/functions.dm +++ b/code/modules/admin/DB ban/functions.dm @@ -94,7 +94,6 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = if(blockselfban) if(a_ckey == ckey) to_chat(usr, "You cannot apply this ban type on yourself.") - return var/who @@ -120,14 +119,12 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = var/adm_bans = text2num(adm_query.item[1]) if(adm_bans >= MAX_ADMIN_BANS_PER_ADMIN) to_chat(usr, "You already logged [MAX_ADMIN_BANS_PER_ADMIN] admin ban(s) or more. Do not abuse this function!") - return var/sql = "INSERT INTO [format_table_name("ban")] (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', [(duration)?"[duration]":"0"], [(rounds)?"[rounds]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[ckey]', '[computerid]', '[ip]', '[a_ckey]', '[a_computerid]', '[a_ip]', '[who]', '[adminwho]', '', null, null, null, null, null)" var/DBQuery/query_insert = dbcon.NewQuery(sql) query_insert.Execute() to_chat(usr, "\blue Ban saved to database.") - message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1) if(announceinirc) @@ -196,19 +193,16 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") if(ban_number == 0) to_chat(usr, "\red Database update failed due to no bans fitting the search criteria. If this is not a legacy ban you should contact the database admin.") - return if(ban_number > 1) to_chat(usr, "\red Database update failed due to multiple bans fitting the search criteria. Note down the ckey, job and current time and contact the database admin.") - return if(istext(ban_id)) ban_id = text2num(ban_id) if(!isnum(ban_id)) to_chat(usr, "\red Database update failed due to a ban ID mismatch. Contact the database admin.") - return DB_ban_unban_by_id(ban_id) @@ -219,7 +213,6 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) if(!isnum(banid) || !istext(param)) to_chat(usr, "Cancelled") - return var/DBQuery/query = dbcon.NewQuery("SELECT ckey, duration, reason FROM [format_table_name("ban")] WHERE id = [banid]") @@ -236,7 +229,6 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) reason = query.item[3] else to_chat(usr, "Invalid ban id. Contact the database admin") - return reason = sql_sanitize_text(reason) @@ -249,7 +241,6 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) value = sql_sanitize_text(value) if(!value) to_chat(usr, "Cancelled") - return var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET reason = '[value]', edits = CONCAT(edits,'- [eckey] changed ban reason from \\\"[reason]\\\" to \\\"[value]\\\"
') WHERE id = [banid]") @@ -260,7 +251,6 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) value = input("Insert the new duration (in minutes) for [pckey]'s ban", "New Duration", "[duration]", null) as null|num if(!isnum(value) || !value) to_chat(usr, "Cancelled") - return var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("ban")] SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]
'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]") @@ -272,11 +262,9 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) return else to_chat(usr, "Cancelled") - return else to_chat(usr, "Cancelled") - return datum/admins/proc/DB_ban_unban_by_id(var/id) @@ -300,12 +288,10 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) if(ban_number == 0) to_chat(usr, "\red Database update failed due to a ban id not being present in the database.") - return if(ban_number > 1) to_chat(usr, "\red Database update failed due to multiple bans having the same ID. Contact the database admin.") - return if(!src.owner || !istype(src.owner, /client)) @@ -343,7 +329,6 @@ datum/admins/proc/DB_ban_unban_by_id(var/id) establish_db_connection() if(!dbcon.IsConnected()) to_chat(usr, "\red Failed to establish database connection") - return var/output = "
" diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm index 9421c1e8102..64e6ad6dec4 100644 --- a/code/modules/admin/NewBan.dm +++ b/code/modules/admin/NewBan.dm @@ -107,26 +107,18 @@ var/savefile/Banlist Banlist.cd = "/base" if ( Banlist.dir.Find("[ckey][computerid]") ) to_chat(usr, text("\red Ban already exists.")) - return 0 else Banlist.dir.Add("[ckey][computerid]") Banlist.cd = "/base/[ckey][computerid]" to_chat(Banlist["key"], ckey) - to_chat(Banlist["id"], computerid) - to_chat(Banlist["ip"], address) - to_chat(Banlist["reason"], reason) - to_chat(Banlist["bannedby"], bannedby) - to_chat(Banlist["temp"], temp) - if (temp) to_chat(Banlist["minutes"], bantimestamp) - if(!temp) add_note(ckey, "Permanently banned - [reason]", null, bannedby, 0) else @@ -220,23 +212,16 @@ var/savefile/Banlist Banlist.dir.Add("trash[i]trashid[i]") Banlist.cd = "/base/trash[i]trashid[i]" to_chat(Banlist["key"], "trash[i]") - else Banlist.cd = "/base" Banlist.dir.Add("[last]trashid[i]") Banlist.cd = "/base/[last]trashid[i]" to_chat(Banlist["key"], last) - to_chat(Banlist["id"], "trashid[i]") - to_chat(Banlist["reason"], "Trashban[i].") - to_chat(Banlist["temp"], a) - to_chat(Banlist["minutes"], CMinutes + rand(1,2000)) - to_chat(Banlist["bannedby"], "trashmin") - last = "trash[i]" Banlist.cd = "/base" diff --git a/code/modules/admin/ToRban.dm b/code/modules/admin/ToRban.dm index 9f0cb711547..77e49877259 100644 --- a/code/modules/admin/ToRban.dm +++ b/code/modules/admin/ToRban.dm @@ -36,11 +36,9 @@ if(!cleaned) continue F[cleaned] << 1 to_chat(F["last_update"], world.realtime) - diary << "ToR data updated!" if(usr) to_chat(usr, "ToRban updated.") - return 1 diary << "ToR data update aborted: no data." return 0 @@ -76,19 +74,15 @@ if(choice) F.dir.Remove(choice) to_chat(src, "Address removed") - if("remove all") to_chat(src, "[TORFILE] was [fdel(TORFILE)?"":"not "]removed.") - if("find") var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text if(input) if(ToRban_isbanned(input)) to_chat(src, "Address is a known ToR address") - else to_chat(src, "Address is not a known ToR address") - return #undef TORFILE diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index ae25bc50c72..932fcef0807 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -11,7 +11,6 @@ var/global/nologevent = 0 if(R_SERVER & C.holder.rights) to_chat(C, msg) - /proc/msg_admin_attack(var/text) //Toggleable Attack Messages log_attack(text) if(!nologevent) @@ -24,7 +23,6 @@ var/global/nologevent = 0 to_chat(C, msg) - ///////////////////////////////////////////////////////////////////////////////////////////////Panels /datum/admins/proc/show_player_panel(var/mob/M in mob_list) @@ -34,7 +32,6 @@ var/global/nologevent = 0 if(!M) to_chat(usr, "You seem to be selecting a mob that doesn't exist anymore.") - return if(!check_rights(R_ADMIN|R_MOD)) @@ -474,9 +471,7 @@ var/global/nologevent = 0 dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com" // to_chat(world, "Channelname: [src.admincaster_feed_channel.channel_name] [src.admincaster_feed_channel.author]") - // to_chat(world, "Msg: [src.admincaster_feed_message.author] [src.admincaster_feed_message.body]") - usr << browse(dat, "window=admincaster_main;size=400x600") onclose(usr, "admincaster_main") @@ -552,7 +547,6 @@ var/global/nologevent = 0 message = adminscrub(message,500) message = replacetext(message, "\n", "
") // required since we're putting it in a

tag to_chat(world, "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

") - log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -579,10 +573,8 @@ var/global/nologevent = 0 config.looc_allowed = !(config.looc_allowed) if (config.looc_allowed) to_chat(world, "The LOOC channel has been globally enabled!") - else to_chat(world, "The LOOC channel has been globally disabled!") - log_and_message_admins("toggled LOOC.") feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -597,10 +589,8 @@ var/global/nologevent = 0 config.dsay_allowed = !(config.dsay_allowed) if (config.dsay_allowed) to_chat(world, "Deadchat has been globally enabled!") - else to_chat(world, "Deadchat has been globally disabled!") - log_admin("[key_name(usr)] toggled deadchat.") message_admins("[key_name_admin(usr)] toggled deadchat.", 1) feedback_add_details("admin_verb","TDSAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc @@ -637,7 +627,6 @@ var/global/nologevent = 0 return 1 else to_chat(usr, "Error: Start Now: Game has already started.") - return 0 /datum/admins/proc/toggleenter() @@ -651,10 +640,8 @@ var/global/nologevent = 0 enter_allowed = !( enter_allowed ) if (!( enter_allowed )) to_chat(world, "New players may no longer enter the game.") - else to_chat(world, "New players may now enter the game.") - log_admin("[key_name(usr)] toggled new player game entering.") message_admins("[key_name_admin(usr)] toggled new player game entering.", 1) world.update_status() @@ -671,10 +658,8 @@ var/global/nologevent = 0 config.allow_ai = !( config.allow_ai ) if (!( config.allow_ai )) to_chat(world, "The AI job is no longer chooseable.") - else to_chat(world, "The AI job is chooseable now.") - message_admins("[key_name_admin(usr)] toggled AI allowed.") log_admin("[key_name(usr)] toggled AI allowed.") world.update_status() @@ -691,10 +676,8 @@ var/global/nologevent = 0 abandon_allowed = !( abandon_allowed ) if (abandon_allowed) 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 [abandon_allowed ? "On" : "Off"].", 1) log_admin("[key_name(usr)] toggled respawn to [abandon_allowed ? "On" : "Off"].") world.update_status() @@ -729,11 +712,9 @@ var/global/nologevent = 0 going = !( going ) if (!( going )) to_chat(world, "The game start has been delayed.") - log_admin("[key_name(usr)] delayed the game.") else to_chat(world, "The game will start soon.") - log_admin("[key_name(usr)] removed the delay.") feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -822,11 +803,9 @@ var/global/nologevent = 0 if(!istype(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(!M.mind) to_chat(usr, "This mob has no mind!") - return M.mind.edit_memory() @@ -843,10 +822,8 @@ var/global/nologevent = 0 guests_allowed = !( guests_allowed ) if (!( guests_allowed )) to_chat(world, "Guests may no longer enter the game.") - else to_chat(world, "Guests may now enter the game.") - log_admin("[key_name(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.") message_admins("\blue [key_name_admin(usr)] toggled guests game entering [guests_allowed?"":"dis"]allowed.", 1) feedback_add_details("admin_verb","TGU") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -857,33 +834,27 @@ var/global/nologevent = 0 ai_number++ if(isAI(S)) to_chat(usr, "AI [key_name(S, usr)]'s laws:") - else if(isrobot(S)) var/mob/living/silicon/robot/R = S to_chat(usr, "CYBORG [key_name(S, usr)]'s [R.connected_ai?"(Slaved to: [R.connected_ai])":"(Independent)"] laws:") - else if (ispAI(S)) var/mob/living/silicon/pai/P = S to_chat(usr, "pAI [key_name(S, usr)]'s laws:") to_chat(usr, "[P.pai_law0]") if(P.pai_laws) to_chat(usr, "[P.pai_laws]") - continue // Skip showing normal silicon laws for pAIs - they don't have any else to_chat(usr, "SILICON [key_name(S, usr)]'s laws:") - if (S.laws == null) to_chat(usr, "[key_name(S, usr)]'s laws are null. Contact a coder.") - else S.laws.show_laws(usr) if(!ai_number) to_chat(usr, "No AI's located.")//Just so you know the thing is actually working and not just ignoring you. - log_admin("[key_name(usr)] checked the AI laws") message_admins("[key_name_admin(usr)] checked the AI laws") @@ -964,7 +935,6 @@ var/gamma_ship_location = 1 // 0 = station , 1 = space continue if(message) to_chat(C, message) - kicked_client_names.Add("[C.ckey]") del(C) return kicked_client_names diff --git a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm index 8b7125608d7..7f709f431ba 100644 --- a/code/modules/admin/admin_investigate.dm +++ b/code/modules/admin/admin_investigate.dm @@ -25,7 +25,6 @@ if(!F) return to_chat(F, "[time_stamp()] \ref[src] ([x],[y],[z]) || [src] [message]
") - //ADMINVERBS /client/proc/investigate_show( subject in list("hrefs","notes","pda","singulo","atmos","watchlist","ntsl","gold core","cult", "experimentor", "wires") ) set name = "Investigate" @@ -36,7 +35,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -46,18 +44,15 @@ src << browse(href_logfile,"window=investigate[subject];size=800x300") else to_chat(src, "Error: admin_investigate: No href logfile found.") - return else to_chat(src, "Error: admin_investigate: Href Logging is not on.") - return if("pda") //general one-round-only stuff var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -65,7 +60,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -73,7 +67,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -81,7 +74,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -89,7 +81,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") @@ -97,7 +88,6 @@ var/F = investigate_subject2file(subject) if(!F) to_chat(src, "Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.") - return src << browse(F,"window=investigate[subject];size=800x300") diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 5c6abd131c7..3a1fec11bb4 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -5,7 +5,6 @@ return if(!dbcon.IsConnected()) to_chat(src, "Failed to establish database connection.") - return var/memotask = input(usr,"Choose task.","Memo") in list("Show","Write","Edit","Remove") if(!memotask) @@ -19,7 +18,6 @@ return if(!dbcon.IsConnected()) to_chat(src, "Failed to establish database connection.") - return var/sql_ckey = sanitizeSQL(src.ckey) switch(task) @@ -31,7 +29,6 @@ return if(query_memocheck.NextRow()) to_chat(src, "You already have set a memo.") - return var/memotext = input(src,"Write your Memo","Memo") as message if(!memotext) @@ -57,7 +54,6 @@ memolist += "[lkey]" if(!memolist.len) to_chat(src, "No memos found in database.") - return var/target_ckey = input(src, "Select whose memo to edit", "Select memo") as null|anything in memolist if(!target_ckey) @@ -105,7 +101,6 @@ output += "
[memotext]
" if(!output && !silent) to_chat(src, "No memos found in database.") - return src << output if("Remove") @@ -120,7 +115,6 @@ memolist += "[ckey]" if(!memolist.len) to_chat(src, "No memos found in database.") - return var/target_ckey = input(src, "Select whose memo to delete", "Select memo") as null|anything in memolist if(!target_ckey) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index d3f0cd336bc..ca20df573ec 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -259,7 +259,6 @@ var/list/admin_verbs_proccall = list ( verbs += /client/proc/show_verbs to_chat(src, "Almost all of your adminverbs have been hidden.") - feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -274,7 +273,6 @@ var/list/admin_verbs_proccall = list ( add_admin_verbs() to_chat(src, "All of your adminverbs are now visible.") - feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/admin_ghost() @@ -293,7 +291,6 @@ var/list/admin_verbs_proccall = list ( feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! else if(istype(mob,/mob/new_player)) to_chat(src, "Error: Aghost: Can't admin-ghost whilst in the lobby. Join or observe first.") - else //ghostize var/mob/body = mob @@ -315,13 +312,11 @@ var/list/admin_verbs_proccall = list ( if(mob.invisibility == INVISIBILITY_OBSERVER) mob.invisibility = initial(mob.invisibility) to_chat(mob, "Invisimin off. Invisibility reset.") - //TODO: Make some kind of indication for the badmin that they are currently invisible else mob.invisibility = INVISIBILITY_OBSERVER to_chat(mob, "Invisimin on. You are now as invisible as a ghost.") - /client/proc/player_panel() set name = "Player Panel" set category = "Admin" @@ -480,7 +475,6 @@ var/list/admin_verbs_proccall = list ( if(!warned_ckey || !istext(warned_ckey)) return if(warned_ckey in admin_datums) to_chat(usr, "Error: warn(): You can't warn admins.") - return var/datum/preferences/D @@ -490,7 +484,6 @@ var/list/admin_verbs_proccall = list ( if(!D) to_chat(src, "Error: warn(): No such ckey found.") - return if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:) @@ -499,7 +492,6 @@ var/list/admin_verbs_proccall = list ( message_admins("[key_name_admin(src)] has warned [key_name_admin(C)] resulting in a [AUTOBANTIME] minute ban") log_admin("[key_name(src)] has warned [key_name(C)] resulting in a [AUTOBANTIME] minute ban") to_chat(C, "You have been autobanned due to a warning by [ckey].
This is a temporary ban, it will be removed in [AUTOBANTIME] minutes.") - del(C) else message_admins("[key_name_admin(src)] has warned [warned_ckey] resulting in a [AUTOBANTIME] minute ban") @@ -509,7 +501,6 @@ var/list/admin_verbs_proccall = list ( else if(C) to_chat(C, "You have been formally warned by an administrator.
Further warnings will result in an autoban.") - message_admins("[key_name_admin(src)] has warned [key_name_admin(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") log_admin("[key_name(src)] has warned [key_name(C)]. They have [MAX_WARNS-D.warns] strikes remaining.") else @@ -653,11 +644,9 @@ var/list/admin_verbs_proccall = list ( if(air_processing_killed) air_processing_killed = 0 to_chat(usr, "Enabled air processing.") - else air_processing_killed = 1 to_chat(usr, "Disabled air processing.") - feedback_add_details("admin_verb","KA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! log_admin("[key_name(usr)] used 'kill air'.") message_admins("\blue [key_name_admin(usr)] used 'kill air'.", 1) @@ -675,7 +664,6 @@ var/list/admin_verbs_proccall = list ( verbs += /client/proc/readmin deadmins += ckey to_chat(src, "You are now a normal player.") - feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/readmin() @@ -699,7 +687,6 @@ var/list/admin_verbs_proccall = list ( if(!dbcon.IsConnected()) message_admins("Warning, MySQL database is not connected.") to_chat(src, "Warning, MYSQL database is not connected.") - return var/sql_ckey = sanitizeSQL(ckey) var/DBQuery/query = dbcon.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'") @@ -711,7 +698,6 @@ var/list/admin_verbs_proccall = list ( if(admin_ranks[rank] == null) error("Error while re-adminning [src], admin rank ([rank]) does not exist.") to_chat(src, "Error while re-adminning, admin rank ([rank]) does not exist.") - return D = new(rank, admin_ranks[rank], ckey) @@ -725,11 +711,9 @@ var/list/admin_verbs_proccall = list ( var/flags = query.item[3] if(!admin_ckey) to_chat(src, "Error while re-adminning, ckey [admin_ckey] was not found in the admin database.") - return if(admin_rank == "Removed") //This person was de-adminned. They are only in the admin list for archive purposes. to_chat(src, "Error while re-adminning, ckey [admin_ckey] is not an admin.") - return if(istext(flags)) @@ -745,7 +729,6 @@ var/list/admin_verbs_proccall = list ( return else to_chat(src, "You are already an admin.") - verbs -= /client/proc/readmin deadmins -= ckey return @@ -761,12 +744,10 @@ var/list/admin_verbs_proccall = list ( if(config.log_hrefs) config.log_hrefs = 0 to_chat(src, "Stopped logging hrefs") - else config.log_hrefs = 1 to_chat(src, "Started logging hrefs") - /client/proc/check_ai_laws() set name = "Check AI Laws" set category = "Admin" @@ -840,7 +821,6 @@ var/list/admin_verbs_proccall = list ( if(!H.client) to_chat(usr, "Only mobs with clients can alter their own appearance.") - return switch(alert("Do you wish for [H] to be allowed to select non-whitelisted races?","Alter Mob Appearance","Yes","No","Cancel")) @@ -865,7 +845,6 @@ var/list/admin_verbs_proccall = list ( jobs += J.title if (!jobs.len) to_chat(usr, "There are no fully staffed jobs.") - return var/job = input("Please select job slot to free", "Free Job Slot") as null|anything in jobs if (job) @@ -884,11 +863,9 @@ var/list/admin_verbs_proccall = list ( prefs.save_preferences(src) if (prefs.toggles & CHAT_ATTACKLOGS) to_chat(usr, "You now will get attack log messages") - else to_chat(usr, "You now won't get attack log messages") - /client/proc/toggledrones() set name = "Toggle Maintenance Drones" set category = "Server" @@ -911,11 +888,9 @@ var/list/admin_verbs_proccall = list ( prefs.save_preferences(src) if (prefs.toggles & CHAT_DEBUGLOGS) to_chat(usr, "You now will get debug log messages") - else to_chat(usr, "You now won't get debug log messages") - /client/proc/man_up(mob/T as mob in mob_list) set category = "Admin" set name = "Man Up" @@ -925,10 +900,8 @@ var/list/admin_verbs_proccall = list ( return to_chat(T, "Man up and deal with it.") - to_chat(T, "Move on.") - log_admin("[key_name(usr)] told [key_name(T)] to man up and deal with it.") message_admins("[key_name_admin(usr)] told [key_name(T)] to man up and deal with it.") @@ -945,9 +918,7 @@ var/list/admin_verbs_proccall = list ( if(confirm == "Yes") for (var/mob/T as mob in mob_list) to_chat(T, "
Man up.
Deal with it.
Move on.

") - to_chat(T, 'sound/voice/ManUp1.ogg') - log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.") diff --git a/code/modules/admin/banappearance.dm b/code/modules/admin/banappearance.dm index 80cc4839956..7244e1152af 100644 --- a/code/modules/admin/banappearance.dm +++ b/code/modules/admin/banappearance.dm @@ -34,7 +34,6 @@ DEBUG for(var/s in appearance_keylist) to_chat(world, s) - /mob/verb/reload_appearances() set name = "reload appearances" @@ -72,7 +71,6 @@ DEBUG var/savefile/S=new("data/appearance_full.ban") to_chat(S["keys[0]"], appearance_keylist) - /proc/appearance_unban(mob/M) appearance_remove("[M.ckey]") appearance_savebanfile() diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm index c2123489299..34365264674 100644 --- a/code/modules/admin/banjob.dm +++ b/code/modules/admin/banjob.dm @@ -42,7 +42,6 @@ DEBUG for(var/s in jobban_keylist) to_chat(world, s) - /mob/verb/reload_jobbans() set name = "reload jobbans" @@ -95,7 +94,6 @@ DEBUG var/savefile/S=new("data/job_full.ban") to_chat(S["keys[0]"], jobban_keylist) - /proc/jobban_unban(mob/M, rank) jobban_remove("[M.ckey] - [rank]") jobban_savebanfile() diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm index fb1a9f6356e..cc53ef0ba62 100644 --- a/code/modules/admin/buildmode.dm +++ b/code/modules/admin/buildmode.dm @@ -150,79 +150,45 @@ switch(mode) if(BASIC_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Left Mouse Button = Construct / Upgrade") - to_chat(user, "Right Mouse Button = Deconstruct / Delete / Downgrade") - to_chat(user, "Left Mouse Button + ctrl = R-Window") - to_chat(user, "Left Mouse Button + alt = Airlock") - to_chat(user, "") - to_chat(user, "Use the button in the upper left corner to") - to_chat(user, "change the direction of built objects.") - to_chat(user, "***********************************************************") - if(ADV_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Right Mouse Button on buildmode button = Set object type") - to_chat(user, "Left Mouse Button on turf/obj = Place objects") - to_chat(user, "Right Mouse Button = Delete objects") - to_chat(user, "") - to_chat(user, "Use the button in the upper left corner to") - to_chat(user, "change the direction of built objects.") - to_chat(user, "***********************************************************") - if(VAR_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Right Mouse Button on buildmode button = Select var(type) & value") - to_chat(user, "Left Mouse Button on turf/obj/mob = Set var(type) & value") - to_chat(user, "Right Mouse Button on turf/obj/mob = Reset var's value") - to_chat(user, "***********************************************************") - if(THROW_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Left Mouse Button on turf/obj/mob = Select") - to_chat(user, "Right Mouse Button on turf/obj/mob = Throw") - to_chat(user, "***********************************************************") - if(AREA_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Left Mouse Button on turf/obj/mob = Select corner") - to_chat(user, "Right Mouse Button on buildmode button = Select generator") - to_chat(user, "***********************************************************") - if(COPY_BUILDMODE) to_chat(user, "***********************************************************") - to_chat(user, "Left Mouse Button on obj/turf/mob = Spawn a Copy of selected target") - to_chat(user, "Right Mouse Button on obj/mob = Select target to copy") - to_chat(user, "***********************************************************") - /datum/click_intercept/buildmode/proc/change_settings(mob/user) switch(mode) if(BASIC_BUILDMODE) @@ -386,7 +352,6 @@ object.vars[varholder] = valueholder else to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'") - if(right_click) if(object.vars.Find(varholder)) log_admin("Build Mode: [key_name(user)] modified [object.name]'s [varholder] to [valueholder]") @@ -394,7 +359,6 @@ else to_chat(user, "[initial(object.name)] does not have a var called '[varholder]'") - if(THROW_BUILDMODE) if(left_click) if(isturf(object)) @@ -414,7 +378,6 @@ if(cornerA && cornerB) if(!generator_path) to_chat(user, "Select generator type first.") - else var/datum/mapGenerator/G = new generator_path G.defineRegion(cornerA.loc,cornerB.loc,1) @@ -432,5 +395,4 @@ else if(right_click) if(ismovableatom(object)) // No copying turfs for now. to_chat(user, "[object] set as template.") - stored = object diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm index 16fa5b0db84..9baa17b73ad 100644 --- a/code/modules/admin/create_poll.dm +++ b/code/modules/admin/create_poll.dm @@ -5,7 +5,6 @@ return if(!dbcon.IsConnected()) to_chat(src, "Failed to establish database connection.") - return var/returned = create_poll_function() if(returned) @@ -28,7 +27,6 @@ message_admins("[key_name_admin(usr)] has created a new server poll. Poll Type: [polltype] - Admin Only: [adminonly ? "Yes" : "No"]
Question: [question]") else to_chat(src, "Poll question created without any options, poll will be deleted.") - var/DBQuery/query_del_poll = dbcon.NewQuery("DELETE FROM [format_table_name("poll_question")] WHERE id = [returned]") if(!query_del_poll.Execute()) var/err = query_del_poll.ErrorMsg() @@ -66,7 +64,6 @@ endtime = query_validate_time.item[1] if(!endtime) to_chat(src, "Datetime entered is invalid.") - return var/DBQuery/query_time_later = dbcon.NewQuery("SELECT TIMESTAMP('[endtime]') < NOW()") if(!query_time_later.Execute()) @@ -77,7 +74,6 @@ var/checklate = text2num(query_time_later.item[1]) if(checklate) to_chat(src, "Datetime entered is not later than current server time.") - return var/adminonly switch(alert("Admin only poll?",,"Yes","No","Cancel")) @@ -137,7 +133,6 @@ return pollid if(minval >= maxval) to_chat(src, "Minimum rating value can't be more than maximum rating value") - return pollid descmin = input("Optional: Set description for minimum rating","Minimum rating description") as message|null if(descmin) diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index c34ad32c2d1..3849317b03e 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -49,7 +49,6 @@ proc/admin_proc() if(!check_rights(R_ADMIN)) return to_chat(world, "you have enough rights!") - NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call you will have to do something like if(client.holder.rights & R_ADMIN) yourself. */ @@ -62,14 +61,12 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself. else if(show_msg) to_chat(user, "Error: You do not have sufficient rights to do that. You require one of the following flags:[rights2text(rights_required," ")].") - else if(user.client.holder) return 1 else if(show_msg) to_chat(user, "Error: You are not an admin.") - return 0 //probably a bit iffy - will hopefully figure out a better solution @@ -82,7 +79,6 @@ you will have to do something like if(client.holder.rights & R_ADMIN) yourself. if( (usr.client.holder.rights & other.holder.rights) == other.holder.rights ) return 1 //we have all the rights they have and more to_chat(usr, "Error: Cannot proceed. They have more or equal rights to us.") - return 0 /client/proc/deadmin() diff --git a/code/modules/admin/machine_upgrade.dm b/code/modules/admin/machine_upgrade.dm index 79cfac4d63a..463ef13de0c 100644 --- a/code/modules/admin/machine_upgrade.dm +++ b/code/modules/admin/machine_upgrade.dm @@ -7,7 +7,6 @@ if(!istype(M)) to_chat(usr, "This can only be used on subtypes of /obj/machinery.") - return var/new_rating = input("Enter new rating:","Num") as num diff --git a/code/modules/admin/newbanjob.dm b/code/modules/admin/newbanjob.dm index aa9a755b107..71d61567962 100644 --- a/code/modules/admin/newbanjob.dm +++ b/code/modules/admin/newbanjob.dm @@ -142,27 +142,19 @@ var/savefile/Banlistjob Banlistjob.cd = "/base" if ( Banlistjob.dir.Find("[ckey][computerid][rank]") ) to_chat(usr, text("\red Banjob already exists.")) - return 0 else Banlistjob.dir.Add("[ckey][computerid][rank]") Banlistjob.cd = "/base/[ckey][computerid][rank]" to_chat(Banlistjob["key"], ckey) - to_chat(Banlistjob["id"], computerid) - to_chat(Banlistjob["rank"], rank) - to_chat(Banlistjob["reason"], reason) - to_chat(Banlistjob["bannedby"], bannedby) - to_chat(Banlistjob["temp"], temp) - if (temp) to_chat(Banlistjob["minutes"], bantimestamp) - return 1 /proc/RemoveBanjob(foldername) @@ -228,29 +220,21 @@ var/savefile/Banlistjob /*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job)) to_chat(M, "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "\red This is a permanent ban.") - if(config.banappeals) to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") - else to_chat(M, "\red No ban appeals URL has been set.") - log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") /datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) to_chat(M, "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.") - if(config.banappeals) to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") - else to_chat(M, "\red No ban appeals URL has been set.") - log_admin("[usr.client.ckey] has jobbanned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")*/ //////////////////////////////////// DEBUG //////////////////////////////////// @@ -270,23 +254,16 @@ var/savefile/Banlistjob Banlistjob.dir.Add("trash[i]trashid[i]") Banlistjob.cd = "/base/trash[i]trashid[i]" to_chat(Banlistjob["key"], "trash[i]") - else Banlistjob.cd = "/base" Banlistjob.dir.Add("[last]trashid[i]") Banlistjob.cd = "/base/[last]trashid[i]" to_chat(Banlistjob["key"], last) - to_chat(Banlistjob["id"], "trashid[i]") - to_chat(Banlistjob["reason"], "Trashban[i].") - to_chat(Banlistjob["temp"], a) - to_chat(Banlistjob["minutes"], CMinutes + rand(1,2000)) - to_chat(Banlistjob["bannedby"], "trashmin") - last = "trash[i]" Banlistjob.cd = "/base" diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm index 9d4cd3f0071..d91f04aa4df 100644 --- a/code/modules/admin/permissionverbs/permissionedit.dm +++ b/code/modules/admin/permissionverbs/permissionedit.dm @@ -64,7 +64,6 @@ if(!dbcon.IsConnected()) to_chat(usr, "\red Failed to establish database connection") - return if(!adm_ckey || !new_rank) @@ -93,7 +92,6 @@ var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');") log_query.Execute() to_chat(usr, "\blue New admin added.") - else if(!isnull(admin_id) && isnum(admin_id)) var/DBQuery/insert_query = dbcon.NewQuery("UPDATE [format_table_name("admin")] SET rank = '[new_rank]' WHERE id = [admin_id]") @@ -102,7 +100,6 @@ log_query.Execute() to_chat(usr, "\blue Admin rank changed.") - /datum/admins/proc/log_admin_permission_modification(var/adm_ckey, var/new_permission) if(config.admin_legacy_system) return @@ -116,7 +113,6 @@ establish_db_connection() if(!dbcon.IsConnected()) to_chat(usr, "\red Failed to establish database connection") - return if(!adm_ckey || !new_permission) @@ -151,14 +147,12 @@ var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Removed permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]');") log_query.Execute() to_chat(usr, "\blue Permission removed.") - else //This admin doesn't have this permission, so we are adding it. var/DBQuery/insert_query = dbcon.NewQuery("UPDATE [format_table_name("admin")] SET flags = '[admin_rights | new_permission]' WHERE id = [admin_id]") insert_query.Execute() var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `test`.[format_table_name("admin_log")] (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added permission [rights2text(new_permission)] (flag = [new_permission]) to admin [adm_ckey]')") log_query.Execute() to_chat(usr, "\blue Permission added.") - /datum/admins/proc/updateranktodb(ckey,newrank) establish_db_connection() diff --git a/code/modules/admin/sql_notes.dm b/code/modules/admin/sql_notes.dm index 16507468bdb..df02b6f0c9c 100644 --- a/code/modules/admin/sql_notes.dm +++ b/code/modules/admin/sql_notes.dm @@ -3,7 +3,6 @@ return if(!dbcon.IsConnected()) to_chat(usr, "Failed to establish database connection.") - return if(!target_ckey) var/new_ckey = ckey(input(usr,"Who would you like to add a note for?","Enter a ckey",null) as text|null) @@ -17,7 +16,6 @@ return if(!query_find_ckey.NextRow()) to_chat(usr, "[new_ckey] has not been seen before, you can only add notes to known players.") - return else target_ckey = new_ckey @@ -56,7 +54,6 @@ var/adminckey if(!dbcon.IsConnected()) to_chat(usr, "Failed to establish database connection.") - return if(!note_id) return @@ -84,7 +81,6 @@ return if(!dbcon.IsConnected()) to_chat(usr, "Failed to establish database connection.") - return if(!note_id) return diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index e88ecaf70de..a772edc2608 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -23,7 +23,6 @@ if (get_stickyban_from_ckey(ckey)) to_chat(usr, "Error: Can not add a stickyban: User already has a current sticky ban") - if (data["reason"]) ban["message"] = data["reason"] else @@ -45,13 +44,11 @@ var/ban = get_stickyban_from_ckey(ckey) if (!ban) to_chat(usr, "Error: No sticky ban for [ckey] found!") - return if (alert("Are you sure you want to remove the sticky ban on [ckey]?","Are you sure","Yes","No") == "No") return if (!get_stickyban_from_ckey(ckey)) to_chat(usr, "Error: The ban disappeared.") - return world.SetConfig("ban", ckey, null) @@ -68,7 +65,6 @@ var/ban = get_stickyban_from_ckey(ckey) if (!ban) to_chat(usr, "Error: No sticky ban for [ckey] found!") - return var/found = 0 @@ -80,7 +76,6 @@ if (!found) to_chat(usr, "Error: [alt] is not linked to [ckey]'s sticky ban!") - return if (alert("Are you sure you want to disassociate [alt] from [ckey]'s sticky ban? \nNote: Nothing stops byond from re-linking them","Are you sure","Yes","No") == "No") @@ -90,7 +85,6 @@ ban = get_stickyban_from_ckey(ckey) if (!ban) to_chat(usr, "Error: The ban disappeared.") - return found = 0 @@ -102,7 +96,6 @@ if (!found) to_chat(usr, "Error: [alt] link to [ckey]'s sticky ban disappeared.") - return world.SetConfig("ban",ckey,list2stickyban(ban)) @@ -117,7 +110,6 @@ var/ban = get_stickyban_from_ckey(ckey) if (!ban) to_chat(usr, "Error: No sticky ban for [ckey] found!") - return var/oldreason = ban["message"] var/reason = input(usr,"Reason","Reason","[ban["message"]]") as text|null @@ -127,7 +119,6 @@ ban = get_stickyban_from_ckey(ckey) if (!ban) to_chat(usr, "Error: The ban disappeared.") - return ban["message"] = "[reason]" diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 6b122a48ee8..49a06ac5947 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -19,14 +19,10 @@ to_chat(C, 'sound/effects/adminhelp.ogg') - to_chat(C, "- AdminHelp Rejected! -") - to_chat(C, "Your admin help was rejected.") - to_chat(C, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.") - message_admins("[key_name_admin(usr)] rejected [key_name_admin(C.mob)]'s admin help") log_admin("[key_name(usr)] rejected [key_name(C.mob)]'s admin help") @@ -39,43 +35,35 @@ log_admin("[key_name(usr)] has spawned a traitor.") if(!src.makeTraitors()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("2") log_admin("[key_name(usr)] has spawned a changeling.") if(!src.makeChanglings()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("3") log_admin("[key_name(usr)] has spawned revolutionaries.") if(!src.makeRevs()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("4") log_admin("[key_name(usr)] has spawned a cultists.") if(!src.makeCult()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("5") log_admin("[key_name(usr)] has spawned a malf AI.") if(!src.makeMalfAImode()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("6") log_admin("[key_name(usr)] has spawned a wizard.") if(!src.makeWizard()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("7") log_admin("[key_name(usr)] has spawned vampires.") if(!src.makeVampires()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - if("8") log_admin("[key_name(usr)] has spawned vox raiders.") if(!src.makeVoxRaiders()) to_chat(usr, "\red Unfortunately there weren't enough candidates available.") - else if(href_list["dbsearchckey"] || href_list["dbsearchadmin"] || href_list["dbsearchip"] || href_list["dbsearchcid"] || href_list["dbsearchbantype"]) var/adminckey = href_list["dbsearchadmin"] var/playerckey = href_list["dbsearchckey"] @@ -115,45 +103,38 @@ if(BANTYPE_PERMA) if(!banckey || !banreason) to_chat(usr, "Not enough parameters (Requires ckey and reason)") - return banduration = null banjob = null if(BANTYPE_TEMP) if(!banckey || !banreason || !banduration) to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") - return banjob = null if(BANTYPE_JOB_PERMA) if(!banckey || !banreason || !banjob) to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") - return banduration = null if(BANTYPE_JOB_TEMP) if(!banckey || !banreason || !banjob || !banduration) to_chat(usr, "Not enough parameters (Requires ckey, reason and job)") - return if(BANTYPE_APPEARANCE) if(!banckey || !banreason) to_chat(usr, "Not enough parameters (Requires ckey and reason)") - return banduration = null banjob = null if(BANTYPE_ADMIN_PERMA) if(!banckey || !banreason) to_chat(usr, "Not enough parameters (Requires ckey and reason)") - return banduration = null banjob = null if(BANTYPE_ADMIN_TEMP) if(!banckey || !banreason || !banduration) to_chat(usr, "Not enough parameters (Requires ckey, reason and duration)") - return banjob = null @@ -192,7 +173,6 @@ if(!new_ckey) return if(new_ckey in admin_datums) to_chat(usr, "Error: Topic 'editrights': [new_ckey] is already an admin") - return adm_ckey = new_ckey task = "rank" @@ -200,7 +180,6 @@ adm_ckey = ckey(href_list["ckey"]) if(!adm_ckey) to_chat(usr, "Error: Topic 'editrights': No valid ckey") - return var/datum/admins/D = admin_datums[adm_ckey] @@ -234,7 +213,6 @@ new_rank = ckeyEx(new_rank) if(!new_rank) to_chat(usr, "Error: Topic 'editrights': Invalid rank") - return if(config.admin_legacy_system) if(admin_ranks.len) @@ -329,7 +307,6 @@ var/mob/M = locate(href_list["mob"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return var/delmob = 0 @@ -424,13 +401,9 @@ message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [duration]", 1) Banlist.cd = "/base/[banfolder]" to_chat(Banlist["reason"], reason) - to_chat(Banlist["temp"], temp) - to_chat(Banlist["minutes"], minutes) - to_chat(Banlist["bannedby"], usr.ckey) - Banlist.cd = "/base" feedback_inc("ban_edit",1) unbanpanel() @@ -443,18 +416,15 @@ var/mob/M = locate(href_list["appearanceban"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(!M.ckey) //sanity to_chat(usr, "This mob has no ckey") - return var/banreason = appearance_isbanned(M) if(banreason) /* if(!config.ban_legacy_system) to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") - DB_ban_panel(M.ckey) return */ switch(alert("Reason: '[banreason]' Remove appearance ban?","Please Confirm","Yes","No")) @@ -467,7 +437,6 @@ message_admins("\blue [key_name_admin(usr)] removed [key_name_admin(M)]'s appearance ban", 1) to_chat(M, "\red[usr.client.ckey] has removed your appearance ban.") - else switch(alert("Appearance ban [M.ckey]?",,"Yes","No", "Cancel")) if("Yes") var/reason = input(usr,"Please state the reason","Reason") as message|null @@ -481,17 +450,12 @@ add_note(M.ckey, "Appearance banned - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] appearance banned [key_name_admin(M)]", 1) to_chat(M, "\redYou have been appearance banned by [usr.client.ckey].") - to_chat(M, "\red The reason is: [reason]") - to_chat(M, "\red Appearance ban can be lifted only upon request.") - if(config.banappeals) to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") - else to_chat(M, "\red No ban appeals URL has been set.") - if("No") return @@ -501,16 +465,13 @@ var/mob/M = locate(href_list["jobban2"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(!M.ckey) //sanity to_chat(usr, "This mob has no ckey") - return if(!job_master) to_chat(usr, "Job Master has not been setup!") - return var/dat = "" @@ -835,7 +796,6 @@ var/mob/M = locate(href_list["jobban4"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(M != usr) //we can jobban ourselves @@ -845,7 +805,6 @@ if(!job_master) to_chat(usr, "Job Master has not been setup!") - return //get jobs for department if specified, otherwise just returnt he one job in a list. @@ -915,7 +874,6 @@ if("Yes") if(config.ban_legacy_system) to_chat(usr, "\red Your server is using the legacy banning system, which does not support temporary job bans. Consider upgrading. Aborting ban.") - return var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null if(!mins) @@ -939,11 +897,8 @@ add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1) to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].") - to_chat(M, "\red The reason is: [reason]") - to_chat(M, "\red This jobban will be lifted in [mins] minutes.") - href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("No") @@ -962,11 +917,8 @@ add_note(M.ckey, "Banned from [msg] - [reason]", null, usr, 0) message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1) to_chat(M, "\redYou have been jobbanned by [usr.client.ckey] from: [msg].") - to_chat(M, "\red The reason is: [reason]") - to_chat(M, "\red Jobban can be lifted only upon request.") - href_list["jobban2"] = 1 // lets it fall through and refresh return 1 if("Cancel") @@ -977,7 +929,6 @@ if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban. if(!config.ban_legacy_system) to_chat(usr, "Unfortunately, database based unbanning cannot be done through this panel") - DB_ban_panel(M.ckey) return var/msg @@ -999,7 +950,6 @@ if(msg) message_admins("\blue [key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1) to_chat(M, "\redYou have been un-jobbanned by [usr.client.ckey] from [msg].") - href_list["jobban2"] = 1 // lets it fall through and refresh return 1 return 0 //we didn't do anything! @@ -1010,7 +960,6 @@ if(!check_if_greater_rights_than(M.client)) return to_chat(M, "\red You have been kicked from the server") - log_admin("[key_name(usr)] booted [key_name(M)].") message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1) //M.client = null @@ -1095,18 +1044,14 @@ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins) ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.") to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "\red This is a temporary ban, it will be removed in [mins] minutes.") - feedback_inc("ban_tmp",1) DB_ban_record(BANTYPE_TEMP, M, mins, reason) feedback_inc("ban_tmp_mins",mins) if(config.banappeals) to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") - else to_chat(M, "\red No ban appeals URL has been set.") - log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") message_admins("\blue [key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") @@ -1123,15 +1068,11 @@ if("No") AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0) to_chat(M, "\redYou have been banned by [usr.client.ckey].\nReason: [reason].") - to_chat(M, "\red This is a permanent ban.") - if(config.banappeals) to_chat(M, "\red To try to resolve this matter head to [config.banappeals]") - else to_chat(M, "\red No ban appeals URL has been set.") - ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.") log_admin("[key_name(usr)] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[key_name_admin(usr)] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.") @@ -1238,7 +1179,6 @@ log_admin("[key_name(usr)] set the mode as [master_mode].") message_admins("\blue [key_name_admin(usr)] set the mode as [master_mode].", 1) to_chat(world, "\blue The mode is now: [master_mode]") - Game() // updates the main game menu world.save_mode(master_mode) .(href, list("c_mode"=1)) @@ -1262,7 +1202,6 @@ var/mob/living/carbon/human/H = locate(href_list["monkeyone"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return log_admin("[key_name(usr)] attempting to monkeyize [key_name(H)]") @@ -1276,7 +1215,6 @@ var/mob/living/carbon/human/H = locate(href_list["corgione"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return log_admin("[key_name(usr)] attempting to corgize [key_name(H)]") @@ -1290,7 +1228,6 @@ if(!ismob(M)) to_chat(usr, "this can only be used on instances of type /mob") - var/speech = input("What will [key_name(M)] say?.", "Force speech", "")// Don't need to sanitize, since it does that in say(), we also trust our admins. if(!speech) return M.say(speech) @@ -1307,11 +1244,9 @@ var/mob/M = locate(href_list["sendtoprison"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return var/turf/prison_cell = pick(prisonwarp) @@ -1342,7 +1277,6 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) to_chat(M, "\red You have been sent to the prison station!") - log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) @@ -1354,12 +1288,10 @@ if(!isobserver(M)) to_chat(usr, "You can only send ghost players back to the Lobby.") - return if(!M.client) to_chat(usr, "[M] doesn't seem to have an active client.") - return if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes") @@ -1381,11 +1313,9 @@ var/mob/M = locate(href_list["tdome1"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return for(var/obj/item/I in M) @@ -1400,7 +1330,6 @@ M.loc = pick(tdome1) spawn(50) to_chat(M, "\blue You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1) @@ -1413,11 +1342,9 @@ var/mob/M = locate(href_list["tdome2"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return for(var/obj/item/I in M) @@ -1432,7 +1359,6 @@ M.loc = pick(tdome2) spawn(50) to_chat(M, "\blue You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1) @@ -1445,11 +1371,9 @@ var/mob/M = locate(href_list["tdomeadmin"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return M.Paralyse(5) @@ -1457,7 +1381,6 @@ M.loc = pick(tdomeadmin) spawn(50) to_chat(M, "\blue You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1) @@ -1470,11 +1393,9 @@ var/mob/M = locate(href_list["tdomeobserve"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return for(var/obj/item/I in M) @@ -1493,7 +1414,6 @@ M.loc = pick(tdomeobserve) spawn(50) to_chat(M, "\blue You have been sent to the Thunderdome.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1) @@ -1506,11 +1426,9 @@ var/mob/M = locate(href_list["aroomwarp"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return if(istype(M, /mob/living/silicon/ai)) to_chat(usr, "This cannot be used on instances of type /mob/living/silicon/ai") - return M.Paralyse(5) @@ -1518,7 +1436,6 @@ M.loc = pick(aroomwarp) spawn(50) to_chat(M, "\blue You have been sent to the Admin Room!.") - log_admin("[key_name(usr)] has sent [key_name(M)] to the Admin Room") message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the Admin Room", 1) @@ -1529,7 +1446,6 @@ var/mob/living/L = locate(href_list["revive"]) if(!istype(L)) to_chat(usr, "This can only be used on instances of type /mob/living") - return L.revive() @@ -1542,7 +1458,6 @@ var/mob/living/carbon/human/H = locate(href_list["makeai"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1) @@ -1564,7 +1479,6 @@ var/mob/living/carbon/human/H = locate(href_list["makealien"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return usr.client.cmd_admin_alienize(H) @@ -1575,7 +1489,6 @@ var/mob/living/carbon/human/H = locate(href_list["makeslime"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return usr.client.cmd_admin_slimeize(H) @@ -1586,7 +1499,6 @@ var/mob/living/carbon/human/H = locate(href_list["makesuper"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return usr.client.cmd_admin_super(H) @@ -1597,7 +1509,6 @@ var/mob/living/carbon/human/H = locate(href_list["makerobot"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return usr.client.cmd_admin_robotize(H) @@ -1608,7 +1519,6 @@ var/mob/M = locate(href_list["makeanimal"]) if(istype(M, /mob/new_player)) to_chat(usr, "This cannot be used on instances of type /mob/new_player") - return usr.client.cmd_admin_animalize(M) @@ -1619,7 +1529,6 @@ var/mob/dead/observer/G = locate(href_list["incarn_ghost"]) if(!istype(G)) to_chat(usr, "This will only work on /mob/dead/observer") - log_admin("[key_name(G)] was incarnated by [key_name(src.owner)]") message_admins("[key_name_admin(G)] was incarnated by [key_name_admin(src.owner)]") G.incarnate_ghost() @@ -1630,7 +1539,6 @@ var/mob/living/carbon/human/H = locate(href_list["togmutate"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return var/block=text2num(href_list["block"]) //testing("togmutate([href_list["block"]] -> [block])") @@ -1687,7 +1595,6 @@ var/mob/M = locate(href_list["adminmoreinfo"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob") - return var/location_description = "" @@ -1728,25 +1635,18 @@ else gender_description = "[M.gender]" to_chat(src.owner, "Info about [M.name]: ") - to_chat(src.owner, "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]") - to_chat(src.owner, "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];") - to_chat(src.owner, "Location = [location_description];") - to_chat(src.owner, "[special_role_description]") - to_chat(src.owner, "(PM) (PP) (VV) (SM) (FLW) (CA)") - else if(href_list["adminspawncookie"]) if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/carbon/human/H = locate(href_list["adminspawncookie"]) if(!ishuman(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return H.equip_to_slot_or_del( new /obj/item/weapon/reagent_containers/food/snacks/cookie(H), slot_l_hand ) @@ -1765,14 +1665,12 @@ feedback_inc("admin_cookies_spawned",1) to_chat(H, "\blue Your prayers have been answered!! You received the best cookie!") - else if(href_list["BlueSpaceArtillery"]) if(!check_rights(R_ADMIN|R_EVENT)) return var/mob/living/M = locate(href_list["BlueSpaceArtillery"]) if(!isliving(M)) to_chat(usr, "This can only be used on instances of type /mob/living") - return if(alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Bluespace Artillery?", "Confirm Firing?" , "Yes" , "No") != "Yes") @@ -1780,7 +1678,6 @@ if(BSACooldown) to_chat(src.owner, "Standby. Reload cycle in progress. Gunnery crews ready in five seconds!") - return BSACooldown = 1 @@ -1788,7 +1685,6 @@ BSACooldown = 0 to_chat(M, "You've been hit by bluespace artillery!") - log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [key_name(src.owner)]") message_admins("[key_name_admin(M)] has been hit by Bluespace Artillery fired by [key_name_admin(src.owner)]") @@ -1819,23 +1715,19 @@ var/mob/living/carbon/human/H = locate(href_list["CentcommReply"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") - return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from Centcomm", "") if(!input) return to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[key_name(src.owner)] replied to [key_name(H)]'s Centcomm message with the message [input].") message_admins("[key_name_admin(src.owner)] replied to [key_name_admin(H)]'s Centcom message with: \"[input]\"") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\"") - else if(href_list["SyndicateReply"]) if(!check_rights(R_ADMIN)) return @@ -1843,46 +1735,37 @@ var/mob/living/carbon/human/H = locate(href_list["SyndicateReply"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return if(H.stat != 0) to_chat(usr, "The person you are trying to contact is not conscious.") - return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") - return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from The Syndicate", "") if(!input) return to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[src.owner] replied to [key_name(H)]'s Syndicate message with the message [input].") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\"") - else if(href_list["HONKReply"]) var/mob/living/carbon/human/H = locate(href_list["HONKReply"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") - return var/input = input(src.owner, "Please enter a message to reply to [key_name(H)] via their headset.","Outgoing message from HONKplanet", "") if(!input) return to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[src.owner] replied to [key_name(H)]'s HONKplanet message with the message [input].") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your HONKbrothers. Message as follows, HONK. [input]. Message ends, HONK.\"") - else if(href_list["ErtReply"]) if(!check_rights(R_ADMIN)) return @@ -1891,25 +1774,20 @@ var/mob/living/carbon/human/H = locate(href_list["ErtReply"]) if(!istype(H)) to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human") - return if(H.stat != 0) to_chat(usr, "The person you are trying to contact is not conscious.") - return if(!istype(H.l_ear, /obj/item/device/radio/headset) && !istype(H.r_ear, /obj/item/device/radio/headset)) to_chat(usr, "The person you are trying to contact is not wearing a headset") - return var/input = input(src.owner, "Please enter a reason for denying [key_name(H)]'s ERT request.","Outgoing message from CentComm", "") if(!input) return to_chat(src.owner, "You sent [input] to [H] via a secure channel.") - log_admin("[src.owner] denied [key_name(H)]'s ERT request with the message [input].") to_chat(H, "You hear something crackle in your headset for a moment before a voice speaks. \"Your ERT request has been denied for the following reasons: [input]. Message ends.\"") - else src.owner.response_team() @@ -1939,7 +1817,6 @@ else to_chat(usr, "\red The faxed item is not viewable. This is probably a bug, and should be reported on the tracker: [fax.type]") - else if (href_list["AdminFaxViewPage"]) if(!check_rights(R_ADMIN)) return @@ -2071,7 +1948,6 @@ if(destination != "All Departments") if(!fax.receivefax(P)) to_chat(src.owner, "\red Message transmission failed.") - return else for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) @@ -2080,7 +1956,6 @@ if(!F.receivefax(P)) to_chat(src.owner, "\red Message transmission to [F.department] failed.") - var/datum/fax/admin/A = new /datum/fax/admin() A.name = P.name A.from_department = faxtype @@ -2095,12 +1970,10 @@ A.sent_at = world.time to_chat(src.owner, "\blue Message transmitted successfully.") - if(notify == "Yes") var/mob/living/carbon/human/H = sender if(istype(H) && H.stat == CONSCIOUS && (istype(H.l_ear, /obj/item/device/radio/headset) || istype(H.r_ear, /obj/item/device/radio/headset))) to_chat(sender, "Your headset pings, notifying you that a reply to your fax has arrived.") - if(sender) log_admin("[key_name(src.owner)] replied to a fax message from [key_name(sender)]: [input]") message_admins("[key_name_admin(src.owner)] replied to a fax message from [key_name_admin(sender)] (VIEW).", 1) @@ -2156,7 +2029,6 @@ var/mob/M = locate(href_list["traitor"]) if(!ismob(M)) to_chat(usr, "This can only be used on instances of type /mob.") - return show_traitor_panel(M) @@ -2226,7 +2098,6 @@ if("inhand") if (!iscarbon(usr) && !isrobot(usr)) to_chat(usr, "Can only spawn in hand when you're a carbon mob or cyborg.") - where = "onfloor" target = usr @@ -2239,11 +2110,9 @@ if("inmarked") if(!marked_datum) to_chat(usr, "You don't have any object marked. Abandoning spawn.") - return else if(!istype(marked_datum,/atom)) to_chat(usr, "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn.") - return else target = marked_datum @@ -2309,7 +2178,6 @@ else to_chat(usr, "You may only use this when the game is running.") - else if(href_list["memoeditlist"]) if(!check_rights(R_SERVER)) return var/sql_key = sanitizeSQL("[href_list["memoeditlist"]]") @@ -2387,7 +2255,6 @@ if("gravity") if(!(ticker && ticker.mode)) to_chat(usr, "Please wait until the game starts! Not sure how it will work otherwise.") - return gravity_is_on = !gravity_is_on for(var/area/A in world) @@ -2550,13 +2417,10 @@ /* if("shockwave") ok = 1 to_chat(world, "\red ALERT: STATION STRESS CRITICAL") - sleep(60) to_chat(world, "\red ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!") - sleep(80) to_chat(world, "\red ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!") - sleep(40) for(var/mob/M in world) shake_camera(M, 400, 1) @@ -2611,7 +2475,6 @@ if("floorlava") if(floorIsLava) to_chat(usr, "The floor is lava already.") - return feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","LF") @@ -2669,7 +2532,6 @@ feedback_add_details("admin_secrets_fun_used","RET") for(var/mob/living/carbon/human/H in player_list) to_chat(H, "\red You suddenly feel stupid.") - H.setBrainLoss(60) message_admins("[key_name_admin(usr)] made everybody retarded") if("fakeguns") @@ -2691,7 +2553,6 @@ W.item_color = "schoolgirl" message_admins("[key_name_admin(usr)] activated Japanese Animes mode") to_chat(world, sound('sound/AI/animes.ogg')) - if("eagles")//SCRAW feedback_inc("admin_secrets_fun_used",1) feedback_add_details("admin_secrets_fun_used","EgL") @@ -2799,7 +2660,6 @@ if (ok) to_chat(world, text("A secret has been activated by []!", usr.key)) - else if(href_list["secretsadmin"]) if(!check_rights(R_ADMIN)) return @@ -2877,7 +2737,6 @@ if (ok) to_chat(world, text("A secret has been activated by []!", usr.key)) - else if(href_list["secretscoder"]) if(!check_rights(R_DEBUG)) return diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm index dd135db1c50..e0fb1a46913 100644 --- a/code/modules/admin/verbs/BrokenInhands.dm +++ b/code/modules/admin/verbs/BrokenInhands.dm @@ -32,7 +32,5 @@ var/F = file("broken_hand_icons.txt") fdel(F) to_chat(F, text) - to_chat(world, "Completed and written to [F]") - diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index b8fafe55e93..0b0b8991aa1 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -27,7 +27,6 @@ // to_chat(world, query_text) - var/list/query_list = SDQL2_tokenize(query_text) if(!query_list || query_list.len < 1) @@ -149,10 +148,8 @@ d.vars[v] = vals[v] catch(var/exception/e) to_chat(usr, "A runtime error has occured during the execution of your query and your query has been aborted.") - to_chat(usr, "[e]") - /proc/SDQL_parse(list/query_list) var/datum/SDQL_parser/parser = new() var/list/querys = list() @@ -178,7 +175,6 @@ 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.") - return list() query_tree = list() do_parse = 0 @@ -200,28 +196,22 @@ for(var/item in query_tree) if(istype(item, /list)) to_chat(usr, "[spaces](") - SDQL_testout(item, indent + 1) to_chat(usr, "[spaces])") - else to_chat(usr, "[spaces][item]") - if(!isnum(item) && query_tree[item]) if(istype(query_tree[item], /list)) to_chat(usr, "[spaces] (") - SDQL_testout(query_tree[item], indent + 2) to_chat(usr, "[spaces] )") - else to_chat(usr, "[spaces] [query_tree[item]]") - /proc/SDQL_from_objs(list/tree) if("world" in tree) return list(world) @@ -331,7 +321,6 @@ result = (result || val) else to_chat(usr, "SDQL2: Unknown op [op]") - result = null else result = val @@ -400,12 +389,10 @@ else if(expression[start] == "\[" && start < expression.len) if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x") to_chat(usr, "Invalid ref syntax: [expression[start + 1]]") - return null v = locate("\[[expression[start + 1]]\]") if(!v) to_chat(usr, "Invalid ref: [expression[start + 1]]") - return null start++ else @@ -462,7 +449,6 @@ else if(char == "'") if(word != "") to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again.") - return null word = "'" @@ -483,7 +469,6 @@ if(i > len) to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"[query_text]\". Please check your syntax, and try again.") - return null query_list += "[word]'" @@ -492,7 +477,6 @@ else if(char == "\"") if(word != "") to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"[query_text]\" following \"[word]\". Please check your syntax, and try again.") - return null word = "\"" @@ -513,7 +497,6 @@ if(i > len) to_chat(usr, "SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"[query_text]\". Please check your syntax, and try again.") - return null query_list += "[word]\"" diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index e564876c39f..b1b2c28e276 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -61,7 +61,6 @@ /datum/SDQL_parser/proc/parse_error(error_message) error = 1 to_chat(usr, "SQDL2 Parsing Error: [error_message]") - return query.len + 1 /datum/SDQL_parser/proc/parse() diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 936fd7b3404..ffebb5ce698 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -10,7 +10,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," //handle muting and automuting if(prefs.muted & MUTE_ADMINHELP) to_chat(src, "Error: Admin-PM: You cannot send adminhelps (Muted).") - return adminhelped = 1 //Determines if they get the message to reply by clicking the name. @@ -114,22 +113,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," for(var/client/X in mentorholders + modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) to_chat(X, 'sound/effects/adminhelp.ogg') - to_chat(X, msg) - if("Adminhelp") msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]" for(var/client/X in modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) to_chat(X, 'sound/effects/adminhelp.ogg') - to_chat(X, msg) - //show it to the person adminhelping too to_chat(src, "[selected_type]: [original_msg]") - var/admin_number_present = adminholders.len - admin_number_afk log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.") if(admin_number_present <= 0) diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 98d24ed5526..2194fb20bf3 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -20,7 +20,6 @@ var/turf/T = pick_n_take(turfs) if(!T) to_chat(src, "Nowhere to jump to!") - return admin_forcemove(usr, T) @@ -59,7 +58,6 @@ else to_chat(A, "This mob is not located in the game world.") - /client/proc/jumptocoord(tx as num, ty as num, tz as num) set category = "Admin" set name = "Jump to Coordinate" @@ -88,7 +86,6 @@ var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys) if(!selection) to_chat(src, "No keys found.") - return var/mob/M = selection:mob log_admin("[key_name(usr)] jumped to [key_name(M)]") diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index 2bb2450d1ea..ad5006611af 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -4,7 +4,6 @@ set name = "Admin PM Mob" if(!holder) to_chat(src, "Error: Admin-PM-Context: Only administrators may use this command.") - return if( !ismob(M) || !M.client ) return cmd_admin_pm(M.client,null) @@ -16,7 +15,6 @@ set name = "Admin PM Name" if(!holder) to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") - return var/list/client/targets[0] for(var/client/T) @@ -40,7 +38,6 @@ set name = "Admin PM Key" if(!holder) to_chat(src, "Error: Admin-PM-Panel: Only administrators may use this command.") - return var/list/client/targets[0] for(var/client/T) @@ -64,7 +61,6 @@ /client/proc/cmd_admin_pm(whom, msg, type = "PM") if(prefs.muted & MUTE_ADMINHELP) to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") - return var/client/C @@ -78,7 +74,6 @@ if(!C) if(holder) to_chat(src, "Error: Private-Message: Client not found.") - else adminhelp(msg) //admin we are replying to left. adminhelp instead return @@ -87,7 +82,6 @@ //send a warning to admins, but have a delay popup for mods if(holder.rights & R_ADMIN) to_chat(src, "\red Simultaneous PMs warning: that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]") - else if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel") return*/ @@ -101,7 +95,6 @@ if(!C) if(holder) to_chat(src, "Error: Admin-PM: Client not found.") - else adminhelp(msg) //admin we are replying to has vanished, adminhelp instead return @@ -133,7 +126,6 @@ else if(!C.holder) to_chat(src, "Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.") - return var/recieve_message = "" @@ -142,7 +134,6 @@ recieve_message = "-- Click the [recieve_pm_type]'s name to reply --\n" if(C.adminhelped) to_chat(C, recieve_message) - C.adminhelped = 0 //AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn @@ -160,10 +151,8 @@ recieve_message = "[type] from-[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]: [msg]" to_chat(C, recieve_message) - to_chat(src, "[send_pm_type][type] to-[key_name(C, src, holder ? 1 : 0, type)]: [msg]") - /*if(holder && !C.holder) C.last_pm_recieved = world.time C.ckey_last_pm = ckey*/ @@ -173,7 +162,6 @@ if(C.prefs.sound & SOUND_ADMINHELP) to_chat(C, 'sound/effects/adminhelp.ogg') - log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in admins) @@ -185,20 +173,16 @@ if("Mentorhelp") if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") - if("Adminhelp") if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") - else if(check_rights(R_ADMIN|R_MOD, 0, X.mob)) to_chat(X, "[type]: [key_name(src, X, 0, type)]->[key_name(C, X, 0, type)]: [msg]") - /client/proc/cmd_admin_irc_pm() if(prefs.muted & MUTE_ADMINHELP) to_chat(src, "Error: Private-Message: You are unable to use PM-s (muted).") - return var/msg = input(src,"Message:", "Private message to admins on IRC / 400 character limit") as text|null @@ -210,20 +194,16 @@ if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations. Probably easier to do this on the bots ends. to_chat(src, "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting") - to_chat(src, "\blue [msg]") - return send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]") to_chat(src, "IRC PM to-IRC-Admins: [msg]") - log_admin("PM: [key_name(src)]->IRC: [msg]") for(var/client/X in admins) if(X == src) continue if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob)) to_chat(X, "PM: [key_name(src, X, 0)]->IRC-Admins: \blue [msg]") - diff --git a/code/modules/admin/verbs/adminsay.dm b/code/modules/admin/verbs/adminsay.dm index 2cd44302a1d..3f116b0a0d5 100644 --- a/code/modules/admin/verbs/adminsay.dm +++ b/code/modules/admin/verbs/adminsay.dm @@ -14,7 +14,6 @@ if(R_ADMIN & C.holder.rights) to_chat(C, "ADMIN: [key_name(usr, 1)] ([admin_jump_link(mob, "holder")]): [msg]") - feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_mod_say(msg as text) @@ -38,5 +37,4 @@ if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) to_chat(C, "MOD: [key_name(usr, 1)] ([admin_jump_link(mob, C.holder)]): [msg]") - feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! \ No newline at end of file diff --git a/code/modules/admin/verbs/antag-ooc.dm b/code/modules/admin/verbs/antag-ooc.dm index de28cfab042..cc33f7948f4 100644 --- a/code/modules/admin/verbs/antag-ooc.dm +++ b/code/modules/admin/verbs/antag-ooc.dm @@ -17,5 +17,4 @@ to_chat(M, "AOOC: [display_name]: [msg]") - log_ooc("(ANTAG) [key] : [msg]") diff --git a/code/modules/admin/verbs/atmosdebug.dm b/code/modules/admin/verbs/atmosdebug.dm index f6f7f985fea..e1225275e17 100644 --- a/code/modules/admin/verbs/atmosdebug.dm +++ b/code/modules/admin/verbs/atmosdebug.dm @@ -4,7 +4,6 @@ set background = 1 if(!src.holder) to_chat(src, "Only administrators may use this command.") - return feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -12,27 +11,22 @@ return to_chat(usr, "Checking for disconnected pipes...") - //all plumbing - yes, some things might get stated twice, doesn't matter. for (var/obj/machinery/atmospherics/plumbing in world) if (plumbing.nodealert) to_chat(usr, "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])") - //Manifolds for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world) if (!pipe.node1 || !pipe.node2 || !pipe.node3) to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") - //Pipes for (var/obj/machinery/atmospherics/pipe/simple/pipe in world) if (!pipe.node1 || !pipe.node2) to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])") - to_chat(usr, "Checking for overlapping pipes...") - next_turf: for(var/turf/T in world) for(var/dir in cardinal) @@ -42,17 +36,14 @@ check++ if(check > 1) to_chat(usr, "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])") - continue next_turf to_chat(usr, "Done") - /client/proc/powerdebug() set category = "Mapping" set name = "Check Power" if(!src.holder) to_chat(src, "Only administrators may use this command.") - return feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -62,9 +53,7 @@ var/obj/structure/cable/C = PN.cables[1] to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") - if (!PN.cables || (PN.cables.len < 10)) if(PN.cables && (PN.cables.len > 1)) var/obj/structure/cable/C = PN.cables[1] to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]") - diff --git a/code/modules/admin/verbs/custom_event.dm b/code/modules/admin/verbs/custom_event.dm index 93a8dd8abac..350ed9a8737 100644 --- a/code/modules/admin/verbs/custom_event.dm +++ b/code/modules/admin/verbs/custom_event.dm @@ -5,7 +5,6 @@ if(!holder) to_chat(src, "Only administrators may use this command.") - return var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null @@ -21,14 +20,10 @@ custom_event_msg = input to_chat(world, "

Custom Event

") - to_chat(world, "

A custom event is starting. OOC Info:

") - to_chat(world, "[html_encode(custom_event_msg)]") - to_chat(world, "
") - // normal verb for players to view info /client/verb/cmd_view_custom_event() set category = "OOC" @@ -36,16 +31,10 @@ if(!custom_event_msg || custom_event_msg == "") to_chat(src, "There currently is no known custom event taking place.") - to_chat(src, "Keep in mind: it is possible that an admin has not properly set this.") - return to_chat(src, "

Custom Event

") - to_chat(src, "

A custom event is taking place. OOC Info:

") - to_chat(src, "[html_encode(custom_event_msg)]") - to_chat(src, "
") - diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index a2663d0ba53..74596c333cc 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -11,12 +11,10 @@ if(prefs.muted & MUTE_DEADCHAT) to_chat(src, "You cannot send DSAY messages (muted).") - return if(!(prefs.toggles & CHAT_DEAD)) to_chat(src, "You have deadchat muted.") - 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 f5ff82bc040..ddc3b4456e6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -73,7 +73,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(targetselected && !hascall(target,procname)) to_chat(usr, "Error: callproc(): target has no such call [procname].") - return var/list/lst = get_callproc_args() @@ -83,7 +82,6 @@ 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.") - return message_admins("[key_name_admin(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") @@ -95,7 +93,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc to_chat(usr, "[procname] returned: [returnval ? returnval : "null"]") - feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/callproc_datum(var/A as null|area|mob|obj|turf) @@ -111,7 +108,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(!hascall(A,procname)) to_chat(usr, "Error: callproc_datum(): target has no such call [procname].") - return var/list/lst = get_callproc_args() @@ -120,7 +116,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that if(!A || !IsValidSrc(A)) to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists.") - return message_admins("[key_name_admin(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]") @@ -129,7 +124,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc to_chat(usr, "[procname] returned: [returnval ? returnval : "null"]") - feedback_add_details("admin_verb","DPC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/get_callproc_args() @@ -513,59 +507,41 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/list/areas_without_camera = areas_all - areas_with_camera to_chat(world, "AREAS WITHOUT AN APC:") - for(var/areatype in areas_without_APC) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT AN AIR ALARM:") - for(var/areatype in areas_without_air_alarm) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITH TOO MANY APCS:") - for(var/areatype in areas_with_multiple_APCs) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITH TOO MANY AIR ALARMS:") - for(var/areatype in areas_with_multiple_air_alarms) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT A REQUEST CONSOLE:") - for(var/areatype in areas_without_RC) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT ANY LIGHTS:") - for(var/areatype in areas_without_light) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT A LIGHT SWITCH:") - for(var/areatype in areas_without_LS) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT ANY INTERCOMS:") - for(var/areatype in areas_without_intercom) to_chat(world, "* [areatype]") - to_chat(world, "AREAS WITHOUT ANY CAMERAS:") - for(var/areatype in areas_without_camera) to_chat(world, "* [areatype]") - /client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list) set category = "Event" set name = "Select equipment" @@ -1191,30 +1167,22 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Silicons","Clients","Respawnable Mobs")) if("Players") to_chat(usr, jointext(player_list,",")) - if("Admins") to_chat(usr, jointext(admins,",")) - if("Mobs") to_chat(usr, jointext(mob_list,",")) - if("Living Mobs") to_chat(usr, jointext(living_mob_list,",")) - if("Dead Mobs") to_chat(usr, jointext(dead_mob_list,",")) - if("Silicons") to_chat(usr, jointext(silicon_mob_list,",")) - if("Clients") to_chat(usr, jointext(clients,",")) - if("Respawnable Mobs") to_chat(usr, jointext(respawnable_list,",")) - /client/proc/cmd_admin_toggle_block(var/mob/M,var/block) if(!check_rights(R_SPAWN)) return diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index abef5d0e08a..70505b8abdf 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -16,10 +16,8 @@ burning = 1 to_chat(usr, "\blue @[target.x],[target.y]: O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]") - for(var/datum/gas/trace_gas in GM.trace_gases) to_chat(usr, "[trace_gas.type]: [trace_gas.moles]") - message_admins("[key_name_admin(usr)] has checked the air status of [T]") log_admin("[key_name(usr)] has checked the air status of [T]") @@ -133,10 +131,8 @@ return to_chat(usr, "Jobbans active in this round.") - for(var/t in jobban_keylist) to_chat(usr, "[t]") - message_admins("[key_name_admin(usr)] has printed the jobban log") log_admin("[key_name(usr)] has printed the jobban log") @@ -154,11 +150,9 @@ return to_chat(usr, "Jobbans active in this round.") - for(var/t in jobban_keylist) if(findtext(t, filter)) to_chat(usr, "[t]") - message_admins("[key_name_admin(usr)] has searched the jobban log for [filter]") log_admin("[key_name(usr)] has searched the jobban log for [filter]") diff --git a/code/modules/admin/verbs/dice.dm b/code/modules/admin/verbs/dice.dm index e77ef3c65fe..4df6e3107a0 100644 --- a/code/modules/admin/verbs/dice.dm +++ b/code/modules/admin/verbs/dice.dm @@ -14,11 +14,9 @@ if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes") to_chat(world, "

The dice have been rolled by Gods!

") - var/result = roll(dice) if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes") to_chat(world, "

Gods rolled [dice], result is [result]

") - message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1) \ No newline at end of file diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm index e17e70ce637..f6d31d6bede 100644 --- a/code/modules/admin/verbs/freeze.dm +++ b/code/modules/admin/verbs/freeze.dm @@ -11,7 +11,6 @@ var/global/list/frozen_mob_list = list() set name = "Freeze" if(!holder) to_chat(src, "Error: Freeze: Only administrators may use this command.") - return if(!istype(M)) return if(!check_rights(R_ADMIN)) return @@ -28,7 +27,6 @@ var/global/list/frozen_mob_list = list() /mob/living/proc/admin_Freeze(var/client/admin) if(istype(admin)) to_chat(src, "You have been frozen by [key_name(admin)]") - message_admins("[key_name_admin(admin)] froze [key_name_admin(src)]") log_admin("[key_name(admin)] froze [key_name(src)]") @@ -45,7 +43,6 @@ var/global/list/frozen_mob_list = list() /mob/living/proc/admin_unFreeze(var/client/admin) if(istype(admin)) to_chat(src, "You have been unfrozen by [key_name(admin)]") - message_admins("\blue [key_name_admin(admin)] unfroze [key_name_admin(src)]") log_admin("[key_name(admin)] unfroze [key_name(src)]") @@ -89,12 +86,10 @@ var/global/list/frozen_mob_list = list() set name = "Freeze Mech" if(!holder) to_chat(src, "Only administrators may use this command.") - return var/obj/mecha/M = O if(!istype(M,/obj/mecha)) to_chat(src, "\red This can only be used on Mechs!") - return else if(usr) @@ -107,7 +102,6 @@ var/global/list/frozen_mob_list = list() if(M.occupant) M.removeVerb(/obj/mecha/verb/eject) to_chat(M.occupant, "You have been frozen by [key]") - message_admins("\blue [key_name_admin(usr)] froze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] froze [key_name(M.occupant)] in a [M.name]") else @@ -119,7 +113,6 @@ var/global/list/frozen_mob_list = list() if(M.occupant) M.addVerb(/obj/mecha/verb/eject) to_chat(M.occupant, "You have been unfrozen by [key]") - message_admins("\blue [key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] unfroze [M.occupant.name]/[M.occupant.ckey] in a [M.name]") else diff --git a/code/modules/admin/verbs/getlogs.dm b/code/modules/admin/verbs/getlogs.dm index fe1e0bdf416..48507a55352 100644 --- a/code/modules/admin/verbs/getlogs.dm +++ b/code/modules/admin/verbs/getlogs.dm @@ -25,18 +25,15 @@ if(!src.holder) to_chat(src, "Only Admins may use this command.") - return var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in clients if(!istype(target,/client)) to_chat(src, "Error: giveruntimelog(): Client not found.") - return target.verbs |= /client/proc/getruntimelog to_chat(target, "You have been granted access to runtime logs. Please use them responsibly or risk being banned.") - return @@ -58,7 +55,6 @@ src << ftp(file(path)) to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - return @@ -80,7 +76,6 @@ src << ftp(file(path)) to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.") - return @@ -114,7 +109,6 @@ else to_chat(src, "Error: view_atk_log(): File not found/Invalid path([path]).") - return usr << run(file(path)) diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm index a2377a2c3a6..75fc6af84d9 100644 --- a/code/modules/admin/verbs/honksquad.dm +++ b/code/modules/admin/verbs/honksquad.dm @@ -6,15 +6,12 @@ var/global/sent_honksquad = 0 /client/proc/honksquad() if(!ticker) to_chat(usr, "The game hasn't started yet!") - return if(world.time < 6000) to_chat(usr, "There are [(6000-world.time)/10] seconds remaining before it may be called.") - return if(sent_honksquad == 1) to_chat(usr, "Clown Planet has already dispatched a HONKsquad.") - return if(alert("Do you want to send in the HONKsquad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") return @@ -29,7 +26,6 @@ var/global/sent_honksquad = 0 if(sent_honksquad) to_chat(usr, "Looks like someone beat you to it. HONK.") - return sent_honksquad = 1 @@ -70,7 +66,6 @@ var/global/sent_honksquad = 0 to_chat(new_honksquad, "\blue You are a HONKsquad. [!honk_leader_selected?"commando":"LEADER"] in the service of Clown Planet. You are called in cases of exteme low levels of HONK. You are NOT authorized to kill. \nYour current mission is: \red[input]") - honksquad_number-- diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 0dac4624f51..c59cd417c91 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -189,7 +189,6 @@ var/list/admin_verbs_show_debug_verbs = list( atom_list += A to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level].") - feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/count_objects_all() @@ -211,5 +210,4 @@ var/list/admin_verbs_show_debug_verbs = list( count++ to_chat(world, "There are [count] objects of type [type_path] in the game world.") - feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm index 701ff9e0ad8..185d513d2fc 100644 --- a/code/modules/admin/verbs/massmodvar.dm +++ b/code/modules/admin/verbs/massmodvar.dm @@ -31,7 +31,6 @@ for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) to_chat(usr, "It is forbidden to edit this object's variables.") - return var/list/names = list() @@ -58,51 +57,41 @@ if(isnull(var_value)) to_chat(usr, "Unable to determine variable type.") - else if(isnum(var_value)) to_chat(usr, "Variable appears to be NUM.") - default = "num" dir = 1 else if(istext(var_value)) to_chat(usr, "Variable appears to be TEXT.") - default = "text" else if(isloc(var_value)) to_chat(usr, "Variable appears to be REFERENCE.") - default = "reference" else if(isicon(var_value)) to_chat(usr, "Variable appears to be ICON.") - var_value = "\icon[var_value]" default = "icon" else if(istype(var_value,/atom) || istype(var_value,/datum)) to_chat(usr, "Variable appears to be TYPE.") - default = "type" else if(istype(var_value,/list)) to_chat(usr, "Variable appears to be LIST.") - default = "list" else if(istype(var_value,/client)) to_chat(usr, "Variable appears to be CLIENT.") - default = "cancel" else to_chat(usr, "Variable appears to be FILE.") - default = "file" to_chat(usr, "Variable contains: [var_value]") - if(dir) switch(var_value) if(1) @@ -126,7 +115,6 @@ if(dir) to_chat(usr, "If a direction, direction is: [dir]") - var/class = input("What kind of variable?","Variable Type",default) as null|anything in list("text", "num","type","icon","file","edit referenced object","restore to default") diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm index 2e7ced5f038..966e584f15e 100644 --- a/code/modules/admin/verbs/modifyvariables.dm +++ b/code/modules/admin/verbs/modifyvariables.dm @@ -19,7 +19,6 @@ var/list/forbidden_varedit_object_types = list( if (ticker == null) to_chat(src, "Game hasn't started yet.") - else src.modify_variables(ticker) feedback_add_details("admin_verb","ETV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -56,7 +55,6 @@ var/list/forbidden_varedit_object_types = list( if(!var_value) to_chat(src, "[type_text] is not a valid path!") - if("reference") var_value = input("Select reference:","Reference") as null|mob|obj|turf|area in world @@ -110,7 +108,6 @@ var/list/forbidden_varedit_object_types = list( if(!var_value) to_chat(src, "[type_text] is not a valid path!") - if("reference") var_value = input("Select reference:","Reference") as mob|obj|turf|area in world @@ -140,7 +137,6 @@ var/list/forbidden_varedit_object_types = list( if(!istype(L,/list)) to_chat(src, "Not a List.") - if(L.len > 1000) var/confirm = alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", "Continue", "Abort") if(confirm != "Continue") @@ -155,7 +151,6 @@ var/list/forbidden_varedit_object_types = list( assoc = 1 //This is pretty weak test but i can't think of anything else to_chat(usr, "List appears to be associative.") - var/list/names = null if(!assoc) names = sortList(L) @@ -188,14 +183,12 @@ var/list/forbidden_varedit_object_types = list( default = variable_to_type(variable) to_chat(usr, "Variable contains: [variable]") - if(default == "num") dir = dir2text(variable) if(dir) to_chat(usr, "If a direction, direction is: [dir]") - var/class = "text" var/list/allowed_types = list("text", "num","type", "type from text", "reference","mob reference", "icon","file","list","edit referenced object","restore to default","DELETE FROM LIST") if(src.holder && src.holder.marked_datum) @@ -284,12 +277,10 @@ var/list/forbidden_varedit_object_types = list( for(var/p in forbidden_varedit_object_types) if( istype(O,p) ) to_chat(usr, "It is forbidden to edit this object's variables.") - return if(istype(O, /client) && (param_var_name == "ckey" || param_var_name == "key")) to_chat(usr, "You cannot edit ckeys on client objects.") - return var/class @@ -299,7 +290,6 @@ var/list/forbidden_varedit_object_types = list( if(param_var_name) if(!param_var_name in O.vars) to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this atom ([O])") - return if(param_var_name == "holder" || (param_var_name in locked)) @@ -341,13 +331,11 @@ var/list/forbidden_varedit_object_types = list( var_value = "\icon[var_value]" to_chat(usr, "Variable contains: [var_value]") - if(dir) dir = dir2text(var_value) if(dir) to_chat(usr, "If a direction, direction is: [dir]") - var/list/allowed_types = list("text", "num","type","reference","mob reference", "path", "matrix", "icon","file","list","edit referenced object","restore to default") if(src.holder && src.holder.marked_datum) allowed_types += "marked datum ([holder.marked_datum.type])" @@ -415,7 +403,6 @@ var/list/forbidden_varedit_object_types = list( var/var_new = text2path(path_text) if(!var_new && path_text != null) // So aborting doesn't bother the VVer to_chat(usr, "[path_text] does not appear to be a valid path.") - return O.vars[variable] = var_new @@ -424,7 +411,6 @@ var/list/forbidden_varedit_object_types = list( var/var_new = text2matrix(matrix_text) if(!var_new && matrix_text != null) to_chat(usr, "[matrix_text] is not a valid matrix string.") - return O.vars[variable] = var_new var_as_text = "matrix([matrix_text])" @@ -464,62 +450,50 @@ var/list/forbidden_varedit_object_types = list( var/class if(isnull(variable)) to_chat(usr, "Unable to determine variable type.") - class = null else if(isnum(variable)) to_chat(usr, "Variable appears to be NUM.") - class = "num" else if(istext(variable)) to_chat(usr, "Variable appears to be TEXT.") - class = "text" else if(isloc(variable)) to_chat(usr, "Variable appears to be REFERENCE.") - class = "reference" else if(isicon(variable)) to_chat(usr, "Variable appears to be ICON.") - variable = "\icon[variable]" class = "icon" else if(istype(variable,/matrix)) to_chat(usr, "Variable appears to be MATRIX") - class = "matrix" else if(istype(variable,/atom) || istype(variable,/datum)) to_chat(usr, "Variable appears to be TYPE.") - class = "type" else if(istype(variable,/list)) to_chat(usr, "Variable appears to be LIST.") - class = "list" else if(istype(variable,/client)) to_chat(usr, "Variable appears to be CLIENT.") - class = "cancel" else if(ispath(variable)) to_chat(usr, "Variable appears to be PATH.") - class = "path" else if(isfile(variable)) to_chat(usr, "Variable appears to be FILE.") - class = "file" else to_chat(usr, "Variable type is UNKNOWN.") - class = null return class \ No newline at end of file diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index a5f97673afc..022cd29105a 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -379,7 +379,6 @@ client/proc/one_click_antag() to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red [input]") - numagents-- if(numagents >= 6) return 0 @@ -484,10 +483,8 @@ client/proc/one_click_antag() new_vox.key = theghost.key to_chat(new_vox, "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red [input]") - to_chat(new_vox, "\red Don't forget to turn on your nitrogen internals!") - raiders-- if(raiders > max_raiders) return 0 @@ -617,7 +614,6 @@ client/proc/one_click_antag() teamOneMembers-- to_chat(newMember, "You are a member of the GREEN Thunderdome team! Gear up and help your team destroy the red team!") - if(L.name == "tdome2") if(teamTwoMembers<=0) break @@ -639,7 +635,6 @@ client/proc/one_click_antag() newMember.key = theghost.key teamTwoMembers-- to_chat(newMember, "You are a member of the RED Thunderdome team! Gear up and help your team destroy the green team!") - else return 0 return 1 \ No newline at end of file diff --git a/code/modules/admin/verbs/onlyone.dm b/code/modules/admin/verbs/onlyone.dm index 052b00b69e4..61c7b4f5790 100644 --- a/code/modules/admin/verbs/onlyone.dm +++ b/code/modules/admin/verbs/onlyone.dm @@ -22,11 +22,9 @@ H.mind.objectives += hijack_objective to_chat(H, "You are a Highlander. Kill all other Highlanders. There can be only one.") - var/obj_count = 1 for(var/datum/objective/OBJ in H.mind.objectives) to_chat(H, "Objective #[obj_count]: [OBJ.explanation_text]") - obj_count++ for (var/obj/item/I in H) @@ -59,7 +57,6 @@ nologevent = 1 to_chat(world, sound('sound/music/THUNDERDOME.ogg')) - /client/proc/only_me() if(!ticker) alert("The game hasn't started yet!") @@ -77,11 +74,9 @@ H.mind.objectives += hijack_objective to_chat(H, "You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side.") - var/obj_count = 1 for(var/datum/objective/OBJ in H.mind.objectives) to_chat(H, "Objective #[obj_count]: [OBJ.explanation_text]") - obj_count++ var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id) @@ -107,4 +102,3 @@ log_admin("[key_name(usr)] used there can be only me.") nologevent = 1 to_chat(world, sound('sound/music/THUNDERDOME.ogg')) - diff --git a/code/modules/admin/verbs/onlyoneteam.dm b/code/modules/admin/verbs/onlyoneteam.dm index cdf276d03a6..6d5c11e3a4b 100644 --- a/code/modules/admin/verbs/onlyoneteam.dm +++ b/code/modules/admin/verbs/onlyoneteam.dm @@ -23,7 +23,6 @@ to_chat(H, "You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.") - H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_r_hand) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) @@ -77,15 +76,12 @@ var/mob/A = H.LAssailant if((H in team_alpha) && (A in team_alpha)) to_chat(A, "He's on your team!") - return else if((H in team_bravo) && (A in team_bravo)) to_chat(A, "He's on your team!") - return else if(!A in team_alpha && !A in team_bravo) to_chat(A, "You're not part of the dodgeball game, sorry!") - return else playsound(src, 'sound/items/dodgeball.ogg', 50, 1) diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index 442478229f6..c363ed51d72 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -19,7 +19,6 @@ var/list/sounds_cache = list() if(M.client.prefs.sound & SOUND_MIDI) to_chat(M, uploaded_sound) - feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -89,11 +88,9 @@ var/list/sounds_cache = list() if(M.client.midis) to_chat(M, 'cubanpetetime.ogg') - for(var/mob/living/carbon/human/CP in world) if(CP.real_name=="Cuban Pete" && CP.key!="Rosham") to_chat(CP, "Your body can't contain the rhumba beat") - CP.gib() @@ -108,7 +105,6 @@ var/list/sounds_cache = list() to_chat(M, 'bananaphone.ogg') - client/proc/space_asshole() set category = "Event" set name = "Space Asshole" @@ -120,7 +116,6 @@ client/proc/space_asshole() to_chat(M, 'sound/music/space_asshole.ogg') - client/proc/honk_theme() set category = "Event" set name = "Honk" @@ -130,4 +125,3 @@ client/proc/honk_theme() if(M.client) if(M.client.midis) to_chat(M, 'honk_theme.ogg')*/ - diff --git a/code/modules/admin/verbs/possess.dm b/code/modules/admin/verbs/possess.dm index 208a69df52e..54d39d5a5fa 100644 --- a/code/modules/admin/verbs/possess.dm +++ b/code/modules/admin/verbs/possess.dm @@ -5,7 +5,6 @@ if(istype(O,/obj/singularity)) if(config.forbid_singulo_possession) to_chat(usr, "It is forbidden to possess singularities.") - return var/turf/T = get_turf(O) diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index f70940e9ae8..0ef6a64373f 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -8,7 +8,6 @@ if(usr.client) if(usr.client.prefs.muted & MUTE_PRAY) to_chat(usr, "\red You cannot pray (muted).") - return if(src.client.handle_spam_prevention(msg,MUTE_PRAY)) return @@ -20,10 +19,8 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) - to_chat(usr, "Your prayers have been received by the gods.") - feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! //log_admin("HELP: [key_name(src)]: [msg]") @@ -35,7 +32,6 @@ if(R_EVENT & X.holder.rights) to_chat(X, msg) - /proc/Syndicate_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "\blue SYNDICATE: [key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, "holder")]) (CA) (BSA) (REPLY): [msg]" @@ -44,7 +40,6 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) - /proc/HONK_announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "\blue HONK: [key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, "holder")]) (CA) (BSA) (RPLY): [msg]" @@ -53,7 +48,6 @@ if(R_EVENT & X.holder.rights) to_chat(X, msg) - /proc/ERT_Announce(var/text , var/mob/Sender) var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) msg = "\blue ERT REQUEST: [key_name(Sender, 1)] (PP) (VV) (SM) ([admin_jump_link(Sender, "holder")]) (CA) (BSA) (REPLY): [msg]" @@ -62,7 +56,6 @@ if(check_rights(R_EVENT,0,X.mob)) to_chat(X, msg) - /proc/Nuke_request(text , mob/Sender) var/nuke_code = get_nuke_code() var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN)) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 71afd3eeb0b..c236432e9d2 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -40,7 +40,6 @@ prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes) spawn(50) to_chat(M, "\red You have been sent to the prison station!") - log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.") message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -64,7 +63,6 @@ if(usr.client.holder) to_chat(M, "\bold You hear a voice in your head... \italic [msg]") - log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]") message_admins("\blue \bold SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1) feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -95,14 +93,12 @@ if(missing_ages) to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present") - if(msg != "") src << browse(msg, "window=Player_age_check") else to_chat(src, "No matches for that age range found.") - /client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE set category = "Event" set name = "Global Narrate" @@ -115,7 +111,6 @@ if (!msg) return to_chat(world, "[msg]") - log_admin("GlobalNarrate: [key_name(usr)] : [msg]") message_admins("\blue \bold GlobalNarrate: [key_name_admin(usr)]: [msg]
", 1) feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -139,7 +134,6 @@ return to_chat(M, msg) - log_admin("DirectNarrate: [key_name(usr)] to ([key_name(M)]): [msg]") message_admins("\blue \bold DirectNarrate: [key_name_admin(usr)] to ([key_name_admin(M)]): [msg]
", 1) feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -154,7 +148,6 @@ M.status_flags ^= GODMODE to_chat(usr, "\blue Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]") - log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]") message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1) feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -169,11 +162,9 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) return if(!check_rights(R_ADMIN|R_MOD)) to_chat(usr, "Error: cmd_admin_mute: You don't have permission to do this.") - return if(!M.client) to_chat(usr, "Error: cmd_admin_mute: This mob doesn't have a client tied to it.") - if(!M.client) return @@ -195,7 +186,6 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]") message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1) to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.") - feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return @@ -209,7 +199,6 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]") message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1) to_chat(M, "You have been [muteunmute] from [mute_string].") - feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_add_random_ai_law() @@ -247,10 +236,8 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) g.antagHUD = 0 // Disable it on those that have it enabled g.has_enabled_antagHUD = 2 // We'll allow them to respawn to_chat(g, "\red The Administrator has disabled AntagHUD ") - config.antag_hud_allowed = 0 to_chat(src, "\red AntagHUD usage has been disabled") - action = "disabled" else for(var/mob/dead/observer/g in get_ghosts()) @@ -258,13 +245,11 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) g.verbs += /mob/dead/observer/verb/toggle_antagHUD to_chat(g, "\blue The Administrator has enabled AntagHUD ")// Notify all observers they can now use AntagHUD - config.antag_hud_allowed = 1 action = "enabled" to_chat(src, "\blue AntagHUD usage has been enabled") - log_admin("[key_name(usr)] has [action] antagHUD usage for observers") message_admins("Admin [key_name_admin(usr)] has [action] antagHUD usage for observers", 1) @@ -280,24 +265,19 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0) if(config.antag_hud_restricted) for(var/mob/dead/observer/g in get_ghosts()) to_chat(g, "\blue The administrator has lifted restrictions on joining the round if you use AntagHUD") - action = "lifted restrictions" config.antag_hud_restricted = 0 to_chat(src, "\blue AntagHUD restrictions have been lifted") - else for(var/mob/dead/observer/g in get_ghosts()) to_chat(g, "\red The administrator has placed restrictions on joining the round if you use AntagHUD") - to_chat(g, "\red Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions ") - g.antagHUD = 0 g.has_enabled_antagHUD = 0 action = "placed restrictions" config.antag_hud_restricted = 1 to_chat(src, "\red AntagHUD restrictions have been enabled") - log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD") message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1) @@ -326,7 +306,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!G_found)//If a ghost was not found. to_chat(usr, "There is no active key like that in the game or the person is not currently a ghost.") - return if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something @@ -351,7 +330,6 @@ Traitors and the like can also be revived with the previous role mostly intact. G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use new_xeno.key = G_found.key to_chat(new_xeno, "You have been fully respawned. Enjoy the game.") - message_admins("\blue [key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.", 1) return //all done. The ghost is auto-deleted @@ -458,7 +436,6 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(new_character, "You have been fully respawned. Enjoy the game.") - feedback_add_details("admin_verb","RSPCH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return new_character @@ -477,7 +454,6 @@ Traitors and the like can also be revived with the previous role mostly intact. 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.") - if(!istext(ckey)) return 0 var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Hunter","Sentinel","Drone","Larva") @@ -510,7 +486,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!any) if(notify) to_chat(src, "There doesn't appear to be any ghosts for you to select.") - return for(var/mob/M in mobs) @@ -586,7 +561,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if("No") to_chat(world, "\red [from] available at all communications consoles.") - for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -607,7 +581,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if("No") to_chat(world, "\red New Nanotrasen Update available at all communication consoles.") - for (var/obj/machinery/computer/communications/C in machines) if(! (C.stat & (BROKEN|NOPOWER) ) ) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc ) @@ -618,7 +591,6 @@ Traitors and the like can also be revived with the previous role mostly intact. C.messagetext.Add(P.info) // to_chat(world, sound('sound/AI/commandreport.ogg')) - log_admin("[key_name(src)] has created a communications report: [input]") message_admins("[key_name_admin(src)] has created a communications report", 1) feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -651,7 +623,6 @@ Traitors and the like can also be revived with the previous role mostly intact. if(job_master) for(var/datum/job/job in job_master.occupations) to_chat(src, "[job.title]: [job.total_positions]") - feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in view()) @@ -758,7 +729,6 @@ Traitors and the like can also be revived with the previous role mostly intact. var/list/L = M.get_contents() for(var/t in L) to_chat(usr, "[t]") - feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggle_view_range() @@ -841,10 +811,8 @@ Traitors and the like can also be revived with the previous role mostly intact. return to_chat(usr, text("\red Attack Log for []", mob)) - for(var/t in M.attack_log) to_chat(usr, t) - feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -858,14 +826,12 @@ Traitors and the like can also be revived with the previous role mostly intact. if (ticker && ticker.mode) to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!") - return if(ticker.random_players) ticker.random_players = 0 message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1) to_chat(usr, "Disabled.") - return @@ -879,10 +845,8 @@ Traitors and the like can also be revived with the previous role mostly intact. if(notifyplayers == "Yes") to_chat(world, "\blue 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.") - ticker.random_players = 1 feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -897,12 +861,10 @@ Traitors and the like can also be revived with the previous role mostly intact. if(!config.allow_random_events) config.allow_random_events = 1 to_chat(usr, "Random events enabled") - message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1) else config.allow_random_events = 0 to_chat(usr, "Random events disabled") - message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1) feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -917,13 +879,11 @@ Traitors and the like can also be revived with the previous role mostly intact. if(ticker.mode.ert_disabled) ticker.mode.ert_disabled = 0 to_chat(usr, "\blue ERT has been Enabled.") - log_admin("Admin [key_name(src)] has enabled ERT calling.") message_admins("Admin [key_name_admin(usr)] has enabled ERT calling.", 1) else ticker.mode.ert_disabled = 1 to_chat(usr, "\red ERT has been Disabled.") - log_admin("Admin [key_name(src)] has disabled ERT calling.") message_admins("Admin [key_name_admin(usr)] has disabled ERT calling.", 1) diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index ed201afbc1c..a5b98bc888c 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -6,11 +6,9 @@ var/global/sent_strike_team = 0 /client/proc/strike_team() if(!ticker) to_chat(usr, "The game hasn't started yet!") - return if(sent_strike_team == 1) to_chat(usr, "CentComm is already sending a team.") - return if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes") return @@ -25,7 +23,6 @@ var/global/sent_strike_team = 0 if(sent_strike_team) to_chat(usr, "Looks like someone beat you to it.") - return sent_strike_team = 1 @@ -76,7 +73,6 @@ var/global/sent_strike_team = 0 to_chat(new_commando, "\blue You are a Special Ops. [!leader_selected?"commando":"LEADER"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: \red[input]") - commando_number-- //Spawns the rest of the commando gear. diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index fec7441299c..6131962b881 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -8,7 +8,6 @@ var/global/sent_syndicate_strike_team = 0 set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event." if(!src.holder) to_chat(src, "Only administrators may use this command.") - return if(!ticker) alert("The game hasn't started yet!") @@ -29,7 +28,6 @@ var/global/sent_syndicate_strike_team = 0 if(sent_syndicate_strike_team) to_chat(src, "Looks like someone beat you to it.") - return sent_syndicate_strike_team = 1 @@ -82,7 +80,6 @@ var/global/sent_syndicate_strike_team = 0 to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"LEADER"] in the service of the Syndicate. \nYour current mission is: \red[input]") - syndicate_commando_number-- //Spawns the rest of the commando gear. diff --git a/code/modules/admin/verbs/ticklag.dm b/code/modules/admin/verbs/ticklag.dm index aec66031cc4..cabf767b620 100644 --- a/code/modules/admin/verbs/ticklag.dm +++ b/code/modules/admin/verbs/ticklag.dm @@ -22,4 +22,3 @@ to_chat(src, "\red Error: ticklag(): Invalid world.ticklag value. No changes made.") - diff --git a/code/modules/admin/verbs/tripAI.dm b/code/modules/admin/verbs/tripAI.dm index 358dbb46ce0..6c95873a7da 100644 --- a/code/modules/admin/verbs/tripAI.dm +++ b/code/modules/admin/verbs/tripAI.dm @@ -4,23 +4,19 @@ if(ticker.current_state > GAME_STATE_PREGAME) to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.") - return if(job_master && ticker) var/datum/job/job = job_master.GetJob("AI") if(!job) to_chat(usr, "Unable to locate the AI job") - return if(ticker.triai) ticker.triai = 0 to_chat(usr, "Only one AI will be spawned at round start.") - message_admins("\blue [key_name_admin(usr)] has toggled off triple AIs at round start.", 1) else ticker.triai = 1 to_chat(usr, "There will be an AI Triumvirate at round start.") - message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1) return diff --git a/code/modules/admin/watchlist.dm b/code/modules/admin/watchlist.dm index a3368f060ea..1ac267f1037 100644 --- a/code/modules/admin/watchlist.dm +++ b/code/modules/admin/watchlist.dm @@ -13,14 +13,12 @@ return if(!query_watchfind.NextRow()) to_chat(usr, "[new_ckey] has not been seen before, you can only add known players.") - return else target_ckey = new_ckey var/target_sql_ckey = sanitizeSQL(target_ckey) if(check_watchlist(target_sql_ckey)) to_chat(usr, "[target_sql_ckey] is already on the watchlist.") - return var/reason = input(usr,"Please state the reason","Reason") as message|null if(!reason) diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm index 8922f7ce787..2835d2451e3 100644 --- a/code/modules/arcade/arcade_base.dm +++ b/code/modules/arcade/arcade_base.dm @@ -24,21 +24,16 @@ ..(user) if(freeplay) to_chat(user, "Someone enabled freeplay on this machine!") - else if(token_price) to_chat(user, "\The [src.name] costs [token_price] credits per play.") - if(!tokens) to_chat(user, "\The [src.name] has no available play credits. Better feed the machine!") - else if(tokens == 1) to_chat(user, "\The [src.name] has only 1 play credit left!") - else to_chat(user, "\The [src.name] has [tokens] play credits!") - /obj/machinery/arcade/attack_hand(mob/user as mob) if(..()) if(in_use && src == user.machine) //this one checks if they fell down/died and closes the game @@ -53,7 +48,6 @@ return if(!tokens && !freeplay) to_chat(user, "\The [src.name] doesn't have enough credits to play! Pay first!") - return if(!in_use && (tokens || freeplay)) in_use = 1 @@ -62,7 +56,6 @@ if(in_use) if(src != user.machine) to_chat(user, "Someone else is already playing this machine, please wait your turn!") - return /obj/machinery/arcade/attackby(var/obj/item/O as obj, var/mob/user as mob, params) @@ -70,7 +63,6 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - update_icon() return if(!freeplay) @@ -93,7 +85,6 @@ /obj/machinery/arcade/proc/pay_with_cash(var/obj/item/weapon/spacecash/cashmoney, var/mob/user) if(cashmoney.get_total() < token_price) to_chat(user, "\icon[cashmoney] That is not enough money.") - return 0 visible_message("[usr] inserts a credit chip into [src].") var/left = cashmoney.get_total() - token_price @@ -108,12 +99,10 @@ var/datum/money_account/customer_account = attempt_account_access_nosec(I.associated_account_number) if (!customer_account) to_chat(user, "Error: Unable to access account. Please contact technical support if problem persists.") - return 0 if(customer_account.suspended) to_chat(user, "Unable to access account: account suspended.") - return 0 // Have the customer punch in the PIN before checking if there's enough money. Prevents people from figuring out acct is @@ -124,12 +113,10 @@ if(!customer_account) to_chat(user, "Unable to access account: incorrect credentials.") - return 0 if(token_price > customer_account.money) to_chat(user, "Insufficient funds in account.") - return 0 else // Okay to move the money at this point diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm index 0b789f02b46..5f66881cea6 100644 --- a/code/modules/arcade/prize_counter.dm +++ b/code/modules/arcade/prize_counter.dm @@ -39,13 +39,11 @@ qdel(T) else to_chat(user, "\The [T] seems stuck to your hand!") - return if(istype(O, /obj/item/weapon/screwdriver) && anchored) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") - update_icon() return if(panel_open) @@ -182,11 +180,9 @@ td.cost.toomuch { return if(!global_prizes.PlaceOrder(src, itemID)) to_chat(usr, "Unable to complete the exchange.") - else to_chat(usr, "You've successfully purchased the item.") - interact(usr) return diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index a7a688a9d50..9a61921764d 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -115,7 +115,6 @@ holder = new/obj/item/device/assembly_holder(get_turf(src)) if(holder.attach(A,src,user)) to_chat(user, "\blue You attach \the [A] to \the [src]!") - return 1 return 0 @@ -129,10 +128,8 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(toggle_secure()) to_chat(user, "\blue \The [src] is ready!") - else to_chat(user, "\blue \The [src] can now be attached!") - return ..() return @@ -148,12 +145,10 @@ if((in_range(src, user) || loc == user)) if(secured) to_chat(user, "\The [src] is ready!") - else to_chat(user, "\The [src] can be attached!") - attack_self(mob/user as mob) if(!user) return 0 user.set_machine(src) diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 50f39995fe0..3bf0775473c 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -31,7 +31,6 @@ to_chat(user, "You disassemble [src].") - bombassembly.loc = user.loc bombassembly.master = null bombassembly = null @@ -48,12 +47,10 @@ bombers += "[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" msg_admin_attack("[key_name_admin(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]") to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.") - else status = 0 bombers += "[key_name(user)] unwelded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]" to_chat(user, "The hole has been closed.") - add_fingerprint(user) ..() diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index bc718f8cbfc..6333fbca635 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -71,12 +71,10 @@ if ((in_range(src, user) || src.loc == user)) if (src.secured) to_chat(user, "\The [src] is ready!") - else to_chat(user, "\The [src] can be attached!") - HasProximity(atom/movable/AM as mob|obj) if(a_left) a_left.HasProximity(AM) @@ -143,17 +141,14 @@ if(istype(W, /obj/item/weapon/screwdriver)) if(!a_left || !a_right) to_chat(user, "\red BUG:Assembly part missing, please report this!") - return a_left.toggle_secure() a_right.toggle_secure() secured = !secured if(secured) to_chat(user, "\blue \The [src] is ready!") - else to_chat(user, "\blue \The [src] can now be taken apart!") - update_icon() return else @@ -166,7 +161,6 @@ if(src.secured) if(!a_left || !a_right) to_chat(user, "\red 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/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 8d169b1dac5..e78060ea63e 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -13,7 +13,6 @@ if(armed) to_chat(user, "It looks like it's armed.") - activate() if(..()) armed = !armed @@ -22,7 +21,6 @@ var/mob/living/carbon/human/user = usr if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) to_chat(user, "Your hand slips, setting off the trigger.") - pulse(0) update_icon() if(usr) @@ -71,7 +69,6 @@ attack_self(mob/living/user as mob) if(!armed) to_chat(user, "You arm [src].") - else if(((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))) var/which_hand = "l_hand" @@ -82,7 +79,6 @@ "You accidentally trigger [src]!") return to_chat(user, "You disarm [src].") - armed = !armed update_icon() playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3) @@ -147,4 +143,3 @@ layer = TURF_LAYER+0.2 to_chat(usr, "You hide [src].") - diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm index 9d661d7f2f3..6c5c9e4e5bb 100644 --- a/code/modules/assembly/shock_kit.dm +++ b/code/modules/assembly/shock_kit.dm @@ -32,7 +32,6 @@ if(istype(W, /obj/item/weapon/screwdriver)) status = !status to_chat(user, "[src] is now [status ? "secured" : "unsecured"]!") - add_fingerprint(user) return diff --git a/code/modules/atmos_automation/implementation/digital_valves.dm b/code/modules/atmos_automation/implementation/digital_valves.dm index e79d27ab88e..ce778a58aa1 100644 --- a/code/modules/atmos_automation/implementation/digital_valves.dm +++ b/code/modules/atmos_automation/implementation/digital_valves.dm @@ -38,7 +38,6 @@ valves|=V.id_tag if(valves.len==0) to_chat(usr, "Unable to find any digital valves on this frequency.") - return valve = input("Select a valve:", "Sensor Data", valve) as null|anything in valves parent.updateUsrDialog() diff --git a/code/modules/atmos_automation/implementation/emitters.dm b/code/modules/atmos_automation/implementation/emitters.dm index 91f8398acc0..c0b04399385 100644 --- a/code/modules/atmos_automation/implementation/emitters.dm +++ b/code/modules/atmos_automation/implementation/emitters.dm @@ -36,7 +36,6 @@ emitters|=E.id_tag if(emitters.len==0) to_chat(usr, "Unable to find any emitters on this frequency.") - return emitter = input("Select an emitter:", "Emitter", emitter) as null|anything in emitters parent.updateUsrDialog() diff --git a/code/modules/atmos_automation/implementation/vent_pump.dm b/code/modules/atmos_automation/implementation/vent_pump.dm index 6a6f3ca6d9b..7601d89f0c3 100644 --- a/code/modules/atmos_automation/implementation/vent_pump.dm +++ b/code/modules/atmos_automation/implementation/vent_pump.dm @@ -47,7 +47,6 @@ else for(var/obj/machinery/atmospherics/binary/dp_vent_pump/I in world) // to_chat(world, "test") - if(!isnull(I.id_tag) && I.frequency == parent.frequency) injector_names |= I.id_tag diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 3baf9764d6a..670d8143390 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -12,7 +12,6 @@ /obj/machinery/computer/artillerycontrol/attack_ai(user as mob) to_chat(user, "Access denied.") - return /obj/machinery/computer/artillerycontrol/attack_hand(user as mob) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index cba145b8075..39ac1f49676 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -98,11 +98,9 @@ obj/machinery/gateway/centerstation/process() awaygate = locate(/obj/machinery/gateway/centeraway) in world if(!awaygate) to_chat(user, "Error: No destination found.") - return if(world.time < wait) to_chat(user, "Error: Warpspace triangulation in progress. Estimated time to completion: [round(((wait - world.time) / 10) / 60)] minutes.") - return for(var/obj/machinery/gateway/G in linked) @@ -152,7 +150,6 @@ obj/machinery/gateway/centerstation/process() /obj/machinery/gateway/centerstation/attackby(obj/item/device/W as obj, mob/user as mob, params) if(istype(W,/obj/item/device/multitool)) to_chat(user, "\black The gate is already calibrated, there is no work for you to do here.") - return /////////////////////////////////////Away//////////////////////// @@ -208,7 +205,6 @@ obj/machinery/gateway/centerstation/process() stationgate = locate(/obj/machinery/gateway/centerstation) in world if(!stationgate) to_chat(user, "Error: No destination found.") - return for(var/obj/machinery/gateway/G in linked) @@ -251,7 +247,6 @@ obj/machinery/gateway/centerstation/process() for(var/obj/item/weapon/implant/exile/E in M)//Checking that there is an exile implant in the contents if(E.imp_in == M)//Checking that it's actually implanted vs just in their pocket to_chat(M, "The station gate has detected your exile implant and is blocking your entry.") - return 1 return 0 @@ -259,10 +254,8 @@ obj/machinery/gateway/centerstation/process() if(istype(W,/obj/item/device/multitool)) if(calibrated) to_chat(user, "The gate is already calibrated, there is no work for you to do here.") - return else to_chat(user, "Recalibration successful!: This gate's systems have been fine tuned. Travel to this gate will now be on target.") - calibrated = 1 return diff --git a/code/modules/awaymissions/maploader/writer.dm b/code/modules/awaymissions/maploader/writer.dm index 212ef92c972..44151c60e02 100644 --- a/code/modules/awaymissions/maploader/writer.dm +++ b/code/modules/awaymissions/maploader/writer.dm @@ -37,7 +37,6 @@ dmm_suite{ } var/saved_map = file("[map_name].dmm") to_chat(saved_map, file_text) - return saved_map } write_map(var/turf/t1 as turf, var/turf/t2 as turf, var/flags as num){ diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index d4d60b53574..d28d67f1f35 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -56,21 +56,17 @@ if(chargesa <= 0) to_chat(user, "The Wish Granter lies silent.") - return else if(!istype(user, /mob/living/carbon/human)) to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.") - return else if(is_special_character(user)) to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.") - else if (!insistinga) to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?") - insistinga++ else @@ -80,9 +76,7 @@ switch(wish) if("Power") to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.mutations.Add(LASER) user.mutations.Add(RESIST_COLD) user.mutations.Add(XRAY) @@ -90,88 +84,62 @@ var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") to_chat(user, "\red Your flesh rapidly mutates!") - to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") - to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") - to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") - human.set_species("Shadow") user.regenerate_icons() if("Wealth") to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - new /obj/structure/closet/syndicate/resources/everything(loc) if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") to_chat(user, "\red Your flesh rapidly mutates!") - to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") - to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") - to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") - human.set_species("Shadow") user.regenerate_icons() if("Immortality") to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.") - user.verbs += /mob/living/carbon/proc/immortality if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") to_chat(user, "\red Your flesh rapidly mutates!") - to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") - to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") - to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") - human.set_species("Shadow") user.regenerate_icons() if("To Kill") to_chat(user, "Your wish is granted, but at a terrible cost...") - to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.") - ticker.mode.traitors += user.mind user.mind.special_role = "traitor" var/datum/objective/hijack/hijack = new hijack.owner = user.mind user.mind.objectives += hijack to_chat(user, "Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!") - var/obj_count = 1 for(var/datum/objective/OBJ in user.mind.objectives) to_chat(user, "Objective #[obj_count]: [OBJ.explanation_text]") - obj_count++ if(ishuman(user)) var/mob/living/carbon/human/human = user if(human.species.name != "Shadow") to_chat(user, "\red Your flesh rapidly mutates!") - to_chat(user, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") - to_chat(user, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") - to_chat(user, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") - human.set_species("Shadow") user.regenerate_icons() if("Peace") to_chat(user, "Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.") - to_chat(user, "You feel as if you just narrowly avoided a terrible fate...") - for(var/mob/living/simple_animal/hostile/faithless/F in world) F.health = -10 F.stat = 2 @@ -205,7 +173,6 @@ if(istype(M, /mob/living/carbon/human)) for(var/mob/O in viewers(world.view, src.loc)) to_chat(O, "[M] triggered the \icon[src] [src]") - triggered = 1 call(src,triggerproc)(M) @@ -227,11 +194,9 @@ var/mob/living/carbon/C = usr if(!C.stat) to_chat(C, "You're not dead yet!") - return to_chat(C, "Death is not your end!") - spawn(rand(800,1200)) if(C.stat == DEAD) dead_mob_list -= C @@ -248,7 +213,6 @@ C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss()) C.reagents.clear_reagents() to_chat(C, "You have regenerated.") - C.visible_message("[usr] appears to wake from the dead, having healed all wounds.") C.update_canmove() return 1 \ No newline at end of file diff --git a/code/modules/awaymissions/trigger.dm b/code/modules/awaymissions/trigger.dm index 06b7419a973..2a41eee85c3 100644 --- a/code/modules/awaymissions/trigger.dm +++ b/code/modules/awaymissions/trigger.dm @@ -5,7 +5,6 @@ /obj/effect/step_trigger/message/Trigger(mob/M as mob) if(M.client) to_chat(M, "[message]") - if(once) qdel(src) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index a4bcdf921fc..33254cc7d2d 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -93,7 +93,6 @@ You can set verify to TRUE if you want send() to sleep until the client has the return 0 if (unreceived.len >= ASSET_CACHE_TELL_CLIENT_AMOUNT) to_chat(client, "Sending Resources...") - for(var/asset in unreceived) if (asset in asset_cache) client << browse_rsc(asset_cache[asset], asset) diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index c9296cd84d8..31db10045f0 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -29,7 +29,6 @@ #if defined(TOPIC_DEBUGGING) to_chat(world, "[src]'s Topic: [href] destined for [hsrc].") - #endif if(href_list["nano_err"]) //nano throwing errors @@ -38,10 +37,8 @@ - if(href_list["asset_cache_confirm_arrival"]) // to_chat(src, "ASSET JOB [href_list["asset_cache_confirm_arrival"]] ARRIVED.") - var/job = text2num(href_list["asset_cache_confirm_arrival"]) completed_asset_jobs += job return @@ -70,11 +67,9 @@ if(href_list["irc_msg"]) if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes to_chat(usr, "You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you") - return if(mute_irc) to_chat(usr, "") - return cmd_admin_irc_pm() return @@ -85,7 +80,6 @@ if(config && config.log_hrefs && href_logfile) to_chat(href_logfile, "[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr]) || [hsrc ? "[hsrc] " : ""][href]
") - switch(href_list["karmashop"]) if("tab") karma_tab = text2num(href_list["tab"]) @@ -98,7 +92,6 @@ if("1") if(karma <5) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Barber",5) @@ -106,7 +99,6 @@ if("2") if(karma <5) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Brig Physician",5) @@ -114,7 +106,6 @@ if("3") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Nanotrasen Representative",30) @@ -122,7 +113,6 @@ if("5") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Blueshield",30) @@ -130,7 +120,6 @@ if("6") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Mechanic",30) @@ -138,7 +127,6 @@ if("7") if(karma <45) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Magistrate",45) @@ -146,7 +134,6 @@ if("9") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_job_unlock("Security Pod Pilot",30) @@ -157,7 +144,6 @@ if("1") if(karma <15) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Machine",15) @@ -165,7 +151,6 @@ if("2") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Kidan",30) @@ -173,7 +158,6 @@ if("3") if(karma <30) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Grey",30) @@ -181,7 +165,6 @@ if("4") if(karma <45) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Vox",45) @@ -189,7 +172,6 @@ if("5") if(karma <45) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Slime People",45) @@ -197,7 +179,6 @@ if("6") if(karma <100) to_chat(usr, "You do not have enough karma!") - return else src.DB_species_unlock("Plasmaman",100) @@ -228,12 +209,10 @@ src.last_message_count++ if(src.last_message_count >= SPAM_TRIGGER_AUTOMUTE) to_chat(src, "\red You have exceeded the spam filter limit for identical messages. An auto-mute was applied.") - cmd_admin_mute(src.mob, mute_type, 1) return 1 if(src.last_message_count >= SPAM_TRIGGER_WARNING) to_chat(src, "\red You are nearing the spam filter limit for identical messages.") - return 0 else last_message = message @@ -244,14 +223,12 @@ /client/AllowUpload(filename, filelength) if(filelength > UPLOAD_LIMIT) to_chat(src, "Error: AllowUpload(): File Upload too large. Upload Limit: [UPLOAD_LIMIT/1024]KiB.") - return 0 /* //Don't need this at the moment. But it's here if it's needed later. //Helps prevent multiple files being uploaded at once. Or right after eachother. var/time_to_wait = fileaccess_timer - world.time if(time_to_wait > 0) to_chat(src, "Error: AllowUpload(): Spam prevention. Please wait [round(time_to_wait/10)] seconds.") - return 0 fileaccess_timer = world.time + FTPDELAY */ return 1 @@ -281,7 +258,6 @@ to_chat(src, "\red If the title screen is black, resources are still downloading. Please be patient until the title screen appears.") - clients += src directory[ckey] = src @@ -303,14 +279,10 @@ if(custom_event_msg && custom_event_msg != "") to_chat(src, "

Custom Event

") - to_chat(src, "

A custom event is taking place. OOC Info:

") - to_chat(src, "[html_encode(custom_event_msg)]") - to_chat(src, "
") - if( (world.address == address || !address) && !host ) host = key world.update_status() @@ -331,7 +303,6 @@ if (ckey in clientmessages) for (var/message in clientmessages[ckey]) to_chat(src, message) - clientmessages.Remove(ckey) @@ -346,7 +317,6 @@ 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.") - ////////////// //DISCONNECT// ////////////// @@ -463,4 +433,3 @@ if(lang.flags & RESTRICTED) message += " (RESTRICTED)" to_chat(world, "[message]") - diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7692f051621..4f28c69cf96 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -263,7 +263,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts var/ind = 0 for(var/name in organ_data) // to_chat(world, "[ind] \ [organ_data.len]") - var/status = organ_data[name] var/organ_name = null switch(name) @@ -675,7 +674,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if (!isnum(desiredLvl)) to_chat(user, "\red UpdateJobPreference - desired level was not a number. Please notify coders!") - ShowChoices(user) return @@ -1061,7 +1059,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts else to_chat(user, "Invalid name. Your name should be at least 2 and at most [MAX_NAME_LEN] characters long. It may only contain the characters A-Z, a-z, -, ' and .") - if("age") var/new_age = input(user, "Choose your character's age:\n([AGE_MIN]-[AGE_MAX])", "Character Preference") as num|null if(new_age) @@ -1587,7 +1584,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts if(r != cleaned_r) // up to no good message_admins("[user] attempted an href exploit! (This could have possibly lead to a \"Bobby Tables\" exploit, so they're probably up to no good). String: [r] ID: [last_id] IP: [last_ip]") to_chat(user, "Stop right there, criminal scum") - else be_special ^= r @@ -1604,11 +1600,9 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts sound ^= SOUND_LOBBY if(sound & SOUND_LOBBY) to_chat(user, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1)) - else to_chat(user, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1)) - if("ghost_ears") toggles ^= CHAT_GHOSTEARS diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index 341efffcb69..afb70577dd0 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -5,7 +5,6 @@ set desc = ".Toggle Between seeing all mob speech, and only speech of nearby mobs" prefs.toggles ^= CHAT_GHOSTEARS to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTEARS) ? "see all speech in the world" : "only see speech from nearby mobs"].") - prefs.save_preferences(src) feedback_add_details("admin_verb","TGE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -15,7 +14,6 @@ set desc = ".Toggle Between seeing all mob emotes, and only emotes of nearby mobs" prefs.toggles ^= CHAT_GHOSTSIGHT to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTSIGHT) ? "see all emotes in the world" : "only see emotes from nearby mobs"].") - prefs.save_preferences(src) feedback_add_details("admin_verb","TGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -25,7 +23,6 @@ set desc = ".Toggle between hearing all radio chatter, or only from nearby speakers" prefs.toggles ^= CHAT_GHOSTRADIO to_chat(src, "As a ghost, you will now [(prefs.toggles & CHAT_GHOSTRADIO) ? "hear all radio chat in the world" : "only hear from nearby speakers"].") - prefs.save_preferences(src) feedback_add_details("admin_verb","TGR") @@ -37,7 +34,6 @@ prefs.toggles ^= CHAT_RADIO prefs.save_preferences(src) to_chat(usr, "You will [(prefs.toggles & CHAT_RADIO) ? "now" : "no longer"] see radio chatter from radios or speakers") - feedback_add_details("admin_verb","THR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggleadminhelpsound() @@ -48,7 +44,6 @@ prefs.sound ^= SOUND_ADMINHELP prefs.save_preferences(src) to_chat(usr, "You will [(prefs.sound & SOUND_ADMINHELP) ? "now" : "no longer"] hear a sound when adminhelps arrive.") - feedback_add_details("admin_verb","AHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/deadchat() // Deadchat toggle is usable by anyone. @@ -60,11 +55,9 @@ if(src.holder) to_chat(src, "You will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") - else to_chat(src, "As a ghost, you will [(prefs.toggles & CHAT_DEAD) ? "now" : "no longer"] see deadchat.") - feedback_add_details("admin_verb","TDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/toggleprayers() @@ -74,7 +67,6 @@ prefs.toggles ^= CHAT_PRAYER prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & CHAT_PRAYER) ? "now" : "no longer"] see prayerchat.") - feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglescoreboard() @@ -84,7 +76,6 @@ prefs.toggles ^= DISABLE_SCOREBOARD prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & DISABLE_SCOREBOARD) ? "no longer" : "now"] see the end of round scoreboard.") - feedback_add_details("admin_verb","TScoreboard") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglekarmareminder() @@ -94,7 +85,6 @@ prefs.toggles ^= DISABLE_KARMA_REMINDER prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & DISABLE_KARMA_REMINDER) ? "no longer" : "now"] see the end of round karma reminder.") - feedback_add_details("admin_verb","TKarmabugger") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggletitlemusic() @@ -105,16 +95,13 @@ prefs.save_preferences(src) if(prefs.sound & SOUND_LOBBY) to_chat(src, "You will now hear music in the game lobby.") - if(istype(mob, /mob/new_player)) playtitlemusic() else to_chat(src, "You will no longer hear music in the game lobby.") - if(istype(mob, /mob/new_player)) to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jamsz - feedback_add_details("admin_verb","TLobby") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/togglemidis() @@ -125,15 +112,12 @@ prefs.save_preferences(src) if(prefs.sound & SOUND_MIDI) to_chat(src, "You will now hear any sounds uploaded by admins.") - else var/sound/break_sound = sound(null, repeat = 0, wait = 0, channel = 777) break_sound.priority = 250 to_chat(src, break_sound)//breaks the client's sound output on channel 777 - to_chat(src, "You will no longer hear sounds uploaded by admins; any currently playing midis have been disabled.") - feedback_add_details("admin_verb","TMidi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/listen_ooc() @@ -143,7 +127,6 @@ prefs.toggles ^= CHAT_OOC prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & CHAT_OOC) ? "now" : "no longer"] see messages on the OOC channel.") - feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -154,7 +137,6 @@ prefs.toggles ^= CHAT_LOOC prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel.") - feedback_add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -166,12 +148,9 @@ prefs.save_preferences(src) if(prefs.sound & SOUND_AMBIENCE) to_chat(src, "You will now hear ambient sounds.") - else to_chat(src, "You will no longer hear ambient sounds.") - to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)) - feedback_add_details("admin_verb","TAmbi") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/Toggle_Buzz() //No more headaches because headphones bump up shipambience.ogg to insanity levels. @@ -182,12 +161,9 @@ prefs.save_preferences(src) if(prefs.sound & SOUND_BUZZ) to_chat(src, "You will now hear ambient white noise.") - else to_chat(src, "You will no longer hear ambient white noise.") - to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)) - feedback_add_details("admin_verb","TBuzz") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -199,14 +175,10 @@ prefs.save_preferences(src) if(prefs.sound & SOUND_HEARTBEAT) to_chat(src, "You will now hear heartbeat sounds.") - else to_chat(src, "You will no longer hear heartbeat sounds.") - to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 1)) - to_chat(src, sound(null, repeat = 0, wait = 0, volume = 0, channel = 2)) - feedback_add_details("admin_verb","Thb") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! // This needs a toggle because you people are awful and spammed terrible music @@ -218,10 +190,8 @@ prefs.save_preferences(src) if(prefs.toggles & SOUND_INSTRUMENTS) to_chat(src, "You will now hear people playing musical instruments.") - else to_chat(src, "You will no longer hear musical instruments.") - feedback_add_details("admin_verb","TInstru") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/verb/toggle_media() @@ -232,7 +202,6 @@ prefs.sound ^= SOUND_STREAMING prefs.save_preferences(src) to_chat(usr, "You will [(prefs.sound & SOUND_STREAMING) ? "now" : "no longer"] hear streamed media.") - if(!media) return if(prefs.sound & SOUND_STREAMING) media.update_music() diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index a179d56db14..a5749ca40d0 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -52,7 +52,6 @@ if(!wearable) to_chat(M, "\red Your species cannot wear [src].") - return 0 return 1 @@ -202,7 +201,6 @@ BLIND // can't see anything update_icon() else to_chat(user, "[src] have already been clipped!") - return else ..() @@ -216,18 +214,15 @@ BLIND // can't see anything if (user.stat || user.restrained()) return if(has_sensor >= 2) to_chat(user, "The controls are locked.") - return 0 if(has_sensor <= 0) to_chat(user, "This suit does not have any sensors.") - return 0 var/list/modes = list("Off", "Binary sensors", "Vitals tracker", "Tracking beacon") var/switchMode = input("Select a sensor mode:", "Suit Sensor Mode", modes[sensor_mode + 1]) in modes if(get_dist(user, src) > 1) to_chat(user, "You have moved too far away.") - return sensor_mode = modes.Find(switchMode) - 1 @@ -235,16 +230,12 @@ BLIND // can't see anything switch(sensor_mode) if(0) to_chat(user, "You disable your suit's remote sensing equipment.") - if(1) to_chat(user, "Your suit will now report whether you are live or dead.") - if(2) to_chat(user, "Your suit will now report your vital lifesigns.") - if(3) to_chat(user, "Your suit will now report your vital lifesigns as well as your coordinate position.") - if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user if(H.w_uniform == src) @@ -313,7 +304,6 @@ BLIND // can't see anything gas_transfer_coefficient = initial(gas_transfer_coefficient) permeability_coefficient = initial(permeability_coefficient) to_chat(user, "You push \the [src] back into place.") - mask_adjusted = 0 slot_flags = initial(slot_flags) if(flags_inv != initial(flags_inv)) @@ -335,7 +325,6 @@ BLIND // can't see anything else icon_state += "_up" to_chat(user, "You push \the [src] out of the way.") - gas_transfer_coefficient = null permeability_coefficient = null mask_adjusted = 1 @@ -405,7 +394,6 @@ BLIND // can't see anything user.visible_message("[user] crushes the [M] into the bottom of [src], extinguishing it.","You crush the [M] into the bottom of [src], extinguishing it.") else // Match has been previously lit and extinguished. to_chat(user, "The [M] has already been extinguished.") - return if(istype(I, /obj/item/weapon/wirecutters)) @@ -424,7 +412,6 @@ BLIND // can't see anything update_icon() else to_chat(user, "[src] have already had their toes cut open!") - return else ..() @@ -477,7 +464,6 @@ BLIND // can't see anything if(adjust_flavour) flavour = "[copytext(adjust_flavour, 3, lentext(adjust_flavour) + 1)] up" //Trims off the 'un' at the beginning of the word. unzip -> zip, unbutton->button. to_chat(user, "You [flavour] \the [src].") - suit_adjusted = 0 //Suit is no longer adjusted. else var/flavour = "open" @@ -486,7 +472,6 @@ BLIND // can't see anything if(adjust_flavour) flavour = "[adjust_flavour]" to_chat(user, "You [flavour] \the [src].") - suit_adjusted = 1 //Suit's adjusted. else if(user.canUnEquip(src)) //Checks to see if the item can be unequipped. If so, lets shred. Otherwise, struggle and fail. @@ -504,13 +489,11 @@ BLIND // can't see anything else to_chat(user, "You yank and pull at \the [src] with your [pick("excessive", "extreme", "insane", "monstrous", "ridiculous", "unreal", "stupendous")] [pick("power", "strength")], however you are unable to change its state!")//Yep, that's all they get. Avoids having to snowflake in a cooldown. - return user.update_inv_wear_suit() else to_chat(user, "You attempt to button up the velcro on \the [src], before promptly realising how retarded you are.") - /obj/item/clothing/suit/verb/openjacket(var/mob/user) //The verb you can use to adjust jackets. set name = "Open/Close Jacket" set category = "Object" @@ -619,7 +602,6 @@ BLIND // can't see anything else to_chat(user, "You cannot attach more accessories of this type to [src].") - if(accessories.len) for(var/obj/item/clothing/accessory/A in accessories) A.attackby(I, user, params) @@ -662,22 +644,17 @@ BLIND // can't see anything switch(src.sensor_mode) if(0) to_chat(user, "Its sensors appear to be disabled.") - if(1) to_chat(user, "Its binary life sensors appear to be enabled.") - if(2) to_chat(user, "Its vital tracker appears to be enabled.") - if(3) to_chat(user, "Its vital tracker and tracking beacon appear to be enabled.") - if(accessories.len) for(var/obj/item/clothing/accessory/A in accessories) to_chat(user, "\A [A] is attached to it.") - /obj/item/clothing/under/verb/rollsuit() set name = "Roll Down Jumpsuit" set category = "Object" @@ -688,14 +665,12 @@ BLIND // can't see anything if(copytext(item_color,-2) != "_d") basecolor = item_color to_chat(usr, "DEBUG:[basecolor]") - if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi')) item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]" usr.update_inv_w_uniform() else to_chat(usr, "You cannot roll down the uniform!") - /obj/item/clothing/under/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A) if(!(A in accessories)) return diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 2a5cb6d554e..521b934d34a 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -25,12 +25,10 @@ if(istype(O, /obj/item/clothing/glasses/regular)) if(prescription) to_chat(H, "You can't possibly imagine how adding more lenses would improve \the [name].") - return H.unEquip(O) O.loc = src // Store the glasses for later removal to_chat(H, "You fit \the [name] with lenses from \the [O].") - prescription = 1 name = "prescription [name]" return @@ -39,7 +37,6 @@ if(!G) G = new(get_turf(H)) to_chat(H, "You salvage the prescription lenses from \the [name].") - prescription = 0 name = initial(name) H.put_in_hands(G) @@ -270,7 +267,6 @@ to_chat(usr, "The moment is gone.") - /obj/item/clothing/glasses/sunglasses/reagent name = "sunscanners" desc = "Strangely ancient technology used to help provide rudimentary eye color. Outfitted with apparatus to scan individual reagents." @@ -329,7 +325,6 @@ flags_inv |= HIDEEYES icon_state = initial(icon_state) to_chat(usr, "You flip the [src] down to protect your eyes.") - flash_protect = 2 tint = initial(tint) //better than istype else @@ -338,7 +333,6 @@ flags_inv &= ~HIDEEYES icon_state = "[initial(icon_state)]up" to_chat(usr, "You push the [src] up out of your face.") - flash_protect = 0 tint = 0 @@ -399,7 +393,6 @@ if(istype(src.loc, /mob/living/carbon/human)) var/mob/living/carbon/human/M = src.loc to_chat(M, "\red The Optical Thermal Scanner overloads and blinds you!") - if(M.glasses == src) M.eye_blind = 3 M.eye_blurry = 5 diff --git a/code/modules/clothing/gloves/rings.dm b/code/modules/clothing/gloves/rings.dm index a1a2c04bd5f..4a0af4392fa 100644 --- a/code/modules/clothing/gloves/rings.dm +++ b/code/modules/clothing/gloves/rings.dm @@ -22,17 +22,14 @@ examine(mob/user) ..(user) to_chat(user, "This one is made of [material].") - if(stud) to_chat(user, "It is adorned with a single gem.") - /obj/item/clothing/gloves/ring/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/stack/sheet/mineral/diamond)) var/obj/item/stack/sheet/mineral/diamond/D = I if(stud) to_chat(usr, "The [src] already has a gem.") - else if(D.amount >= 1) D.use(1) @@ -40,7 +37,6 @@ update_icon() to_chat(usr, "You socket the diamond into the [src].") - // s'pensive /obj/item/clothing/gloves/ring/silver name = "silver ring" diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index aa5d722d056..5dc555a10d7 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -15,7 +15,6 @@ if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc]")//To prevent some lighting anomalities. - return on = !on icon_state = "hardhat[on]_[item_color]" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 463c2eb2861..eb38be7395d 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -26,7 +26,6 @@ icon_state = "[initial(icon_state)][up ? "up" : ""]" to_chat(user, "[up ? alt_toggle_message : toggle_message] \the [src]") - user.update_inv_head() if(active_sound) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 50bb85e5cc4..e1bfc0c1282 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -59,7 +59,6 @@ flags_inv |= (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = initial(icon_state) to_chat(usr, "You flip the [src] down to protect your eyes.") - flash_protect = 2 tint = 2 else @@ -68,7 +67,6 @@ flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) icon_state = "[initial(icon_state)]up" to_chat(usr, "You push the [src] up out of your face.") - flash_protect = 0 tint = 0 usr.update_inv_head() //so our mob-overlays update @@ -133,13 +131,11 @@ src.icon_state = "ushankaup" src.item_state = "ushankaup" to_chat(user, "You raise the ear flaps on the ushanka.") - else src.icon_state = "ushankadown" src.item_state = "ushankadown" to_chat(user, "You lower the ear flaps on the ushanka.") - /* * Pumpkin head */ diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index b9c88bcc11e..e14057b32b1 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -20,11 +20,9 @@ if(src.flipped) icon_state = "[item_color]soft_flipped" to_chat(usr, "You flip the hat backwards.") - else icon_state = "[item_color]soft" to_chat(usr, "You flip the hat back in normal position.") - usr.update_inv_head() //so our mob-overlays update /obj/item/clothing/head/soft/red diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3ccfe44cc39..b13c2968f34 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -46,7 +46,6 @@ flags_inv |= (HIDEEYES) icon_state = initial(icon_state) to_chat(usr, "You flip the [src] down to protect your eyes.") - flash_protect = 2 tint = 2 else @@ -55,7 +54,6 @@ flags_inv &= ~(HIDEEYES) icon_state = "[initial(icon_state)]up" to_chat(usr, "You push the [src] up out of your face.") - flash_protect = 0 tint = 0 usr.update_inv_wear_mask() //so our mob-overlays update @@ -113,7 +111,6 @@ if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] to_chat(M, "Your Clown Mask has now morphed into [choice], all praise the Honk Mother!") - return 1 /obj/item/clothing/mask/gas/clownwiz @@ -251,23 +248,18 @@ switch(aggressiveness) if(1) to_chat(user, "\blue You set the restrictor to the middle position.") - aggressiveness = 2 if(2) to_chat(user, "\blue You set the restrictor to the last position.") - aggressiveness = 3 if(3) to_chat(user, "\blue You set the restrictor to the first position.") - aggressiveness = 1 if(4) to_chat(user, "\red You adjust the restrictor but nothing happens, probably because its broken.") - else if(istype(W, /obj/item/weapon/wirecutters)) if(aggressiveness != 4) to_chat(user, "\red You broke it!") - aggressiveness = 4 else ..() @@ -279,7 +271,6 @@ if(safety) safety = 0 to_chat(user, "You silently fry [src]'s vocal circuit with the cryptographic sequencer.") - else return diff --git a/code/modules/clothing/masks/voice.dm b/code/modules/clothing/masks/voice.dm index 887518ab906..190804d1a92 100644 --- a/code/modules/clothing/masks/voice.dm +++ b/code/modules/clothing/masks/voice.dm @@ -17,7 +17,6 @@ changer.active = !changer.active to_chat(usr, "You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].") - /obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text) set category = "Object" set src in usr @@ -27,7 +26,6 @@ changer.voice = voice to_chat(usr, "You are now mimicking [changer.voice].") - /obj/item/clothing/mask/gas/voice/New() ..() changer = new(src) \ No newline at end of file diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index 6b6a047fc0b..48b9ffa7589 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -20,7 +20,6 @@ magpulse = !magpulse icon_state = "[magboot_state][magpulse]" to_chat(user, "You [magpulse ? "enable" : "disable"] the mag-pulse traction system.") - user.update_inv_shoes() //so our mob-overlays update user.update_gravity(user.mob_has_gravity()) @@ -32,7 +31,6 @@ to_chat(user, "Its mag-pulse traction system appears to be [magpulse ? "enabled" : "disabled"].") - /obj/item/clothing/shoes/magboots/advance desc = "Advanced magnetic boots that have a lighter magnetic pull, placing less burden on the wearer." name = "advanced magboots" diff --git a/code/modules/clothing/spacesuits/alien.dm b/code/modules/clothing/spacesuits/alien.dm index d576902a43e..d5fcbdf3251 100644 --- a/code/modules/clothing/spacesuits/alien.dm +++ b/code/modules/clothing/spacesuits/alien.dm @@ -206,7 +206,6 @@ magpulse = 0 flags |= NODROP to_chat(user, "You relax your deathgrip on the flooring.") - else //make sure these can only be used when equipped. if(!ishuman(user)) @@ -214,7 +213,6 @@ var/mob/living/carbon/human/H = user if (H.shoes != src) to_chat(user, "You will have to put on the [src] before you can do that.") - return @@ -222,10 +220,8 @@ magpulse = 1 flags &= ~NODROP //kinda hard to take off magclaws when you are gripping them tightly. to_chat(user, "You dig your claws deeply into the flooring, bracing yourself.") - to_chat(user, "It would be hard to take off the [src] without relaxing your grip first.") - //In case they somehow come off while enabled. /obj/item/clothing/shoes/magboots/vox/dropped(mob/user as mob) ..() @@ -241,7 +237,6 @@ to_chat(user, "It would be hard to take these off without relaxing your grip first.")//theoretically this message should only be seen by the wearer when the claws are equipped. - /obj/item/clothing/suit/space/eva/vox name = "Vox EVA Suit" icon_state = "voxspace" diff --git a/code/modules/clothing/spacesuits/breaches.dm b/code/modules/clothing/spacesuits/breaches.dm index cd46fd580d9..a7f8baf7a7a 100644 --- a/code/modules/clothing/spacesuits/breaches.dm +++ b/code/modules/clothing/spacesuits/breaches.dm @@ -56,7 +56,6 @@ var/global/list/breach_burn_descriptors = list( if(!can_breach || !breaches || !breaches.len || !damage) to_chat(user, "There are no breaches to repair on \the [src].") - return var/list/valid_breaches = list() @@ -67,7 +66,6 @@ var/global/list/breach_burn_descriptors = list( if(!valid_breaches.len) to_chat(user, "There are no breaches to repair on \the [src].") - return var/amount_left = amount @@ -181,12 +179,10 @@ var/global/list/breach_burn_descriptors = list( if(istype(src.loc,/mob/living)) to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?") - return if(!damage || !burn_damage) to_chat(user, "There is no surface damage on \the [src] to repair.") - return var/obj/item/stack/sheet/P = W @@ -202,18 +198,15 @@ var/global/list/breach_burn_descriptors = list( if(istype(src.loc,/mob/living)) to_chat(user, "\red How do you intend to patch a hardsuit while someone is wearing it?") - return if (!damage || ! brute_damage) to_chat(user, "There is no structural damage on \the [src] to repair.") - return var/obj/item/weapon/weldingtool/WT = W if(!WT.remove_fuel(5)) to_chat(user, "\red You need more welding fuel to repair this suit.") - return repair_breaches(BRUTE, 3, user) @@ -226,4 +219,3 @@ var/global/list/breach_burn_descriptors = list( if(can_breach && breaches && breaches.len) for(var/datum/breach/B in breaches) to_chat(user, "\red It has \a [B.descriptor].") - diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 46bd28dc368..334e659302b 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -62,7 +62,6 @@ if(1) if(user && ishuman(user) && (user.wear_suit == src)) to_chat(user, "Elecrtromagnetic pulse detected, shutting down systems to preserve integrity...") - deactivate() /obj/item/clothing/suit/space/chronos/proc/chronowalk(var/mob/living/carbon/human/user) @@ -133,32 +132,23 @@ if(user && ishuman(user)) if(user.wear_suit == src) to_chat(user, "\nChronosuitMK4 login: root") - to_chat(user, "Password:\n") - to_chat(user, "root@ChronosuitMK4# chronowalk4 --start\n") - if(user.head && istype(user.head, /obj/item/clothing/head/helmet/space/chronos)) to_chat(user, "\[ ok \] Mounting /dev/helmet") - helmet = user.head helmet.flags |= NODROP helmet.suit = src src.flags |= NODROP to_chat(user, "\[ ok \] Starting brainwave scanner") - to_chat(user, "\[ ok \] Starting ui display driver") - to_chat(user, "\[ ok \] Initializing chronowalk4-view") - new_camera(user) processing_objects.Add(src) activated = 1 else to_chat(user, "\[ fail \] Mounting /dev/helmet") - to_chat(user, "FATAL: Unable to locate /dev/helmet. Aborting...") - cooldown = world.time + cooldowntime activating = 0 return 0 @@ -170,24 +160,18 @@ if(user && ishuman(user)) if(user.wear_suit == src) to_chat(user, "\nroot@ChronosuitMK4# chronowalk4 --stop\n") - if(camera) to_chat(user, "\[ ok \] Sending TERM signal to chronowalk4-view")//yes I know they aren't a different color when shutting down, but they were too similar at a glance - qdel(camera) if(helmet) to_chat(user, "\[ ok \] Stopping ui display driver") - to_chat(user, "\[ ok \] Stopping brainwave scanner") - to_chat(user, "\[ ok \] Unmounting /dev/helmet") - helmet.flags &= ~NODROP helmet.suit = null helmet = null to_chat(user, "logout") - src.flags &= ~NODROP cooldown = world.time + cooldowntime * 1.5 activated = 0 diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index cece5f9b414..4015f107e51 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -19,12 +19,10 @@ camera.c_tag = user.name to_chat(user, "\blue User scanned as [camera.c_tag]. Camera activated.") - /obj/item/clothing/head/helmet/space/rig/ert/examine(mob/user) if(..(user, 1)) to_chat(user, "This helmet has a built-in camera. It's [camera ? "" : "in"]active.") - /obj/item/clothing/suit/space/rig/ert name = "emergency response team suit" desc = "A suit worn by members of the Nanotrasen Emergency Response Team. Armoured, space ready, and fire resistant." diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index 0b434a2aab2..8e3fdefbb65 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -24,7 +24,6 @@ ..(user) to_chat(user, "There are [extinguishes_left] extinguisher canisters left in this suit.") - /obj/item/clothing/suit/space/eva/plasmaman/proc/Extinguish(var/mob/user) var/mob/living/carbon/human/H=user if(extinguishes_left) @@ -34,7 +33,6 @@ next_extinguish = world.time + extinguish_cooldown extinguishes_left-- to_chat(H, "Your suit automatically extinguishes the fire.") - H.ExtinguishMob() /obj/item/clothing/head/helmet/space/eva/plasmaman @@ -54,7 +52,6 @@ if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - return toggle_light(user) diff --git a/code/modules/clothing/spacesuits/rig.dm b/code/modules/clothing/spacesuits/rig.dm index 4fd0961910a..72a32c1e0cb 100644 --- a/code/modules/clothing/spacesuits/rig.dm +++ b/code/modules/clothing/spacesuits/rig.dm @@ -33,7 +33,6 @@ if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - return toggle_light(user) @@ -107,10 +106,8 @@ if(attached_helmet && helmet) if(H.head) to_chat(M, "You are unable to deploy your suit's helmet as \the [H.head] is in the way.") - else to_chat(M, "Your suit's helmet deploys with a hiss.") - //TODO: Species check, skull damage for forcing an unfitting helmet on? helmet.forceMove(H) H.equip_to_slot(helmet, slot_head) @@ -119,10 +116,8 @@ if(attached_boots && boots) if(H.shoes) to_chat(M, "You are unable to deploy your suit's magboots as \the [H.shoes] are in the way.") - else to_chat(M, "Your suit's boots deploy with a hiss.") - boots.forceMove(H) H.equip_to_slot(boots, slot_shoes) boots.flags |= NODROP @@ -158,7 +153,6 @@ if(!helmet) to_chat(usr, "There is no helmet installed.") - return var/mob/living/carbon/human/H = usr @@ -172,11 +166,9 @@ H.unEquip(helmet) helmet.loc = src to_chat(H, "You retract your hardsuit helmet.") - else if(H.head) to_chat(H, "You cannot deploy your helmet while wearing another helmet.") - return //TODO: Species check, skull damage for forcing an unfitting helmet on? helmet.loc = H @@ -184,7 +176,6 @@ H.equip_to_slot(helmet, slot_head) helmet.flags |= NODROP to_chat(H, "You deploy your hardsuit helmet, sealing you off from the world.") - H.update_inv_head() /obj/item/clothing/suit/space/rig/attackby(obj/item/W as obj, mob/user as mob, params) @@ -193,25 +184,20 @@ if(istype(src.loc,/mob/living)) to_chat(user, "How do you propose to modify a hardsuit while it is being worn?") - return if(istype(W,/obj/item/weapon/screwdriver)) if(!helmet) to_chat(user, "\The [src] does not have a helmet installed.") - else to_chat(user, "You detach \the [helmet] from \the [src]'s helmet mount.") - helmet.loc = get_turf(src) src.helmet = null return if(!boots) to_chat(user, "\The [src] does not have any boots installed.") - else to_chat(user, "You detach \the [boots] from \the [src]'s boot mounts.") - boots.loc = get_turf(src) boots = null return @@ -219,14 +205,11 @@ else if(istype(W,/obj/item/clothing/head/helmet/space)) if(!attached_helmet) to_chat(user, "\The [src] does not have a helmet mount.") - return if(helmet) to_chat(user, "\The [src] already has a helmet installed.") - else to_chat(user, "You attach \the [W] to \the [src]'s helmet mount.") - user.drop_item() W.loc = src src.helmet = W @@ -235,15 +218,12 @@ else if(istype(W,/obj/item/clothing/shoes/magboots)) if(!attached_boots) to_chat(user, "\The [src] does not have boot mounts.") - return if(boots) to_chat(user, "\The [src] already has magboots installed.") - else to_chat(user, "You attach \the [W] to \the [src]'s boot mounts.") - user.drop_item() W.loc = src boots = W @@ -327,13 +307,11 @@ if(!isturf(user.loc)) to_chat(user, "You cannot toggle your helmet while in this [user.loc].")//To prevent some lighting anomalities. - return on = !on if(on) to_chat(user, "You switch your helmet to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.") - name = "blood-red hardsuit helmet" desc = "A dual-mode advanced helmet designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." flags = HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP @@ -342,7 +320,6 @@ set_light(brightness_on) else to_chat(user, "You switch your helmet to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.") - name = "blood-red hardsuit helmet (combat)" desc = "A dual-mode advanced helmet designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." flags = BLOCKHAIR | THICKMATERIAL | NODROP @@ -374,7 +351,6 @@ on = !on if(on) to_chat(user, "You switch your hardsuit to travel mode. It will allow you to stand in zero pressure environments, at the cost of speed and armor.") - name = "blood-red hardsuit" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in travel mode. Property of Gorlex Marauders." slowdown = 1 @@ -383,7 +359,6 @@ cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS else to_chat(user, "You switch your hardsuit to combat mode. You will take damage in zero pressure environments, but you are more suited for a fight.") - name = "blood-red hardsuit (combat)" desc = "A dual-mode advanced hardsuit designed for work in special operations. It is in combat mode. Property of Gorlex Marauders." slowdown = 0 diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index b555fdd2050..2473fd24eb8 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -52,11 +52,9 @@ if(accepted_item.charges >= 5) to_chat(user, "Another grenade of that type will not fit into the module.") - return 0 to_chat(user, "You slot \the [input_device] into the suit module.") - user.unEquip(input_device) qdel(input_device) accepted_item.charges++ @@ -74,7 +72,6 @@ if(!charge_selected) to_chat(H, "You have not selected a grenade type.") - return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -84,7 +81,6 @@ if(charge.charges <= 0) to_chat(H, "Insufficient grenades!") - return 0 charge.charges-- @@ -191,7 +187,6 @@ if(M.l_hand && M.r_hand) to_chat(M, "Your hands are full.") - deactivate() return @@ -244,12 +239,10 @@ else if(H.l_hand && H.r_hand) to_chat(H, "Your hands are full.") - else var/obj/item/new_weapon = new fabrication_type() new_weapon.forceMove(H) to_chat(H, "You quickly fabricate \a [new_weapon].") - H.put_in_hands(new_weapon) return 1 diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index 6059173f090..468141b6628 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -16,13 +16,11 @@ if(!usr.loc || !usr.loc.loc || !istype(usr.loc.loc, /obj/item/rig_module)) to_chat(usr, "You are not loaded into a hardsuit.") - return var/obj/item/rig_module/module = usr.loc.loc if(!module.holder) to_chat(usr, "Your module is not installed in a hardsuit.") - return module.holder.ui_interact(usr, nano_state = contained_state) @@ -163,10 +161,8 @@ if(integrated_ai && !integrated_ai.stat) if(user) to_chat(user, "You cannot eject your currently stored AI. Purge it manually.") - return 0 to_chat(user, "You purge the remaining scraps of data from your previous AI, freeing it for use.") - if(integrated_ai) integrated_ai.ghostize() qdel(integrated_ai) @@ -214,10 +210,8 @@ ai.forceMove(src) ai_card = ai to_chat(ai_mob, "You have been transferred to \the [holder]'s [src].") - to_chat(user, "You load [ai_mob] into \the [holder]'s [src].") - integrated_ai = ai_mob if(!(locate(integrated_ai) in ai_card)) @@ -225,10 +219,8 @@ eject_ai() else to_chat(user, "There is no active AI within \the [ai].") - else to_chat(user, "There is no active AI within \the [ai].") - update_verb_holder() /obj/item/rig_module/datajack @@ -266,19 +258,15 @@ if(istype(input_device,/obj/item/weapon/disk/tech_disk)) to_chat(user, "You slot the disk into [src].") - var/obj/item/weapon/disk/tech_disk/disk = input_device if(disk.stored) if(load_data(disk.stored)) to_chat(user, "Download successful; disk erased.") - disk.stored = null else to_chat(user, "The disk is corrupt. It is useless to you.") - else to_chat(user, "The disk is blank. It is useless to you.") - return 1 // I fucking hate R&D code. This typecheck spam would be totally unnecessary in a sane setup. @@ -296,15 +284,12 @@ if(!incoming_files || !incoming_files.known_tech || !incoming_files.known_tech.len) to_chat(user, "Memory failure. There is nothing accessible stored on this terminal.") - else // Maybe consider a way to drop all your data into a target repo in the future. if(load_data(incoming_files.known_tech)) to_chat(user, "Download successful; local and remote repositories synchronized.") - else to_chat(user, "Scan complete. There is nothing useful stored on this terminal.") - return 1 return 0 @@ -385,7 +370,6 @@ if(interfaced_with) if(holder && holder.wearer) to_chat(holder.wearer, "Your power sink retracts as the module deactivates.") - drain_complete() interfaced_with = null total_power_drained = 0 @@ -418,7 +402,6 @@ return 0 to_chat(H, "You begin draining power from [target]!") - interfaced_with = target drain_loc = interfaced_with.loc @@ -451,19 +434,16 @@ if(!holder.cell) to_chat(H, "Your power sink flashes an error; there is no cell in your rig.") - drain_complete(H) return if(!interfaced_with || !interfaced_with.Adjacent(H) || !(interfaced_with.loc == drain_loc)) to_chat(H, "Your power sink retracts into its casing.") - drain_complete(H) return if(holder.cell.fully_charged()) to_chat(H, "Your power sink flashes an amber light; your rig cell is full.") - drain_complete(H) return @@ -472,7 +452,6 @@ var/target_drained = interfaced_with.drain_power(0,0,to_drain) if(target_drained <= 0) to_chat(H, "Your power sink flashes a red light; there is no power left in [interfaced_with].") - drain_complete(H) return @@ -485,10 +464,8 @@ if(!interfaced_with) to_chat(if(M) M, "Total power drained: [round(total_power_drained/1000)]kJ.") - else to_chat(if(M) M, "Total power drained from [interfaced_with]: [round(total_power_drained/1000)]kJ.") - interfaced_with.drain_power(0,1,0) // Damage the victim. drain_loc = null diff --git a/code/modules/clothing/spacesuits/rig/modules/modules.dm b/code/modules/clothing/spacesuits/rig/modules/modules.dm index ae790b74f6b..e64084a0beb 100644 --- a/code/modules/clothing/spacesuits/rig/modules/modules.dm +++ b/code/modules/clothing/spacesuits/rig/modules/modules.dm @@ -58,33 +58,27 @@ switch(damage) if(0) to_chat(usr, "It is undamaged.") - if(1) to_chat(usr, "It is badly damaged.") - if(2) to_chat(usr, "It is almost completely destroyed.") - /obj/item/rig_module/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/nanopaste)) if(damage == 0) to_chat(user, "There is no damage to mend.") - return to_chat(user, "You start mending the damaged portions of \the [src]...") - if(!do_after(user,30, target = src) || !W || !src) return var/obj/item/stack/nanopaste/paste = W damage = 0 to_chat(user, "You mend the damage to [src] with [W].") - paste.use(1) return @@ -93,27 +87,22 @@ switch(damage) if(0) to_chat(user, "There is no damage to mend.") - return if(2) to_chat(user, "There is no damage that you are capable of mending with such crude tools.") - return var/obj/item/stack/cable_coil/cable = W if(!cable.amount >= 5) to_chat(user, "You need five units of cable to repair \the [src].") - return to_chat(user, "You start mending the damaged portions of \the [src]...") - if(!do_after(user, 30, target = src) || !W || !src) return damage = 1 to_chat(user, "You mend some of damage to [src] with [W], but you will need more advanced tools to fix it completely.") - cable.use(5) return ..() @@ -154,32 +143,26 @@ if(damage >= 2) to_chat(usr, "The [interface_name] is damaged beyond use!") - return 0 if(world.time < next_use) to_chat(usr, "You cannot use the [interface_name] again so soon.") - return 0 if(!holder || (!(holder.flags & NODROP))) to_chat(usr, "The suit is not initialized.") - return 0 if(usr.lying || usr.stat || usr.stunned || usr.paralysis || usr.weakened) to_chat(usr, "You cannot use the suit in this state.") - return 0 if(holder.wearer && holder.wearer.lying) to_chat(usr, "The suit cannot function while the wearer is prone.") - return 0 if(holder.security_check_enabled && !holder.check_suit_access(usr)) to_chat(usr, "Access denied.") - return 0 if(!holder.check_power_cost(usr, use_power_cost, 0, src, (istype(usr,/mob/living/silicon ? 1 : 0) ) ) ) diff --git a/code/modules/clothing/spacesuits/rig/modules/ninja.dm b/code/modules/clothing/spacesuits/rig/modules/ninja.dm index 5db07ba037c..40e64add719 100644 --- a/code/modules/clothing/spacesuits/rig/modules/ninja.dm +++ b/code/modules/clothing/spacesuits/rig/modules/ninja.dm @@ -38,7 +38,6 @@ var/mob/living/carbon/human/H = holder.wearer to_chat(H, "You are now invisible to normal detection.") - H.invisibility = INVISIBILITY_LEVEL_TWO anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null) @@ -53,7 +52,6 @@ var/mob/living/carbon/human/H = holder.wearer to_chat(H, "You are now visible.") - H.invisibility = 0 anim(get_turf(H), H,'icons/mob/mob.dmi',,"uncloak",,H.dir) @@ -105,7 +103,6 @@ if(!istype(H.loc, /turf)) to_chat(H, "You cannot teleport out of your current location.") - return 0 var/turf/T @@ -116,12 +113,10 @@ /*if(!T || T.density) to_chat(H, "You cannot teleport into solid walls.") - return 0*///Who the fuck cares? Ninjas in walls are cool. if(T.z in config.admin_levels) to_chat(H, "You cannot use your teleporter on this Z-level.") - return 0 phase_out(H,get_turf(H)) diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 7d68a18986a..087b34dd756 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -165,7 +165,6 @@ if(!input_item.reagents || !input_item.reagents.total_volume) to_chat(user, "\The [input_item] is empty.") - return 0 // Magical chemical filtration system, do not question it. @@ -188,10 +187,8 @@ if(total_transferred) to_chat(user, "You transfer [total_transferred] units into the suit reservoir.") - else to_chat(user, "None of the reagents seem suitable.") - return 1 /obj/item/rig_module/chem_dispenser/engage(atom/target) @@ -203,7 +200,6 @@ if(!charge_selected) to_chat(H, "You have not selected a chemical type.") - return 0 var/datum/rig_charge/charge = charges[charge_selected] @@ -214,7 +210,6 @@ var/chems_to_use = 10 if(charge.charges <= 0) to_chat(H, "Insufficient chems!") - return 0 else if(charge.charges < chems_to_use) chems_to_use = charge.charges @@ -230,9 +225,7 @@ if(target_mob != H) to_chat(H, "You inject [target_mob] with [chems_to_use] unit\s of [charge.display_name].") - to_chat(target_mob, "You feel a rushing in your veins as [chems_to_use] unit\s of [charge.display_name] [chems_to_use == 1 ? "is" : "are"] injected.") - target_mob.reagents.add_reagent(charge.display_name, chems_to_use) charge.charges -= chems_to_use @@ -307,19 +300,16 @@ active = 1 voice_holder.active = 1 to_chat(usr, "You enable the speech synthesiser.") - if("Disable") active = 0 voice_holder.active = 0 to_chat(usr, "You disable the speech synthesiser.") - if("Set Name") var/raw_choice = sanitize(input(usr, "Please enter a new name.") as text|null, MAX_NAME_LEN) if(!raw_choice) return 0 voice_holder.voice = raw_choice to_chat(usr, "You are now mimicking [voice_holder.voice].") - return 1 /obj/item/rig_module/maneuvering_jets @@ -446,11 +436,9 @@ if(device == iastamp) device = deniedstamp to_chat(holder.wearer, "Switched to denied stamp.") - else if(device == deniedstamp) device = iastamp to_chat(holder.wearer, "Switched to internal affairs stamp.") - return 1 /obj/item/rig_module/welding_tank @@ -485,11 +473,9 @@ fill_welder(W) else to_chat(holder.wearer, "Your welding tank is out of fuel!") - else to_chat(holder.wearer, "You need to have a welding tool in one of your hands to dispense fuel.") - /obj/item/rig_module/welding_tank/proc/fill_welder(var/obj/item/weapon/weldingtool/W) if(!istype(W)) return 0 @@ -498,11 +484,9 @@ if(get_fuel() >= W.max_fuel) reagents.trans_to(W, W.max_fuel) to_chat(holder.wearer, "Your [holder] dispenses some of the contents of the welding fuel tank into \the [W].") - else reagents.trans_to(W, W.max_fuel) to_chat(holder.wearer, "You hear a faint dripping as your hardsuit welding tank completely empties.") - W.update_icon() /obj/item/rig_module/welding_tank/proc/get_fuel() diff --git a/code/modules/clothing/spacesuits/rig/modules/vision.dm b/code/modules/clothing/spacesuits/rig/modules/vision.dm index f4db1864ffc..9fc960cdbce 100644 --- a/code/modules/clothing/spacesuits/rig/modules/vision.dm +++ b/code/modules/clothing/spacesuits/rig/modules/vision.dm @@ -161,7 +161,6 @@ // Don't cycle if this engage() is being called by activate(). if(starting_up) to_chat(holder.wearer, "You activate your visual sensors.") - return 1 if(vision_modes.len > 1) @@ -171,10 +170,8 @@ vision = vision_modes[vision_index] to_chat(holder.wearer, "You cycle your sensors to [vision.mode] mode.") - else to_chat(holder.wearer, "Your sensors only have one mode.") - return 1 /obj/item/rig_module/vision/New() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index d44baeab2d4..066c4893f73 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -83,22 +83,17 @@ /obj/item/weapon/rig/examine() to_chat(usr, "This is \icon[src][src.name].") - to_chat(usr, "[src.desc]") - if(wearer) for(var/obj/item/piece in list(helmet,gloves,chest,boots)) if(!piece || piece.loc != wearer) continue to_chat(usr, "\icon[piece] \The [piece] [piece.gender == PLURAL ? "are" : "is"] deployed.") - if(src.loc == usr) to_chat(usr, "The maintenance panel is [open ? "open" : "closed"].") - to_chat(usr, "Hardsuit systems are [offline ? "offline" : "online"].") - /obj/item/weapon/rig/New() ..() @@ -221,7 +216,6 @@ if(seal_delay && !do_after(user, seal_delay, target = M)) if(user) to_chat(user, "You must remain still while the suit is adjusting the components.") - failed_to_seal = 1 if(!M) @@ -240,7 +234,6 @@ if(!istype(M) || !istype(piece) || !istype(compare_piece) || !msg_type) if(M) to_chat(M, "You must remain still while the suit is adjusting the components.") - failed_to_seal = 1 break @@ -253,19 +246,15 @@ switch(msg_type) if("boots") to_chat(M, "\The [piece] [!seal_target ? "seal around your feet" : "relax their grip on your legs"].") - M.update_inv_shoes() if("gloves") to_chat(M, "\The [piece] [!seal_target ? "tighten around your fingers and wrists" : "become loose around your fingers"].") - M.update_inv_gloves() if("chest") to_chat(M, "\The [piece] [!seal_target ? "cinches tight again your chest" : "releases your chest"].") - M.update_inv_wear_suit() if("helmet") to_chat(M, "\The [piece] hisses [!seal_target ? "closed" : "open"].") - M.update_inv_head() if(helmet) helmet.update_light(wearer) @@ -304,7 +293,6 @@ flags |= NODROP to_chat(M, "Your entire suit [!(flags & NODROP) ? "loosens as the components relax" : "tightens around you as the components lock into place"].") - if(!(flags & NODROP)) for(var/obj/item/rig_module/module in installed_modules) module.deactivate() @@ -341,16 +329,12 @@ if(flags & NODROP) if (offline_slowdown < 3) to_chat(wearer, "Your suit beeps stridently, and suddenly goes dead.") - else to_chat(wearer, "Your suit beeps stridently, and suddenly you're wearing a leaden mass of metal and plastic composites instead of a powered suit.") - if(offline_vision_restriction == 1) to_chat(wearer, "The suit optics flicker and die, leaving you with restricted vision.") - else if(offline_vision_restriction == 2) to_chat(wearer, "The suit optics drop out completely, drowning you in darkness.") - if(!offline) offline = 1 if(istype(wearer) && wearer.wearing_rig) @@ -406,7 +390,6 @@ if(fail_msg) to_chat(user, "[fail_msg]") - return 0 // This is largely for cancelling stealth and whatever. @@ -533,12 +516,10 @@ return 0 else if(!src.allowed(user)) to_chat(user, "Unauthorized user. Access denied.") - return 0 else if(!ai_override_enabled) to_chat(user, "Synthetic access disabled. Please consult hardware provider.") - return 0 return 1 @@ -589,7 +570,6 @@ if(ai && ai.client && !ai.stat) to_chat(ai, "[message]") - /obj/item/weapon/rig/equipped(mob/living/carbon/human/M) ..() spawn(1) //equipped() is called BEFORE the item is actually set as the slot @@ -655,7 +635,6 @@ if(istype(holder)) if(use_obj && check_slot == use_obj) to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.") - use_obj.flags &= ~NODROP holder.unEquip(use_obj, 1) use_obj.forceMove(src) @@ -664,7 +643,6 @@ if(check_slot) if(check_slot != use_obj) to_chat(H, "You are unable to deploy \the [piece] as \the [check_slot] [check_slot.gender == PLURAL ? "are" : "is"] in the way.") - return else use_obj.forceMove(H) @@ -673,7 +651,6 @@ use_obj.forceMove(src) else to_chat(H, "Your [use_obj.name] [use_obj.gender == PLURAL ? "deploy" : "deploys"] swiftly.") - use_obj.flags |= NODROP if(piece == "helmet" && helmet) @@ -790,20 +767,16 @@ if(wearer) if(dam_module.damage >= 2) to_chat(wearer, "The [source] has disabled your [dam_module.interface_name]!") - else to_chat(wearer, "The [source] has damaged your [dam_module.interface_name]!") - dam_module.deactivate() /obj/item/weapon/rig/proc/malfunction_check(var/mob/living/carbon/human/user) if(malfunction_delay) if(offline) to_chat(user, "The suit is completely unresponsive.") - else to_chat(user, "ERROR: Hardware fault. Rebooting interface...") - return 1 return 0 @@ -828,23 +801,19 @@ var/obj/item/rig_module/ai_container/module = user.loc.loc if(!istype(module) || module.damage >= 2) to_chat(user, "Your host module is unable to interface with the suit.") - return 0 if(offline || !cell || !cell.charge || locked_down) if(user) to_chat(user, "Your host rig is unpowered and unresponsive.") - return 0 if(!wearer || wearer.back != src) if(user) to_chat(user, "Your host rig is not being worn.") - return 0 if(!wearer.stat && !control_overridden && !ai_override_enabled) if(user) to_chat(user, "You are locked out of the suit servo controller.") - return 0 return 1 @@ -854,7 +823,6 @@ wearer.lay_down() to_chat(user, "\The [wearer] is now [wearer.resting ? "resting" : "getting up"].") - /obj/item/weapon/rig/proc/forced_move(var/direction, var/mob/user) // Why is all this shit in client/Move()? Who knows? @@ -894,14 +862,12 @@ if(M.pulling == wearer) if(!M.restrained() && M.stat == 0 && M.canmove && wearer.Adjacent(M)) to_chat(user, "Your host is restrained! They can't move!") - return 0 else M.stop_pulling() if(wearer.pinned.len) to_chat(src, "Your host is pinned to a wall by [wearer.pinned[1]]!") - return 0 // AIs are a bit slower than regular and ignore move intent. diff --git a/code/modules/clothing/spacesuits/rig/rig_attackby.dm b/code/modules/clothing/spacesuits/rig/rig_attackby.dm index 26912b6c005..b89c59cf837 100644 --- a/code/modules/clothing/spacesuits/rig/rig_attackby.dm +++ b/code/modules/clothing/spacesuits/rig/rig_attackby.dm @@ -15,35 +15,29 @@ if(subverted) locked = 0 to_chat(user, "It looks like the locking system has been shorted out.") - return if((!req_access || !req_access.len) && (!req_one_access || !req_one_access.len)) locked = 0 to_chat(user, "\The [src] doesn't seem to have a locking mechanism.") - return if(security_check_enabled && !src.allowed(user)) to_chat(user, "Access denied.") - return locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] \the [src] access panel.") - return else if(istype(W,/obj/item/weapon/crowbar)) if(!open && locked) to_chat(user, "The access panel is locked shut.") - return open = !open to_chat(user, "You [open ? "open" : "close"] the access panel.") - return if(open) @@ -54,21 +48,18 @@ wires.Interact(user) else to_chat(user, "You can't reach the wiring.") - return // Air tank. if(istype(W,/obj/item/weapon/tank)) //Todo, some kind of check for suits without integrated air supplies. if(air_supply) to_chat(user, "\The [src] already has a tank installed.") - return user.unEquip(W) air_supply = W W.forceMove(src) to_chat(user, "You slot [W] into [src] and tighten the connecting valve.") - return // Check if this is a hardsuit upgrade or a modification. @@ -78,7 +69,6 @@ var/mob/living/carbon/human/H = src.loc if(H.back == src) to_chat(user, "You can't install a hardsuit module while the suit is being worn.") - return 1 if(!installed_modules) installed_modules = list() @@ -86,18 +76,15 @@ for(var/obj/item/rig_module/installed_mod in installed_modules) if(!installed_mod.redundant && istype(installed_mod,W)) to_chat(user, "The hardsuit already has a module of that class installed.") - return 1 var/obj/item/rig_module/mod = W to_chat(user, "You begin installing \the [mod] into \the [src].") - if(!do_after(user,40, target = src)) return if(!user || !W) return to_chat(user, "You install \the [mod] into \the [src].") - user.unEquip(mod) installed_modules |= mod mod.forceMove(src) @@ -108,7 +95,6 @@ else if(!cell && istype(W,/obj/item/weapon/stock_parts/cell)) to_chat(user, "You jack \the [W] into \the [src]'s battery mount.") - user.unEquip(W) W.forceMove(src) src.cell = W @@ -118,7 +104,6 @@ if(!air_supply) to_chat(user, "There is not tank to remove.") - return if(user.r_hand && user.l_hand) @@ -126,7 +111,6 @@ else user.put_in_hands(air_supply) to_chat(user, "You detach and remove \the [air_supply].") - air_supply = null return @@ -144,7 +128,6 @@ var/mob/living/carbon/human/H = src.loc if(H.back == src) to_chat(user, "You can't remove an installed device while the hardsuit is being worn.") - return switch(to_remove) @@ -153,7 +136,6 @@ if(cell) to_chat(user, "You detatch \the [cell] from \the [src]'s battery mount.") - for(var/obj/item/rig_module/module in installed_modules) module.deactivate() if(user.r_hand && user.l_hand) @@ -164,7 +146,6 @@ else to_chat(user, "There is nothing loaded in that mount.") - if("system module") var/list/possible_removals = list() @@ -175,7 +156,6 @@ if(!possible_removals.len) to_chat(user, "There are no installed modules to remove.") - return var/removal_choice = input("Which module would you like to remove?") as null|anything in possible_removals @@ -184,7 +164,6 @@ var/obj/item/rig_module/removed = possible_removals[removal_choice] to_chat(user, "You detatch \the [removed] from \the [src].") - removed.forceMove(get_turf(src)) removed.removed() installed_modules -= removed @@ -214,5 +193,4 @@ locked = 0 subverted = 1 to_chat(user, "You short out the access protocol for the suit.") - return 1 diff --git a/code/modules/clothing/spacesuits/rig/rig_pieces.dm b/code/modules/clothing/spacesuits/rig/rig_pieces.dm index 41f58657611..dab4ad5ac35 100644 --- a/code/modules/clothing/spacesuits/rig/rig_pieces.dm +++ b/code/modules/clothing/spacesuits/rig/rig_pieces.dm @@ -24,7 +24,6 @@ if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].")//To prevent some lighting anomalities. - return toggle_light(user) diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index acd84334bac..f4769eddf0b 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -18,7 +18,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_power_cost(usr)) @@ -26,7 +25,6 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!check_suit_access(usr)) @@ -34,7 +32,6 @@ if(!visor) to_chat(usr, "The hardsuit does not have a configurable visor.") - return var/mob/M = usr @@ -55,7 +52,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_suit_access(usr)) @@ -92,7 +88,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_suit_access(usr)) @@ -113,7 +108,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_suit_access(usr)) @@ -134,7 +128,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_suit_access(usr)) @@ -158,7 +151,6 @@ if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_suit_access(usr)) @@ -185,12 +177,10 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!visor) to_chat(usr, "The hardsuit does not have a configurable visor.") - return var/mob/M = usr @@ -202,7 +192,6 @@ if(!visor.active) to_chat(usr, "The visor is suffering a hardware fault and cannot be configured.") - return visor.engage() @@ -219,17 +208,14 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!speech) to_chat(usr, "The hardsuit does not have a speech synthesiser.") - return var/mob/M = usr @@ -253,12 +239,10 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return var/mob/M = usr @@ -275,13 +259,11 @@ if(!istype(module)) selected_module = null to_chat(usr, "Primary system is now: deselected.") - return selected_module = module to_chat(usr, "Primary system is now: [selected_module.interface_name].") - /obj/item/weapon/rig/verb/toggle_module() set name = "Toggle Module" @@ -297,12 +279,10 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return var/mob/M = usr @@ -321,11 +301,9 @@ if(module.active) to_chat(usr, "You attempt to deactivate \the [module.interface_name].") - module.deactivate() else to_chat(usr, "You attempt to activate \the [module.interface_name].") - module.activate() /obj/item/weapon/rig/verb/engage_module() @@ -340,12 +318,10 @@ if(!(flags & NODROP)) to_chat(usr, "The suit is not active.") - return if(!istype(wearer) || !wearer.back == src) to_chat(usr, "The hardsuit is not being worn.") - return if(!check_power_cost(usr, 0, 0, 0, 0)) @@ -366,5 +342,4 @@ return to_chat(usr, "You attempt to engage the [module.interface_name].") - module.engage() \ No newline at end of file diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 7abf3efdf1b..6f699e3a9ae 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -175,12 +175,10 @@ src.active = !( src.active ) if (src.active) to_chat(user, "\blue The reactive armor is now active.") - src.icon_state = "reactive" src.item_state = "reactive" else to_chat(user, "\blue The reactive armor is now inactive.") - src.icon_state = "reactiveoff" src.item_state = "reactiveoff" src.add_fingerprint(user) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index a926b54499e..f1a8865418c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -554,11 +554,9 @@ if(on) on = 0 to_chat(usr, "You turn the suit's special processes off.") - else on = 1 to_chat(usr, "You turn the suit's special processes on.") - processing_objects.Add(src) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 3d12a9ff290..5dc5cf02699 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -24,7 +24,6 @@ has_suit.overlays += inv_overlay to_chat(user, "You attach [src] to [has_suit].") - src.add_fingerprint(user) /obj/item/clothing/accessory/proc/on_removed(mob/user as mob) @@ -40,7 +39,6 @@ if(istype(H)) if(H.wear_suit && H.wear_suit.flags_inv & HIDEJUMPSUIT) to_chat(user, "[H]'s body is covered, and you cannot attach \the [src].") - return 1 var/obj/item/clothing/under/U = H.w_uniform if(istype(U)) @@ -50,7 +48,6 @@ U.attackby(src, user) else to_chat(user, "[H] is not wearing anything to attach \the [src] to.") - return 1 return ..() @@ -207,7 +204,6 @@ /obj/item/clothing/accessory/holobadge/attack_self(mob/user as mob) if(!stored_name) to_chat(user, "Waving around a badge before swiping an ID would be pretty pointless.") - return if(isliving(user)) user.visible_message("\red [user] displays their NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.") @@ -225,25 +221,21 @@ if(access_security in id_card.access || emagged) to_chat(user, "You imprint your ID details onto the badge.") - stored_name = id_card.registered_name name = "holobadge ([stored_name])" desc = "This glowing blue badge marks [stored_name] as THE LAW." else to_chat(user, "[src] rejects your insufficient access rights.") - return ..() /obj/item/clothing/accessory/holobadge/emag_act(user as mob) if (emagged) to_chat(user, "\red [src] is already cracked.") - return else emagged = 1 to_chat(user, "\red You swipe the card and crack the holobadge security checks.") - return /obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/M, mob/living/user) @@ -385,13 +377,11 @@ return ..() if(access_id) to_chat(user, "There is already \a [access_id] clipped onto \the [src]") - user.drop_item() W.forceMove(src) access_id = W to_chat(user, "\The [W] clips onto \the [src] snugly.") - /obj/item/clothing/accessory/petcollar/GetAccess() return access_id ? access_id.GetAccess() : ..() @@ -400,7 +390,6 @@ if(access_id) to_chat(user, "There is \icon[access_id] \a [access_id] clipped onto it.") - /obj/item/clothing/accessory/petcollar/equipped(mob/living/simple_animal/user) if(istype(user)) processing_objects |= src diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm index 44fdc31ed57..2a4bb7634e5 100644 --- a/code/modules/clothing/under/accessories/holster.dm +++ b/code/modules/clothing/under/accessories/holster.dm @@ -28,18 +28,15 @@ /obj/item/clothing/accessory/holster/proc/holster(obj/item/I, mob/user as mob) if(holstered) to_chat(user, "There is already a [holstered] holstered here!") - return if (!istype(I, /obj/item/weapon/gun)) to_chat(user, "Only guns can be holstered!") - return var/obj/item/weapon/gun/W = I if (!can_holster(W)) to_chat(user, "This [W] won't fit in the [src]!") - return holstered = W @@ -54,7 +51,6 @@ if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj)) to_chat(user, "You need an empty hand to draw the [holstered]!") - else if(user.a_intent == I_HARM) usr.visible_message("\red [user] draws the [holstered], ready to shoot!", \ @@ -86,11 +82,9 @@ ..(user) if (holstered) to_chat(user, "A [holstered] is holstered here.") - else to_chat(user, "It is empty.") - /obj/item/clothing/accessory/holster/on_attached(obj/item/clothing/under/S, mob/user as mob) ..() has_suit.verbs += /obj/item/clothing/accessory/holster/verb/holster_verb @@ -118,11 +112,9 @@ if (!H) to_chat(usr, "Something is very wrong.") - if(!H.holstered) if(!istype(usr.get_active_hand(), /obj/item/weapon/gun)) to_chat(usr, "You need your gun equiped to holster it.") - return var/obj/item/weapon/gun/W = usr.get_active_hand() H.holster(W, usr) diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index aa5ebdb78f5..4c5997d3330 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -63,7 +63,6 @@ hold.open(user) else to_chat(user, "You empty [src].") - var/turf/T = get_turf(src) hold.hide_from(usr) for(var/obj/item/I in hold.contents) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 70b6ef113f9..a2496168b5f 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -24,18 +24,15 @@ ..() if(istype(U, /obj/item/clothing/under/chameleon)) to_chat(user, "\red Nothing happens.") - return if(istype(U, /obj/item/clothing/under)) if(src.clothing_choices.Find(U)) to_chat(user, "\red Pattern is already recognised by the suit.") - return src.clothing_choices += U to_chat(user, "\red Pattern absorbed by the suit.") - emp_act(severity) name = "psychedelic" desc = "Groovy!" @@ -56,7 +53,6 @@ if(icon_state == "psyche") to_chat(usr, "\red Your suit is malfunctioning") - return var/obj/item/clothing/under/A diff --git a/code/modules/computer3/bios.dm b/code/modules/computer3/bios.dm index 8c05ad5338a..564156540d3 100644 --- a/code/modules/computer3/bios.dm +++ b/code/modules/computer3/bios.dm @@ -25,17 +25,14 @@ if(istype(user,/mob/living/silicon)) if(!program.ai_allowed) to_chat(user, "\blue You are forbidden from accessing this program.") - return 0 else if(program.human_controls) if(!ishuman(user)) to_chat(user, "\red Your body can't work the controls!") - return 0 if(user.restrained()) to_chat(user, "\red You need a free hand!") - return 0 if(!in_range(src,user)) @@ -43,7 +40,6 @@ if(ishuman(user) && istype(user.get_active_hand(),/obj/item/tk_grab)) if(program.human_controls) to_chat(user, "\red It's too complicated to work at a distance!") - return 0 add_fingerprint(user) user.set_machine(src) @@ -120,7 +116,6 @@ if(PROG_CRASH) if(usr) to_chat(usr, "\red The program crashed!") - usr << browse(null,"\ref[src]") Reset() @@ -154,7 +149,6 @@ else if(usr) to_chat(usr, "\red The program crashed!") - usr << browse(null,"\ref[src]") testing("computer/Crash() - unknown error code [errorcode]") Reset() diff --git a/code/modules/computer3/buildandrepair.dm b/code/modules/computer3/buildandrepair.dm index 158d057451d..4ea984d15d1 100644 --- a/code/modules/computer3/buildandrepair.dm +++ b/code/modules/computer3/buildandrepair.dm @@ -83,20 +83,17 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You wrench the frame into place.") - src.anchored = 1 src.state = 1 if(istype(P, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = P if(!WT.remove_fuel(0, user)) to_chat(user, "The welding tool must be on to complete this task.") - return playsound(src.loc, 'sound/items/Welder.ogg', 50, 1) if(do_after(user, 20, target = src)) if(!src || !WT.isOn()) return to_chat(user, "\blue You deconstruct the frame.") - new /obj/item/stack/sheet/metal( src.loc, 5 ) qdel(src) if(1) @@ -104,7 +101,6 @@ playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 20, target = src)) to_chat(user, "\blue You unfasten the frame.") - src.anchored = 0 src.state = 0 if(istype(P, /obj/item/weapon/circuitboard) && !circuit) @@ -112,24 +108,20 @@ if(B.board_type == "computer") playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) to_chat(user, "\blue You place the circuit board inside the frame.") - src.icon_state = "1" src.circuit = P user.drop_item() P.loc = src else to_chat(user, "\red This frame does not accept circuit boards of this type!") - if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You screw the circuit board into place.") - src.state = 2 src.icon_state = "2" if(istype(P, /obj/item/weapon/crowbar) && circuit) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the circuit board.") - src.state = 1 src.icon_state = "0" circuit.loc = src.loc @@ -138,7 +130,6 @@ if(istype(P, /obj/item/weapon/screwdriver) && circuit) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You unfasten the circuit board.") - src.state = 1 src.icon_state = "1" @@ -148,12 +139,10 @@ if(do_after(10, target = src)) battery.loc = loc to_chat(user, "\blue You remove [battery].") - battery = null else to_chat(user, "\red There's no battery to remove!") - if(istype(P, /obj/item/weapon/stock_parts/cell)) if(!battery) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -161,12 +150,10 @@ battery = P P.loc = src to_chat(user, "\blue You insert [battery].") - else to_chat(user, "\red There's already \an [battery] in [src]!") - if(istype(P, /obj/item/stack/cable_coil)) if(P:amount >= 5) playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) @@ -175,18 +162,15 @@ P:amount -= 5 if(!P:amount) qdel(P) to_chat(user, "\blue You add cables to the frame.") - src.state = 3 src.icon_state = "3" if(3) if(istype(P, /obj/item/weapon/wirecutters)) if(components.len) to_chat(user, "There are parts in the way!") - return playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1) to_chat(user, "\blue You remove the cables.") - src.state = 2 src.icon_state = "2" var/obj/item/stack/cable_coil/A = new /obj/item/stack/cable_coil( src.loc ) @@ -202,21 +186,18 @@ if(P) P:use(2) to_chat(user, "\blue You put in the glass panel.") - src.state = 4 src.icon_state = "4" if(4) if(istype(P, /obj/item/weapon/crowbar)) playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "\blue You remove the glass panel.") - src.state = 3 src.icon_state = "3" new /obj/item/stack/sheet/glass( src.loc, 2 ) if(istype(P, /obj/item/weapon/screwdriver)) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "\blue You connect the monitor.") - var/obj/machinery/computer3/B = new src.circuit.build_path ( src.loc, built=1 ) /*if(circuit.powernet) B:powernet = circuit.powernet if(circuit.id) B:id = circuit.id @@ -240,7 +221,6 @@ /obj/structure/computer3frame/proc/remove_peripheral(var/obj/item/I = null) if(!components || !components.len) to_chat(usr, "\red There are no components in [src] to take out!") - return 0 if(!I) I = input(usr, "Remove which component?","Remove component", null) as null|obj in components @@ -280,19 +260,16 @@ warning("Erronous component in computerframe/remove_peripheral: [I]") I.loc = loc to_chat(usr, "\blue You remove [I]") - return 1 return 0 /obj/structure/computer3frame/proc/insert_peripheral(var/obj/item/I) if(components.len >= max_components) to_chat(usr, "There isn't room in [src] for another component!") - return 0 switch(I.type) if(/obj/item/part/computer/storage/hdd) if(hdd) to_chat(usr, "There is already \an [hdd] in [src]!") - return 0 hdd = I components += hdd @@ -300,7 +277,6 @@ if(/obj/item/part/computer/storage/removable) if(floppy) to_chat(usr, "There is already \an [floppy] in [src]!") - return 0 floppy = I components += floppy @@ -308,7 +284,6 @@ if(/obj/item/part/computer/networking/radio) if(radio) to_chat(usr, "There is already \an [radio] in [src]!") - return 0 radio = I components += radio @@ -316,7 +291,6 @@ if(/obj/item/part/computer/networking/cameras) if(camnet) to_chat(usr, "There is already \an [camnet] in [src]!") - return 0 camnet = I components += camnet @@ -326,4 +300,3 @@ to_chat(usr, "There is already \an [net] in [src]!") - diff --git a/code/modules/computer3/component.dm b/code/modules/computer3/component.dm index 4e0e0ac6807..6dac7aebb31 100644 --- a/code/modules/computer3/component.dm +++ b/code/modules/computer3/component.dm @@ -78,12 +78,10 @@ emag_act(user as mob) if(!writer) to_chat(usr, "You insert \the card, and the computer grinds, sparks, and beeps. After a moment, the card ejects itself.") - computer.emagged = 1 return 1 else to_chat(usr, "You are unable to insert \the card, as the reader slot is occupied") - return 0 attackby(var/obj/item/I as obj, var/mob/user as mob, params) @@ -101,7 +99,6 @@ // This shouldn't happen, just in case.. if(slot == 2 && !dualslot) to_chat(usr, "This device has only one card slot") - return 0 var/mob/living/L = usr @@ -109,31 +106,23 @@ if(1) if(equip_to_reader(card, L)) to_chat(usr, "You insert the card into reader slot") - else to_chat(usr, "There is already something in the reader slot.") - if(2) if(equip_to_writer(card, L)) to_chat(usr, "You insert the card into writer slot") - else to_chat(usr, "There is already something in the reader slot.") - if(3) if(equip_to_reader(card, L)) to_chat(usr, "You insert the card into reader slot") - else if (equip_to_writer(card, L) && dualslot) to_chat(usr, "You insert the card into writer slot") - else if (dualslot) to_chat(usr, "There is already something in both slots.") - else to_chat(usr, "There is already something in the reader slot.") - // Usage of insert() preferred, as it also tells result to the user. proc/equip_to_reader(var/obj/item/weapon/card/card, var/mob/living/L) if(!reader) @@ -159,48 +148,36 @@ if(1) if (remove_reader(L)) to_chat(L, "You remove the card from reader slot") - else to_chat(L, "There is no card in the reader slot") - if(2) if (remove_writer(L)) to_chat(L, "You remove the card from writer slot") - else to_chat(L, "There is no card in the writer slot") - if(3) if (remove_reader(L)) if (remove_writer(L)) to_chat(L, "You remove cards from both slots") - else to_chat(L, "You remove the card from reader slot") - else if(remove_writer(L)) to_chat(L, "You remove the card from writer slot") - else to_chat(L, "There are no cards in both slots") - if(4) if (!remove_reader(L)) if (remove_writer(L)) to_chat(L, "You remove the card from writer slot") - else if (!dualslot) to_chat(L, "There is no card in the reader slot") - else to_chat(L, "There are no cards in both slots") - else to_chat(L, "You remove the card from reader slot") - proc/remove_reader(var/mob/living/L) if(reader) reader.loc = loc @@ -263,7 +240,6 @@ if(slot == 1) // 1: writer if(writer != null) to_chat(usr, "There's already a card in that slot!") - return 0 var/mob/living/L = usr L.drop_item() @@ -273,7 +249,6 @@ else if(slot == 2) // 2: reader if(reader != null) to_chat(usr, "There's already a card in that slot!") - return 0 var/mob/living/L = usr L.drop_item() @@ -283,7 +258,6 @@ else // 0: auto if(reader && writer) to_chat(usr, "Both slots are full!") - return 0 var/mob/living/L = usr L.drop_item() diff --git a/code/modules/computer3/computer.dm b/code/modules/computer3/computer.dm index 9f286241560..75252b33107 100644 --- a/code/modules/computer3/computer.dm +++ b/code/modules/computer3/computer.dm @@ -78,12 +78,10 @@ if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) to_chat(usr, "\red You can't do that.") - return if(!Adjacent(usr)) to_chat(usr, "You can't reach it.") - return Reset() @@ -369,7 +367,6 @@ to_chat(user, "\The [src] won't boot!") - attack_ai(var/mob/user as mob) // copypasta because server racks lose attack_hand() if(stat) Reset() @@ -395,7 +392,6 @@ to_chat(user, "\The [src] won't boot!") - interact() if(stat) Reset() diff --git a/code/modules/computer3/computers/atmos_alert.dm b/code/modules/computer3/computers/atmos_alert.dm index 3b48d0fb2c6..1d834565cac 100644 --- a/code/modules/computer3/computers/atmos_alert.dm +++ b/code/modules/computer3/computers/atmos_alert.dm @@ -98,7 +98,6 @@ for(var/zone in priority_alarms) if(ckey(zone) == removing_zone) to_chat(usr, "\green Priority Alert for area [zone] cleared.") - priority_alarms -= zone if("minor_clear" in href_list) @@ -106,7 +105,6 @@ for(var/zone in minor_alarms) if(ckey(zone) == removing_zone) to_chat(usr, "\green Minor Alert for area [zone] cleared.") - minor_alarms -= zone computer.updateUsrDialog() diff --git a/code/modules/computer3/computers/camera.dm b/code/modules/computer3/computers/camera.dm index 6500fe6f405..7cf5fd0439a 100644 --- a/code/modules/computer3/computers/camera.dm +++ b/code/modules/computer3/computers/camera.dm @@ -317,7 +317,6 @@ interact() else to_chat(usr, "The screen turns to static.") - return // Atlantis: Required for camnetkeys to work. diff --git a/code/modules/computer3/computers/cloning.dm b/code/modules/computer3/computers/cloning.dm index 61d1f25ab83..f90ba3e57e3 100644 --- a/code/modules/computer3/computers/cloning.dm +++ b/code/modules/computer3/computers/cloning.dm @@ -80,7 +80,6 @@ proc/RecordsList() var/dat = "

Current records

" to_chat(dat += topic_link(src,"menu=1",", Back") + "

") - for(var/datum/data/record/R in records) dat += "

[R.fields["name"]]

Scan ID [R.fields["id"]] " + topic_link(src,"view_rec=\ref[R]","View Record") return dat @@ -89,7 +88,6 @@ var/dat = "

Selected Record

" to_chat(dat += topic_link(src,"menu=2",", Back") + "

") - if (!active_record) dat += "Record not found." else diff --git a/code/modules/computer3/computers/communications.dm b/code/modules/computer3/computers/communications.dm index ec4482ee28f..b738cef704e 100644 --- a/code/modules/computer3/computers/communications.dm +++ b/code/modules/computer3/computers/communications.dm @@ -61,7 +61,6 @@ return if (!(computer.z in config.station_levels)) to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") - return if("main" in href_list) @@ -105,17 +104,14 @@ tmp_alertlevel = 0 else: to_chat(usr, "You are not authorized to do this.") - tmp_alertlevel = 0 state = STATE_DEFAULT else to_chat(usr, "You need to swipe your ID.") - if("announce" in href_list) if(authenticated==2) if(message_cooldown) to_chat(usr, "Please allow at least one minute to pass between announcements") - return var/input = input(usr, "Please write a message to announce to the station crew.", "Priority Announcement") if(!input || !interactable()) @@ -197,14 +193,12 @@ if(authenticated==2) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - return var/input = stripped_input(usr, "Please choose a message to transmit to Centcomm via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !interactable()) return Centcomm_announce(input, usr) to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made a Centcomm announcement: [input]") centcomm_message_cooldown = 1 spawn(600)//10 minute cooldown @@ -216,14 +210,12 @@ if((authenticated==2) && (computer.emagged)) if(centcomm_message_cooldown) to_chat(usr, "Arrays recycling. Please stand by.") - return var/input = stripped_input(usr, "Please choose a message to transmit to \[ABNORMAL ROUTING CORDINATES\] via quantum entanglement. Please be aware that this process is very expensive, and abuse will lead to... termination. Transmission does not guarantee a response.", "To abort, send an empty message.", "") if(!input || !interactable()) return Syndicate_announce(input, usr) to_chat(usr, "Message transmitted.") - log_say("[key_name(usr)] has made a Syndicate announcement: [input]") centcomm_message_cooldown = 1 spawn(600)//10 minute cooldown @@ -231,7 +223,6 @@ if("RestoreBackup" in href_list) to_chat(usr, "Backup routing data restored!") - computer.emagged = 0 computer.updateDialog() diff --git a/code/modules/computer3/computers/law.dm b/code/modules/computer3/computers/law.dm index 099c9453ced..ec278163b2a 100644 --- a/code/modules/computer3/computers/law.dm +++ b/code/modules/computer3/computers/law.dm @@ -18,17 +18,14 @@ opened = !opened if(opened) to_chat(usr, "\blue The access panel is now open.") - else to_chat(usr, "\blue The access panel is now closed.") - return attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob, params) if (user.z > 6) to_chat(user, "\red Unable to establish a connection: \black You're too far away from the station!") - return if(istype(module, /obj/item/weapon/aiModule)) module.install(src) @@ -39,21 +36,17 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(src.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return src.current = select_active_ai(user) if (!src.current) to_chat(usr, "No active AIs detected.") - else to_chat(usr, "[src.current.name] selected for law changes.") - return @@ -75,19 +68,15 @@ attack_hand(var/mob/user as mob) if(src.stat & NOPOWER) to_chat(usr, "The upload computer has no power!") - return if(src.stat & BROKEN) to_chat(usr, "The upload computer is broken!") - return src.current = freeborg() if (!src.current) to_chat(usr, "No free cyborgs detected.") - else to_chat(usr, "[src.current.name] selected for law changes.") - return diff --git a/code/modules/computer3/computers/medical.dm b/code/modules/computer3/computers/medical.dm index 2094eee9856..aeda16c4414 100644 --- a/code/modules/computer3/computers/medical.dm +++ b/code/modules/computer3/computers/medical.dm @@ -51,7 +51,6 @@ return if (computer.z > 6) to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") - return var/dat diff --git a/code/modules/computer3/computers/message.dm b/code/modules/computer3/computers/message.dm index 427c2283808..31aa4f3a501 100644 --- a/code/modules/computer3/computers/message.dm +++ b/code/modules/computer3/computers/message.dm @@ -221,11 +221,9 @@ proc/BruteForce(mob/usr as mob) if(isnull(linkedServer)) to_chat(usr, "Could not complete brute-force: Linked Server Disconnected!") - else var/currentKey = src.linkedServer.decryptkey to_chat(usr, "Brute-force completed! The key is '[currentKey]'.") - src.hacking = 0 src.active_state = normal_icon src.screen = 0 // Return the screen back to normal @@ -418,7 +416,6 @@ var/mob/living/carbon/human/H = customrecepient.loc to_chat(H, "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)" - log_pda("[usr] (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") @@ -434,7 +431,6 @@ var/mob/living/carbon/human/H = customrecepient.loc to_chat(H, "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)" - log_pda("[usr] (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") customrecepient.overlays.Cut() customrecepient.overlays += image('icons/obj/pda.dmi', "pda-r") @@ -451,7 +447,6 @@ // to_chat(usr, href_list["select"]) - if ("back" in href_list) src.screen = 0 interact() \ No newline at end of file diff --git a/code/modules/computer3/computers/prisoner.dm b/code/modules/computer3/computers/prisoner.dm index 85c6f0c9562..b38b376abf5 100644 --- a/code/modules/computer3/computers/prisoner.dm +++ b/code/modules/computer3/computers/prisoner.dm @@ -96,7 +96,6 @@ log_say("PrisonComputer3 message: [key_name(usr)]->[key_name(R)] : [warning]") to_chat(R, "\green You hear a voice in your head saying: '[warning]'") - interact() return diff --git a/code/modules/computer3/computers/prisonshuttle.dm b/code/modules/computer3/computers/prisonshuttle.dm index aedcaaeb07b..119dbc350a4 100644 --- a/code/modules/computer3/computers/prisonshuttle.dm +++ b/code/modules/computer3/computers/prisonshuttle.dm @@ -47,13 +47,11 @@ var/prison_shuttle_timeleft = 0 if (src.stat & BROKEN) to_chat(user, "\blue The broken glass falls out.") - new /obj/item/trash/shard( src.loc ) A.state = 3 A.icon_state = "3" else to_chat(user, "\blue You disconnect the monitor.") - A.state = 4 A.icon_state = "4" @@ -61,7 +59,6 @@ var/prison_shuttle_timeleft = 0 else if(istype(I,/obj/item/card/emag) && (!hacked)) hacked = 1 to_chat(user, "\blue You disable the lock.") - else return src.attack_hand(user) @@ -69,11 +66,9 @@ var/prison_shuttle_timeleft = 0 attack_hand(var/mob/user as mob) if(!src.allowed(user) && (!hacked)) to_chat(user, "\red Access Denied.") - return if(prison_break) to_chat(user, "\red Unable to locate shuttle.") - return if(..()) return @@ -106,12 +101,10 @@ var/prison_shuttle_timeleft = 0 if (href_list["sendtodock"]) if (!prison_can_move()) to_chat(usr, "\red The prison shuttle is unable to leave.") - return if(!prison_shuttle_at_station|| prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") - src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_prison = 1 @@ -122,12 +115,10 @@ var/prison_shuttle_timeleft = 0 else if (href_list["sendtostation"]) if (!prison_can_move()) to_chat(usr, "\red The prison shuttle is unable to leave.") - return if(prison_shuttle_at_station || prison_shuttle_moving_to_station || prison_shuttle_moving_to_prison) return post_signal("prison") to_chat(usr, "\blue The prison shuttle has been called and will arrive in [(PRISON_MOVETIME/10)] seconds.") - src.temp += "Shuttle sent.

OK" src.updateUsrDialog() prison_shuttle_moving_to_station = 1 @@ -196,7 +187,6 @@ var/prison_shuttle_timeleft = 0 if (!prison_can_move()) to_chat(usr, "\red The prison shuttle is unable to leave.") - return var/area/start_location = locate(/area/shuttle/prison/prison) @@ -226,7 +216,6 @@ var/prison_shuttle_timeleft = 0 if (!prison_can_move()) to_chat(usr, "\red The prison shuttle is unable to leave.") - return var/area/start_location = locate(/area/shuttle/prison/station) diff --git a/code/modules/computer3/computers/robot.dm b/code/modules/computer3/computers/robot.dm index 3e404ff1200..002750b49c1 100644 --- a/code/modules/computer3/computers/robot.dm +++ b/code/modules/computer3/computers/robot.dm @@ -127,7 +127,6 @@ else to_chat(usr, "\red Access Denied.") - if ("stop" in href_list) src.temp = {" Stop Robot Destruction Sequence?
@@ -161,7 +160,6 @@ if(R && istype(R)) if(R.mind && R.mind.special_role && R.emagged) to_chat(R, "Extreme danger. Termination codes detected. Scrambling security codes and automatic AI unlink triggered.") - R.ResetSecurityCodes() else @@ -171,7 +169,6 @@ else to_chat(usr, "\red Access Denied.") - if ("stopbot" in href_list) if(computer.allowed(usr)) var/mob/living/silicon/robot/R = locate(href_list["stopbot"]) @@ -186,17 +183,14 @@ // R.cell.charge = R.lockcharge R.lockcharge = !R.lockcharge to_chat(R, "Your lockdown has been lifted!") - else R.lockcharge = !R.lockcharge // R.cell.charge = 0 to_chat(R, "You have been locked down!") - else to_chat(usr, "\red Access Denied.") - if ("magbot" in href_list) if(computer.allowed(usr)) var/mob/living/silicon/robot/R = locate(href_list["magbot"]) diff --git a/code/modules/computer3/computers/scanconsole.dm b/code/modules/computer3/computers/scanconsole.dm index a312f49a423..fa88ae24b36 100644 --- a/code/modules/computer3/computers/scanconsole.dm +++ b/code/modules/computer3/computers/scanconsole.dm @@ -359,7 +359,6 @@ if(!viable) return "No viable occupant detected." to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") - dat += "

Modify Unique Identifier

" dat += "
Unique Identifier:
[getblockstring(ui=1)]

" @@ -374,7 +373,6 @@ if(!viable) return "No viable occupant detected." to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") - dat += "

Modify Structural Enzymes

" dat += "
Structural Enzymes: [getblockstring(ui=0)]

" dat += "Selected Block: " + block_plus_minus("seblock",se_block,1,MAX_SEBLOCK) + "

" @@ -385,7 +383,6 @@ proc/emitter_menu() to_chat(var/dat = topic_link(src,"mode=0",", Main Menu") + "
") - dat += "

Radiation Emitter Settings

" if (viable) dat += topic_link(src,"pulse","Pulse Radiation") @@ -746,7 +743,6 @@ human_occupant.reagents.add_reagent("inaprovaline", round(REJUVENATORS_MAX - human_occupant.reagents.get_reagent_amount("inaprovaline"))) // to_chat(usr, text("Occupant now has [] units of rejuvenation in his/her bloodstream.", human_occupant.reagents.get_reagent_amount("inaprovaline"))) - //////////////////////////////////////////////////////// if (href_list["strucmenuplus"]) if (se_block < 14) diff --git a/code/modules/computer3/computers/security.dm b/code/modules/computer3/computers/security.dm index 047ff3c4359..c7eb0a8881b 100644 --- a/code/modules/computer3/computers/security.dm +++ b/code/modules/computer3/computers/security.dm @@ -59,7 +59,6 @@ if (computer.z > 6) to_chat(usr, "\red Unable to establish a connection: \black You're too far away from the station!") - return var/dat diff --git a/code/modules/computer3/computers/shuttle.dm b/code/modules/computer3/computers/shuttle.dm index 9fbaa113bab..236de564868 100644 --- a/code/modules/computer3/computers/shuttle.dm +++ b/code/modules/computer3/computers/shuttle.dm @@ -20,18 +20,15 @@ W = pda.id if (!W:access) //no access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return var/list/cardaccess = W:access if(!istype(cardaccess, /list) || !cardaccess.len) //no access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return if(!(access_heads in W:access)) //doesn't have this access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") @@ -45,12 +42,10 @@ message_admins("[key_name_admin(user)] has authorized early shuttle launch") log_game("[user.ckey] has authorized early shuttle launch") to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) - else message_admins("[key_name_admin(user)] has launched the shuttle") log_game("[user.ckey] has launched the shuttle early") to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!") - emergency_shuttle.online = 1 emergency_shuttle.settimeleft(10) //src.authorized = null @@ -61,10 +56,8 @@ src.authorized -= W:registered_name to_chat(world, text("\blue Alert: [] authorizations needed until shuttle is launched early", src.auth_need - src.authorized.len)) - if("Abort") to_chat(world, "\blue All authorizations to shorting time for shuttle launch have been revoked!") - src.authorized.len = 0 src.authorized = list( ) return @@ -77,7 +70,6 @@ switch(choice) if("Launch") to_chat(world, "\blue Alert: Shuttle launch time shortened to 10 seconds!") - emergency_shuttle.settimeleft( 10 ) emagged = 1 if("Cancel") diff --git a/code/modules/computer3/computers/specops_shuttle.dm b/code/modules/computer3/computers/specops_shuttle.dm index c863150f38f..8281a30479f 100644 --- a/code/modules/computer3/computers/specops_shuttle.dm +++ b/code/modules/computer3/computers/specops_shuttle.dm @@ -59,7 +59,6 @@ var/specops_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Special Operations shuttle is unable to leave.") - return //Begin Marauder launchpad. @@ -156,7 +155,6 @@ var/specops_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "\red You have arrived to [station_name]. Commence operation!") - /proc/specops_can_move() if(specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return 0 else return 1 @@ -173,19 +171,16 @@ var/specops_shuttle_timeleft = 0 /obj/machinery/computer3/specops_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/card/emag)) to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else return attack_hand(user) /obj/machinery/computer3/specops_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied.") - return if (sent_strike_team == 0) to_chat(usr, "\red The strike team has not yet deployed.") - return if(..()) @@ -220,7 +215,6 @@ var/specops_shuttle_timeleft = 0 if(!specops_shuttle_at_station|| specops_shuttle_moving_to_station || specops_shuttle_moving_to_centcom) return to_chat(usr, "\blue Central Command will not allow the Special Operations shuttle to return.") - return else if (href_list["sendtostation"]) @@ -228,12 +222,10 @@ var/specops_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Special Operations shuttle is unable to leave.") - return to_chat(usr, "\blue The Special Operations shuttle will arrive on [station_name] in [(SPECOPS_MOVETIME/10)] seconds.") - temp += "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/modules/computer3/computers/syndicate_shuttle.dm b/code/modules/computer3/computers/syndicate_shuttle.dm index 855ae3c02a2..5585f4fff0a 100644 --- a/code/modules/computer3/computers/syndicate_shuttle.dm +++ b/code/modules/computer3/computers/syndicate_shuttle.dm @@ -48,7 +48,6 @@ /obj/machinery/computer3/syndicate_station/attack_hand(mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied") - return user.set_machine(src) diff --git a/code/modules/computer3/computers/syndicate_specops_shuttle.dm b/code/modules/computer3/computers/syndicate_specops_shuttle.dm index c97785300fa..f490cd3c822 100644 --- a/code/modules/computer3/computers/syndicate_specops_shuttle.dm +++ b/code/modules/computer3/computers/syndicate_specops_shuttle.dm @@ -59,7 +59,6 @@ var/syndicate_elite_shuttle_timeleft = 0 if (!syndicate_elite_can_move()) to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") - return sleep(600) @@ -169,7 +168,6 @@ var/syndicate_elite_shuttle_timeleft = 0 var/mob/M = locate(/mob) in T to_chat(M, "\red You have arrived to [station_name]. Commence operation!") - /proc/syndicate_elite_can_move() if(syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return 0 else return 1 @@ -186,19 +184,16 @@ var/syndicate_elite_shuttle_timeleft = 0 /obj/machinery/computer3/syndicate_elite_shuttle/attackby(I as obj, user as mob, params) if(istype(I,/obj/item/card/emag)) to_chat(user, "\blue The electronic systems in this console are far too advanced for your primitive hacking peripherals.") - else return attack_hand(user) /obj/machinery/computer3/syndicate_elite_shuttle/attack_hand(var/mob/user as mob) if(!allowed(user)) to_chat(user, "\red Access Denied.") - return // if (sent_syndicate_strike_team == 0) // to_chat(usr, "\red The strike team has not yet deployed.") - // return if(..()) @@ -232,7 +227,6 @@ var/syndicate_elite_shuttle_timeleft = 0 if(!syndicate_elite_shuttle_at_station|| syndicate_elite_shuttle_moving_to_station || syndicate_elite_shuttle_moving_to_mothership) return to_chat(usr, "\blue The Syndicate will not allow the Elite Squad shuttle to return.") - return else if (href_list["sendtostation"]) @@ -240,12 +234,10 @@ var/syndicate_elite_shuttle_timeleft = 0 if (!specops_can_move()) to_chat(usr, "\red The Syndicate Elite shuttle is unable to leave.") - return to_chat(usr, "\blue The Syndicate Elite shuttle will arrive on [station_name] in [(SYNDICATE_ELITE_MOVETIME/10)] seconds.") - temp = "Shuttle departing.

OK" updateUsrDialog() diff --git a/code/modules/computer3/laptop.dm b/code/modules/computer3/laptop.dm index 5d5ba843b0b..dd4f73914b6 100644 --- a/code/modules/computer3/laptop.dm +++ b/code/modules/computer3/laptop.dm @@ -36,17 +36,14 @@ if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) to_chat(usr, "\red You can't do that.") - return if(!Adjacent(usr)) to_chat(usr, "You can't reach it.") - return if(!istype(loc,/turf)) to_chat(usr, "[src] is too bulky! You'll have to set it down.") - return if(!stored_computer) @@ -54,7 +51,6 @@ for(var/obj/O in contents) O.forceMove(loc) to_chat(usr, "\The [src] crumbles to pieces.") - spawn(5) qdel(src) return @@ -67,7 +63,6 @@ loc = null to_chat(usr, "You open \the [src].") - spawn(5) stored_computer.manipulating = 0 qdel(src) @@ -75,7 +70,6 @@ to_chat(usr, "\red You are already opening the computer!") - AltClick() if(Adjacent(usr)) open_computer() @@ -102,7 +96,6 @@ if(!C) to_chat(usr, "There is no card port on the laptop.") - return var/obj/item/weapon/card/id/card @@ -112,11 +105,9 @@ card = C.writer else to_chat(usr, "There is nothing to remove from the laptop card port.") - return to_chat(usr, "You remove [card] from the laptop.") - C.remove(card) @@ -145,12 +136,10 @@ if(usr.stat || usr.restrained() || usr.lying || !istype(usr, /mob/living)) to_chat(usr, "\red You can't do that.") - return if(!Adjacent(usr)) to_chat(usr, "You can't reach it.") - return if(istype(loc,/obj/item/device/laptop)) @@ -162,7 +151,6 @@ if(stat&BROKEN) to_chat(usr, "\The [src] is broken! You can't quite get it closed.") - return if(!portable) @@ -175,7 +163,6 @@ stat |= MAINT to_chat(usr, "You close \the [src].") - auto_use_power() if(stat&MAINT) return diff --git a/code/modules/computer3/lapvend.dm b/code/modules/computer3/lapvend.dm index 4bce2cf7ca4..8383981046d 100644 --- a/code/modules/computer3/lapvend.dm +++ b/code/modules/computer3/lapvend.dm @@ -57,7 +57,6 @@ L.loc = src vendmode = 3 to_chat(usr, "You slot your [L.name] into \The [src.name]") - else ..() @@ -264,14 +263,11 @@ power = 0 else to_chat(usr, "\icon[src]You don't have that much money!") - else to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") - else to_chat(usr, "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support.") - /obj/machinery/lapvend/proc/total() var/total = 0 @@ -410,7 +406,5 @@ else to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") - else to_chat(usr, "\icon[src]Unable to access vendor account. Please record the machine ID and call CentComm Support.") - diff --git a/code/modules/computer3/storage.dm b/code/modules/computer3/storage.dm index e8a5b4aac8b..9ff8cab497b 100644 --- a/code/modules/computer3/storage.dm +++ b/code/modules/computer3/storage.dm @@ -117,18 +117,15 @@ attackby(obj/O as obj, mob/user as mob, params) if(inserted && istype(O,/obj/item/weapon/pen)) to_chat(usr, "You use [O] to carefully pry [inserted] out of [src].") - eject_disk(forced = 1) return if(istype(O,/obj/item/weapon/disk/file)) if(inserted) to_chat(usr, "There's already a disk in [src]!") - return to_chat(usr, "You insert [O] into [src].") - usr.drop_item() O.loc = src inserted = O diff --git a/code/modules/computer3/upload/programs.dm b/code/modules/computer3/upload/programs.dm index 5e86666c8b2..34197f3bf69 100644 --- a/code/modules/computer3/upload/programs.dm +++ b/code/modules/computer3/upload/programs.dm @@ -9,6 +9,5 @@ return 0 if(!computer.net) to_chat(usr, "An indecipherable set of code flicks across the screen. Nothing else happens.") - return var/list/results = computer.net.get_machines \ No newline at end of file diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index 6223a663755..8a9d5803529 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -21,7 +21,6 @@ /obj/item/weaponcrafting/receiver/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/pipe)) to_chat(user, "You attach the shotgun barrel to the receiver. The pins seem loose.") - var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction user.unEquip(src) user.put_in_hands(I) @@ -44,7 +43,6 @@ user.unEquip(src) user.put_in_hands(C) to_chat(user, "You screw the pins into place, securing the pipe to the receiver.") - qdel(src) /obj/item/weaponcrafting/ishotgunconstruction2 @@ -56,7 +54,6 @@ /obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weaponcrafting/stock)) to_chat(user, "You attach the stock to the receiver-barrel assembly.") - var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 user.unEquip(src) user.put_in_hands(I) @@ -79,10 +76,8 @@ user.unEquip(src) user.put_in_hands(W) to_chat(user, "You tie the wrapping paper around the stock and the barrel to secure it.") - qdel(src) else to_chat(user, "You need at least five feet of wrapping paper to secure the stock.") - return diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm index 8fdaaffaba0..19ea37c3866 100644 --- a/code/modules/crafting/table.dm +++ b/code/modules/crafting/table.dm @@ -204,17 +204,14 @@ if(href_list["make"]) if(!check_table_space()) to_chat(usr, "The table is too crowded.") - return var/datum/table_recipe/TR = locate(href_list["make"]) busy = 1 interact(usr) if(construct_item(usr, TR)) to_chat(usr, "[TR.name] constructed.") - else to_chat(usr, "Construction failed.") - busy = 0 interact(usr) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 79817543530..c89d08b8d1b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -29,35 +29,29 @@ if(user.a_intent == "harm") user.visible_message("[user] stabs [M] with the [src]!", "You stab [M] with the [src]!") to_chat(M, "[user] stabs you with the [src]!
You feel a tiny prick!") - return if(used) to_chat(user, "The [src] is out of ink.") - return if(!istype(M, /mob/living/carbon/human)) to_chat(user, "You don't think tattooing [M] is the best idea.") - return var/mob/living/carbon/human/target = M if(istype(target.species, /datum/species/machine)) to_chat(user, "[target] has no skin, how do you expect to tattoo them?") - return if(target.m_style != "None") to_chat(user, "[target] already has body markings, any more would look silly!") - return if(target == user) to_chat(user, "You use the [src] to apply a [tattoo_name] to yourself!") - else user.visible_message("[user] begins to apply a [tattoo_name] [target] with the [src].", "You begin to tattoo [target] with the [src]!") if(!do_after(user,30, target = M)) @@ -134,7 +128,6 @@ C.name = "Detective Sax" C.visible_message("[C] suddenly winks into existence at [user]'s feet!") to_chat(user, "[src] crumbles to dust in your hands!") - qdel(src) /obj/item/weapon/storage/toolbox/fluff/lunchbox //godoforeos: Jason Conrad @@ -235,18 +228,14 @@ if("Kluysfluff1") src.icon_state = "Kluysfluff2" to_chat(usr, "The fibre unfolds into a jacket.") - if("Kluysfluff2") src.icon_state = "Kluysfluff3" to_chat(usr, "The fibre unfolds into a coat.") - if("Kluysfluff3") src.icon_state = "Kluysfluff1" to_chat(usr, "The fibre gets sucked back into its holder.") - else to_chat(usr, "You attempt to hit the button but can't.") - return usr.update_inv_wear_suit() @@ -296,12 +285,10 @@ if(src.icon_state == "jane_sid_suit_down") src.item_color = "jane_sid_suit" to_chat(usr, "You zip up \the [src].") - else src.item_color = "jane_sid_suit_down" to_chat(usr, "You unzip and roll down \the [src].") - src.icon_state = "[item_color]" src.item_state = "[item_color]" usr.update_inv_w_uniform() @@ -384,13 +371,11 @@ icon_state = initial(icon_state) item_state = initial(item_state) to_chat(usr, "You untransform \the [src].") - adjusted = 0 else icon_state += "_open" item_state += "_open" to_chat(usr, "You transform \the [src].") - adjusted = 1 usr.update_inv_head() diff --git a/code/modules/customitems/item_spawning.dm b/code/modules/customitems/item_spawning.dm index 9dc4dc7f6ff..d0b350b9b1e 100644 --- a/code/modules/customitems/item_spawning.dm +++ b/code/modules/customitems/item_spawning.dm @@ -46,14 +46,12 @@ Item.loc = M.back ok = 1 to_chat(M, "Your [Item.name] has been added to your [M.back.name].") - if(ok == 0) for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob. if (S.contents.len < S.storage_slots) Item.loc = S ok = 1 to_chat(M, "Your [Item.name] has been added to your [S.name].") - break if(description) Item.desc = description diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm index ec2c7d12eaa..4654e0ab665 100644 --- a/code/modules/detective_work/evidence.dm +++ b/code/modules/detective_work/evidence.dm @@ -23,17 +23,14 @@ if(istype(I, /obj/item/weapon/evidencebag)) to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") - return 1 //now this is podracing if(I.w_class > 3) to_chat(user, "[I] won't fit in [src].") - return if(contents.len) to_chat(user, "[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. @@ -81,7 +78,6 @@ else to_chat(user, "[src] is empty.") - icon_state = "evidenceobj" return diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm index 75bed197992..59466282384 100644 --- a/code/modules/detective_work/scanner.dm +++ b/code/modules/detective_work/scanner.dm @@ -18,7 +18,6 @@ if(log.len && !scanning) scanning = 1 to_chat(user, "Printing report, please wait...") - playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) spawn(100) @@ -35,14 +34,12 @@ M.put_in_hands(P) to_chat(M, "Report printed. Log cleared.") - // Clear the logs log = list() scanning = 0 else to_chat(user, "The scanner has no logs or is in use.") - /obj/item/device/detective_scanner/attack(mob/living/M as mob, mob/user as mob) return @@ -65,7 +62,6 @@ to_chat(user, "You scan \the [A]. The scanner is now analysing the results...") - // GATHER INFORMATION //Make our lists @@ -157,12 +153,10 @@ 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]!") - else if(holder) to_chat(holder, "You finish scanning \the [target_name].") - add_log("---------------------------------------------------------", 0) scanning = 0 return @@ -172,7 +166,6 @@ if(broadcast && ismob(loc)) var/mob/M = loc to_chat(M, msg) - log += "  [msg]" else CRASH("[src] \ref[src] is adding a log when it was never put in scanning mode!") diff --git a/code/modules/economy/ATM.dm b/code/modules/economy/ATM.dm index f3d7a2805bc..7448d3da352 100644 --- a/code/modules/economy/ATM.dm +++ b/code/modules/economy/ATM.dm @@ -113,7 +113,6 @@ log transactions authenticated_account.transaction_log.Add(T) to_chat(user, "You insert [C] into [src].") - src.attack_hand(user) qdel(I) else @@ -122,7 +121,6 @@ log transactions /obj/machinery/atm/attack_hand(mob/user as mob) if(istype(user, /mob/living/silicon)) to_chat(user, "\red Artificial unit recognized. Artificial units do not currently receive monetary compensation, as per Nanotrasen regulation #1005.") - return if(get_dist(src,user) <= 1) //check to see if the user has low security enabled @@ -228,7 +226,6 @@ log transactions var/transfer_purpose = href_list["purpose"] if(linked_db.charge_to_account(target_account_number, authenticated_account.owner_name, transfer_purpose, machine_id, transfer_amount)) to_chat(usr, "\icon[src]Funds transfer successful.") - authenticated_account.money -= transfer_amount //create an entry in the account transaction log @@ -243,10 +240,8 @@ log transactions else to_chat(usr, "\icon[src]Funds transfer failed.") - else to_chat(usr, "\icon[src]You don't have enough funds to do that!") - if("view_screen") view_screen = text2num(href_list["view_screen"]) if("change_security_level") @@ -281,12 +276,10 @@ log transactions failed_account.transaction_log.Add(T) else to_chat(usr, "\red \icon[src] Incorrect pin/account combination entered, [max_pin_attempts - number_incorrect_tries] attempts remaining.") - previous_account_number = tried_account_num playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 1) else to_chat(usr, "\red \icon[src] incorrect pin/account combination entered.") - number_incorrect_tries = 0 else playsound(src, 'sound/machines/twobeep.ogg', 50, 1) @@ -304,7 +297,6 @@ log transactions to_chat(usr, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") - previous_account_number = tried_account_num if("withdrawal") var/amount = max(text2num(href_list["funds_amount"]),0) @@ -317,7 +309,6 @@ log transactions //remove the money if(amount > 10000) // prevent crashes to_chat(usr, "\blue The ATM's screen flashes, 'Maximum single withdrawl limit reached, defaulting to 10,000.'") - amount = 10000 authenticated_account.money -= amount withdraw_arbitrary_sum(amount) @@ -333,12 +324,10 @@ log transactions authenticated_account.transaction_log.Add(T) else to_chat(usr, "\icon[src]You don't have enough funds to do that!") - if("balance_statement") if(authenticated_account) if(world.timeofday < lastprint + PRINT_DELAY) to_chat(usr, "The [src.name] flashes an error on its display.") - return lastprint = world.timeofday playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) @@ -404,7 +393,6 @@ log transactions if(authenticated_account) to_chat(human_user, "\blue \icon[src] Access granted. Welcome user '[authenticated_account.owner_name].'") - //create a transaction log entry var/datum/transaction/T = new() T.target_name = authenticated_account.owner_name diff --git a/code/modules/economy/EFTPOS.dm b/code/modules/economy/EFTPOS.dm index f67aba1e6e2..a9fe34e1e46 100644 --- a/code/modules/economy/EFTPOS.dm +++ b/code/modules/economy/EFTPOS.dm @@ -112,10 +112,8 @@ scan_card(I) else to_chat(usr, "\icon[src]Unable to connect to linked account.") - else to_chat(usr, "\icon[src]Unable to connect to accounts database.") - else ..() @@ -133,7 +131,6 @@ print_reference() else to_chat(usr, "\icon[src]Incorrect code entered.") - if("change_id") var/attempt_code = text2num(input("Re-enter the current EFTPOS access code", "Confirm EFTPOS code")) if(attempt_code == access_code) @@ -143,7 +140,6 @@ print_reference() else to_chat(usr, "\icon[src]Incorrect code entered.") - if("link_account") if(!linked_db) reconnect_database() @@ -153,7 +149,6 @@ linked_account = attempt_account_access(attempt_account_num, attempt_pin, 1) else to_chat(usr, "\icon[src]Unable to connect to accounts database.") - if("trans_purpose") var/purpose = input("Enter reason for EFTPOS transaction", "Transaction purpose") as text|null if(purpose) @@ -174,7 +169,6 @@ transaction_locked = 1 else to_chat(usr, "\icon[src] No account connected to send transactions to.") - if("scan_card") //attempt to connect to a new db, and if that doesn't work then fail if(!linked_db) @@ -185,7 +179,6 @@ scan_card(I) else to_chat(usr, "\icon[src]Unable to link accounts.") - if("reset") //reset the access code - requires HoP/captain access var/obj/item/I = usr.get_active_hand() @@ -194,12 +187,10 @@ if(access_cent_commander in C.access || access_hop in C.access || access_captain in C.access) access_code = 0 to_chat(usr, "\icon[src]Access code reset to 0.") - else if (istype(I, /obj/item/weapon/card/emag)) access_code = 0 to_chat(usr, "\icon[src]Access code reset to 0.") - src.attack_self(usr) /obj/item/device/eftpos/proc/scan_card(var/obj/item/weapon/card/I) @@ -243,13 +234,10 @@ linked_account.transaction_log.Add(T) else to_chat(usr, "\icon[src]You don't have that much money!") - else to_chat(usr, "\icon[src]Unable to access account. Check security settings and try again.") - else to_chat(usr, "\icon[src]EFTPOS is not connected to an account.") - else ..() diff --git a/code/modules/economy/POS.dm b/code/modules/economy/POS.dm index e16a475d468..79e506ddee9 100644 --- a/code/modules/economy/POS.dm +++ b/code/modules/economy/POS.dm @@ -404,7 +404,6 @@ var/const/POS_HEADER = {" return if(usr != logged_in) to_chat(usr, "\red [logged_in.name] is already logged in. You cannot use this machine until they log out.") - return if("act" in href_list) switch(href_list["act"]) @@ -433,7 +432,6 @@ var/const/POS_HEADER = {" var/list/cells = splittext(line,",") if(cells.len<2) to_chat(usr, "\red The CSV must have at least two columns: Product Name, followed by Price (as a number).") - src.attack_hand(usr) return var/line_item/LI = new @@ -448,7 +446,6 @@ var/const/POS_HEADER = {" var/datum/money_account/new_linked_account = get_money_account(text2num(href_list["payableto"]),z) if(!new_linked_account) to_chat(usr, "\red Unable to link new account.") - else linked_account = new_linked_account screen=POS_SCREEN_SETTINGS diff --git a/code/modules/economy/utils.dm b/code/modules/economy/utils.dm index c2148deb9b5..5ef9a033b6d 100644 --- a/code/modules/economy/utils.dm +++ b/code/modules/economy/utils.dm @@ -49,7 +49,6 @@ /datum/money_account/proc/charge(var/transaction_amount,var/datum/money_account/dest,var/transaction_purpose, var/terminal_name="", var/terminal_id=0, var/dest_name = "UNKNOWN") if(suspended) to_chat(usr, "Unable to access source account: account suspended.") - return 0 if(transaction_amount <= money) @@ -90,5 +89,4 @@ return 1 else to_chat(usr, "Insufficient funds in account.") - return 0 \ No newline at end of file diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index 9a77a6d08ff..6ada1a25c0f 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -8,12 +8,9 @@ for(var/mob/living/silicon/ai/A in player_list) //AIs are always aware of communication blackouts. to_chat(A, "
") - to_chat(A, "[alert]") - to_chat(A, "
") - if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. command_announcement.Announce(alert) @@ -27,10 +24,7 @@ else // AIs will always know if there's a comm blackout, rogue AIs could then lie about comm blackouts in the future while they shutdown comms for(var/mob/living/silicon/ai/A in player_list) to_chat(A, "
") - to_chat(A, "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT") - to_chat(A, "
") - for(var/obj/machinery/telecomms/T in telecomms_list) T.emp_act(1) diff --git a/code/modules/events/event_manager.dm b/code/modules/events/event_manager.dm index 06a40d81fdb..85ffa86f25f 100644 --- a/code/modules/events/event_manager.dm +++ b/code/modules/events/event_manager.dm @@ -74,7 +74,6 @@ return to_chat(world, "


Random Events This Round:") - for(var/datum/event/E in active_events|finished_events) var/datum/event_meta/EM = E.event_meta if(EM.name == "Nothing") @@ -90,7 +89,6 @@ to_chat(world, message) - /datum/event_manager/proc/GetInteractWindow() var/html = "Refresh" diff --git a/code/modules/events/holidays/Holidays.dm b/code/modules/events/holidays/Holidays.dm index 363cd7017e0..e06c7764a39 100644 --- a/code/modules/events/holidays/Holidays.dm +++ b/code/modules/events/holidays/Holidays.dm @@ -141,9 +141,7 @@ var/global/Holiday = null /proc/Holiday_Game_Start() if(Holiday) to_chat(world, "and...") - to_chat(world, "

Happy [Holiday] Everybody!

") - switch(Holiday) //special holidays if("Easter") //do easter stuff diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 6a6d2c91469..d153294c790 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -28,12 +28,9 @@ if(message) M.add_ion_law(message) to_chat(M, "
") - to_chat(M, "[message] ...LAWS UPDATED") - to_chat(M, "
") - if(botEmagChance) for(var/mob/living/simple_animal/bot/bot in machines) if(prob(botEmagChance)) diff --git a/code/modules/events/prison_break.dm b/code/modules/events/prison_break.dm index 77f2717831a..89671701958 100644 --- a/code/modules/events/prison_break.dm +++ b/code/modules/events/prison_break.dm @@ -52,7 +52,6 @@ for(var/mob/living/silicon/ai/A in player_list) to_chat(A, "Malicious program detected in the [english_list(areaName)] lighting and airlock control systems by [my_department].") - else log_to_dd("ERROR: Could not initate grey-tide. Unable to find suitable containment area.") kill() diff --git a/code/modules/events/undead.dm b/code/modules/events/undead.dm index b2a0f166735..2ff8d05c20a 100644 --- a/code/modules/events/undead.dm +++ b/code/modules/events/undead.dm @@ -38,4 +38,3 @@ /datum/event/undead/announce() for(var/mob/living/M in player_list) to_chat(M, "You feel [pick("a chill","a deathly chill","the undead","dirty", "creeped out","afraid","fear")]!") - diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm index 65db943ae6e..00659104480 100644 --- a/code/modules/fish/fish_items.dm +++ b/code/modules/fish/fish_items.dm @@ -40,7 +40,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw to_chat(viewers(user), "[user] places the [src.name] on top of \his head, \his fingers tangled in the netting! It looks like \he's trying to commit suicide.") - return(OXYLOSS) /obj/item/weapon/fishfood @@ -67,7 +66,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi suicide_act(mob/user) to_chat(viewers(user), "[user] is vigorously scrubbing \himself raw with the [src.name]! It looks like \he's trying to commit suicide.") - return(BRUTELOSS|FIRELOSS) ////////////////////////////////////////////// @@ -136,7 +134,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/shark/attackby(var/obj/item/O, var/mob/user as mob) if(istype(O, /obj/item/weapon/wirecutters)) to_chat(user, "You rip out the teeth of \the [src.name]!") - new /obj/item/weapon/fish/toothless_shark(get_turf(src)) new /obj/item/weapon/shard/shark_teeth(get_turf(src)) qdel(src) @@ -170,7 +167,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/catfish/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) to_chat(user, "You carefully clean and gut \the [src.name].") - new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src)) new /obj/item/weapon/reagent_containers/food/snacks/catfishmeat(get_turf(src)) qdel(src) @@ -190,7 +186,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/salmon/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) to_chat(user, "You carefully clean and gut \the [src.name].") - new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src)) new /obj/item/weapon/reagent_containers/food/snacks/salmonmeat(get_turf(src)) qdel(src) @@ -207,7 +202,6 @@ var/global/list/fish_items_list = list("goldfish" = /obj/item/weapon/fish/goldfi /obj/item/weapon/fish/babycarp/attackby(var/obj/item/O, var/mob/user as mob) if(is_sharp(O)) to_chat(user, "You carefully clean and gut \the [src.name].") - new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(get_turf(src)) //just one fillet; this is a baby, afterall. qdel(src) return diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm index 754d6d80fc6..8fe4bfa746d 100644 --- a/code/modules/fish/fishtank.dm +++ b/code/modules/fish/fishtank.dm @@ -312,7 +312,6 @@ else to_chat(usr, "The eggs disolve in the water. They were duds!") - /obj/machinery/fishtank/proc/select_egg_type() var/fish = pick(fish_list) //Select a fish from the fish in the tank if(prob(25)) //25% chance to be a dud (blank) egg @@ -342,7 +341,6 @@ /obj/machinery/fishtank/proc/harvest_fish(var/mob/user) if(!fish_count) //Can't catch non-existant fish! to_chat(usr, "There are no fish in \the [src] to catch!") - return var/caught_fish @@ -499,7 +497,6 @@ //Finally, report the full examine_message constructed from the above reports to_chat(user, "[examine_message]") - return examine_message ////////////////////////////// @@ -527,7 +524,6 @@ M.health = M.maxHealth //Eating fish heals the predator else to_chat(usr, "There are no fish in [src]!") - else attack_generic(M, M.harm_intent_damage) else if(istype(M, /mob/living/simple_animal/hostile/bear)) @@ -546,7 +542,6 @@ M.health = M.maxHealth //Eating fish heals the predator else to_chat(usr, "There are no fish in [src]!") - else attack_generic(M, M.harm_intent_damage) else @@ -612,16 +607,13 @@ if(W.isOn()) if(cur_health < max_health) to_chat(usr, "You repair some of the cracks on \the [src].") - cur_health += 20 check_health() else to_chat(usr, "There is no damage to fix!") - else if(cur_health < max_health) to_chat(usr, "[W.name] must on to repair this damage.") - else user.changeNext_move(CLICK_CD_MELEE) hit(W.force) @@ -631,7 +623,6 @@ if(istype(O, /obj/item/weapon/reagent_containers/glass)) if(lid_switch) to_chat(usr, "Open the lid on \the [src] first!") - return var/obj/item/weapon/reagent_containers/glass/C = O //Containers with any reagents will get dumped in @@ -650,7 +641,6 @@ else if(water_level == water_capacity) to_chat(usr, "[src] is already full!") - return else message = "The filtration process purifies the water, raising the water level." @@ -667,7 +657,6 @@ else if(water_level == 0) to_chat(usr, "[src] is empty!") - else if(water_level >= C.volume) //Enough to fill the container completely C.reagents.add_reagent("fishwater", C.volume) @@ -683,13 +672,11 @@ if(istype(O, /obj/item/weapon/wrench)) if(water_level == 0) to_chat(usr, "Now disassembling [src].") - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) destroy(1) else to_chat(usr, "[src] must be empty before you disassemble it!") - return //Fish eggs else if(istype(O, /obj/item/fish_eggs)) @@ -697,12 +684,10 @@ //Don't add eggs if there is no water (they kinda need that to live) if(water_level == 0) to_chat(usr, "[src] has no water; [egg.name] won't hatch without water!") - else //Don't add eggs if the tank already has the max number of fish if(fish_count >= max_fish) to_chat(usr, "[src] can't hold any more fish.") - else add_fish(egg.fish_type) qdel(egg) @@ -719,10 +704,8 @@ food_level += 10 else to_chat(usr, "[src] already has plenty of food in it. You decide to not add more.") - else to_chat(usr, "[src] doesn't have any water in it. You should fill it with water first.") - check_food_level() return //Fish egg scoop @@ -741,7 +724,6 @@ if(istype(O, /obj/item/weapon/tank_brush)) if(filth_level == 0) to_chat(usr, "[src] is already spotless!") - else filth_level = 0 user.visible_message("[user.name] scrubs the inside of \the [src], cleaning the filth.", "You scrub the inside of \the [src], cleaning the filth.") diff --git a/code/modules/flufftext/Dreaming.dm b/code/modules/flufftext/Dreaming.dm index 1a04faede2a..3b165750d0b 100644 --- a/code/modules/flufftext/Dreaming.dm +++ b/code/modules/flufftext/Dreaming.dm @@ -21,7 +21,6 @@ mob/living/carbon/proc/dream() var/dream_image = pick(dreams) dreams -= dream_image to_chat(src, "... [dream_image] ...") - sleep(rand(40,70)) if(paralysis <= 0) dreaming = 0 diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 2c57b030ede..69fbd9bc1fc 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -244,12 +244,10 @@ Gunshots/explosions/opening doors/less rare audio (done) if(!xeno) return var/xeno_name = xeno.name to_chat(target, "[xeno_name] begins climbing into the ventilation system...") - sleep(10) if(!xeno) return qdel(xeno) to_chat(target, "[xeno_name] scrambles into the ventilation ducts!") - qdel(src) /obj/effect/hallucination/singularity_scare @@ -298,40 +296,28 @@ Gunshots/explosions/opening doors/less rare audio (done) if(1) //Laser fight for(var/i=0,i[my_target] flails around wildly.", \ "[my_target] has attacked [src]!") @@ -450,7 +435,6 @@ Gunshots/explosions/opening doors/less rare audio (done) for(var/mob/O in oviewers(world.view , my_target)) to_chat(O, "[my_target] stumbles around.") - /obj/effect/fake_attacker/New(loc,var/mob/living/carbon/T) ..() my_target = T @@ -478,7 +462,6 @@ Gunshots/explosions/opening doors/less rare audio (done) to_chat(my_target, currentimage) - /obj/effect/fake_attacker/proc/attack_loop() while(1) sleep(rand(5,10)) @@ -494,7 +477,6 @@ Gunshots/explosions/opening doors/less rare audio (done) src.do_attack_animation(my_target) if(weapon_name) to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))) - my_target.show_message("[src.name] has attacked [my_target] with [weapon_name]!", 1) my_target.staminaloss += 30 if(prob(20)) @@ -504,7 +486,6 @@ Gunshots/explosions/opening doors/less rare audio (done) fake_blood(my_target) else to_chat(my_target, sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))) - my_target.show_message("[src.name] has punched [my_target]!", 1) my_target.staminaloss += 30 if(prob(33)) @@ -523,7 +504,6 @@ Gunshots/explosions/opening doors/less rare audio (done) O.name = "blood" var/image/I = image('icons/effects/blood.dmi',O,"floor[rand(1,7)]",O.dir,1) to_chat(target, I) - spawn(300) qdel(O) return @@ -586,14 +566,12 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite people += H if(person) //Basic talk to_chat(target, target.hear_say(pick(speak_messages),language = pick(person.languages),speaker = person)) - else // Radio talk var/list/humans = list() for(var/mob/living/carbon/human/H in living_mob_list) humans += H person = pick(humans) to_chat(target, target.hear_radio(pick(radio_messages),language = pick(person.languages),speaker = person, part_a = "\[[get_frequency_name(PUB_FREQ)]\] ", part_b = " ")) - qdel(src) /obj/effect/hallucination/message @@ -611,7 +589,6 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite "You hear a strange, alien voice in your head...[pick("Hiss","Ssss")]", \ "You can see...everything!") to_chat(target, chosen) - qdel(src) /mob/living/carbon/proc/hallucinate(var/hal_type) // Todo -> proc / defines @@ -639,50 +616,38 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite if("sounds") //Strange audio // to_chat(src, "Strange Audio") - switch(rand(1,18)) if(1) to_chat(src, 'sound/machines/airlock.ogg') - if(2) if(prob(50)) to_chat(src, 'sound/effects/Explosion1.ogg') else to_chat(src, 'sound/effects/Explosion2.ogg') - if(3) to_chat(src, 'sound/effects/explosionfar.ogg') - if(4) to_chat(src, 'sound/effects/Glassbr1.ogg') - if(5) to_chat(src, 'sound/effects/Glassbr2.ogg') - if(6) to_chat(src, 'sound/effects/Glassbr3.ogg') - if(7) to_chat(src, 'sound/machines/twobeep.ogg') - if(8) to_chat(src, 'sound/machines/windowdoor.ogg') - if(9) //To make it more realistic, I added two gunshots (enough to kill) to_chat(src, 'sound/weapons/Gunshot.ogg') spawn(rand(10,30)) to_chat(src, 'sound/weapons/Gunshot.ogg') - if(10) to_chat(src, 'sound/weapons/smash.ogg') - if(11) //Same as above, but with tasers. to_chat(src, 'sound/weapons/Taser.ogg') spawn(rand(10,30)) to_chat(src, 'sound/weapons/Taser.ogg') - //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source @@ -692,38 +657,29 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') to_chat(src, pick(creepyasssounds)) - if(13) to_chat(src, "You feel a tiny prick!") - if(14) to_chat(src, "

Priority Announcement

") to_chat(src, "

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

") to_chat(src, sound('sound/AI/shuttledock.ogg')) - if(15) to_chat(src, 'sound/items/Welder.ogg') - if(16) to_chat(src, 'sound/items/Screwdriver.ogg') - if(17) to_chat(src, 'sound/weapons/saberon.ogg') - if(18) to_chat(src, 'sound/weapons/saberoff.ogg') - if("hudscrew") //Screwy HUD // to_chat(src, "Screwy HUD") - hal_screwyhud = pick(1,2,3,3,4,4) spawn(rand(100,250)) hal_screwyhud = 0 if("items") //Strange items // to_chat(src, "Traitor Items") - if(!halitem) halitem = new var/list/slots_free = list(ui_lhand,ui_rhand) @@ -770,7 +726,6 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite if("dangerflash") //Flashes of danger // to_chat(src, "Danger Flash") - if(!halimage) var/list/possible_points = list() for(var/turf/simulated/floor/F in view(src,world.view)) @@ -781,15 +736,12 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite switch(rand(1,3)) if(1) // to_chat(src, "Space") - halimage = image('icons/turf/space.dmi',target,"[rand(1,25)]",TURF_LAYER) if(2) // to_chat(src, "Fire") - halimage = image('icons/effects/fire.dmi',target,"1",TURF_LAYER) if(3) // to_chat(src, "C4") - halimage = image('icons/obj/assemblies.dmi',target,"plastic-explosive2",OBJ_LAYER+0.01) diff --git a/code/modules/food/cooker.dm b/code/modules/food/cooker.dm index 05722cd2085..40e04817209 100644 --- a/code/modules/food/cooker.dm +++ b/code/modules/food/cooker.dm @@ -36,12 +36,10 @@ /obj/machinery/cooker/proc/checkValid(obj/item/check, mob/user) if(on) to_chat(user, "[src] is still active!") - return 0 if(istype(check, /obj/item/weapon/reagent_containers/food/snacks)) return 1 to_chat(user, "You can only process food!") - return 0 /obj/machinery/cooker/proc/setIcon(obj/item/copyme, obj/item/copyto) @@ -64,7 +62,6 @@ var/obj/item/weapon/reagent_containers/food/snacks/badrecipe/burnt = new(get_turf(src)) setRegents(props, burnt) to_chat(user, "You smell burning coming from the [src]!") - var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread() // burning things makes smoke! smoke.set_up(5, 0, src) smoke.start() @@ -84,7 +81,6 @@ /obj/machinery/cooker/proc/putIn(obj/item/tocook, mob/chef) icon_state = onicon to_chat(chef, "You put [tocook] into [src].") - on = 1 chef.drop_item() tocook.loc = src @@ -103,7 +99,6 @@ if(istype(I, /obj/item/weapon/reagent_containers/food/snacks)) if(checkCooked(I)) to_chat(user, "That is already [thiscooktype], it would do nothing!") - return putIn(I, user) sleep(cooktime) diff --git a/code/modules/food/customizables.dm b/code/modules/food/customizables.dm index 1631456beec..ff1ff9f6ad5 100644 --- a/code/modules/food/customizables.dm +++ b/code/modules/food/customizables.dm @@ -325,14 +325,11 @@ /obj/item/weapon/reagent_containers/food/snacks/customizable/attackby(obj/item/I, mob/user, params) if(src.contents.len > sandwich_limit) to_chat(user, "If you put anything else in or on [src] it's going to make a mess.") - return if(!istype(I, /obj/item/weapon/reagent_containers/food/snacks)) to_chat(user, "\The [I] isn't exactly something that you would want to eat.") - return to_chat(user, "You add [I] to [src].") - if(istype(I, /obj/item/weapon/reagent_containers/)) var/obj/item/weapon/reagent_containers/F = I F.reagents.trans_to(src, F.reagents.total_volume) @@ -391,7 +388,6 @@ to_chat(user, " You think you can see [whatsinside] in there.") - /* /obj/item/weapon/reagent_containers/food/snacks/customizable/attack(mob/M as mob, mob/user as mob, def_zone) //SNOOOOOOOWFLAAAAAAAAAAAAAAAAAKES @@ -407,7 +403,6 @@ if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable. to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!") - H.adjustBruteLoss(5) //TODO: Target head if human. ..() */ diff --git a/code/modules/food/icecream_vat.dm b/code/modules/food/icecream_vat.dm index 44303927248..6c23d781818 100644 --- a/code/modules/food/icecream_vat.dm +++ b/code/modules/food/icecream_vat.dm @@ -33,16 +33,13 @@ if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(beaker) to_chat(user, "A container is already inside [src].") - return if(!user.drop_item()) to_chat(user, "\The [I] is stuck to you!") - return beaker = I I.forceMove(src) to_chat(user, "You add [I] to [src]") - updateUsrDialog() return if(istype(I, /obj/item/weapon/reagent_containers/food/snacks/icecream)) @@ -57,14 +54,12 @@ to_chat(user, "This [I] already has sprinkles.") - /obj/machinery/icemachine/proc/validexchange(reag) if(reag == "sprinkles" | reag == "cola" | reag == "kahlua" | reag == "dr_gibb" | reag == "vodka" | reag == "space_up" | reag == "rum" | reag == "spacemountainwind" | reag == "gin" | reag == "cream" | reag == "water") return 1 else if(reagents.total_volume < 500) to_chat(usr, "[src] vibrates for a moment, apparently accepting the unknown liquid.") - playsound(loc, 'sound/machines/twobeep.ogg', 10, 1) return 1 diff --git a/code/modules/food/oven.dm b/code/modules/food/oven.dm index 616065f0abc..604adaaf142 100644 --- a/code/modules/food/oven.dm +++ b/code/modules/food/oven.dm @@ -18,7 +18,6 @@ /obj/machinery/cooking/attackby(obj/item/I, mob/user, params) if(on) to_chat(user, "The machine is already running.") - return else var/obj/item/F = I @@ -28,7 +27,6 @@ return else to_chat(user, "You put [F] into [src] for cooking.") - user.drop_item() F.loc = src on = TRUE diff --git a/code/modules/garbage_collection/garbage_collector.dm b/code/modules/garbage_collection/garbage_collector.dm index f7ea60a7db7..aa8933c42de 100644 --- a/code/modules/garbage_collection/garbage_collector.dm +++ b/code/modules/garbage_collection/garbage_collector.dm @@ -143,7 +143,6 @@ var/global/datum/controller/process/garbage_collector/garbageCollector garbageCollector.addTrash(D) else // to_chat(world, "WARNING GC DID NOT GET A RETURN VALUE FOR [D], [D.type]!") - garbageCollector.addTrash(D) diff --git a/code/modules/garbage_collection/gc_testing.dm b/code/modules/garbage_collection/gc_testing.dm index 2d2a3801759..25fc4bef495 100644 --- a/code/modules/garbage_collection/gc_testing.dm +++ b/code/modules/garbage_collection/gc_testing.dm @@ -10,7 +10,6 @@ garbageCollector.del_everything = !garbageCollector.del_everything // to_chat(world, "GC: qdel turned [garbageCollector.del_everything ? "off" : "on"].") - log_admin("[key_name(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].") message_admins("\blue [key_name_admin(usr)] turned qdel [garbageCollector.del_everything ? "off" : "on"].", 1) @@ -46,15 +45,12 @@ if(!gc_hard_del_types || !gc_hard_del_types.len) to_chat(usr, "No hard del()'d types found.") - return to_chat(usr, "Types hard del()'d by the GC:") - for(var/A in gc_hard_del_types) to_chat(usr, "[A]") - // Profiling stuff var/global/del_profiling = 0 var/global/list/dels_profiled = list() diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm index 5f13c6d9aa6..db82a5227e6 100644 --- a/code/modules/holiday/holiday.dm +++ b/code/modules/holiday/holiday.dm @@ -318,7 +318,6 @@ begin_month-- //begins in march, ends in april // to_chat(world, "Easter calculates to be on [begin_day] of [begin_month] ([days_early] early) to [end_day] of [end_month] ([days_extra] extra) for 20[yy]") - return ..() diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 94e5ea0c8f5..a025e32f872 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -29,7 +29,6 @@ sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") - qdel(src) return @@ -85,7 +84,6 @@ sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") - qdel(src) return @@ -185,7 +183,6 @@ M.stop_pulling() to_chat(M, "You slipped on the [name]!") - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) M.Stun(8) M.Weaken(5) @@ -206,7 +203,6 @@ if(C.use(5)) //TODO: generalize this. to_chat(user, "You add some cable to the [src.name] and slide it inside the battery casing.") - var/obj/item/weapon/stock_parts/cell/potato/pocell = new /obj/item/weapon/stock_parts/cell/potato(get_turf(user)) if(src.loc == user && !(user.l_hand && user.r_hand) && istype(user,/mob/living/carbon/human)) user.put_in_hands(pocell) @@ -224,7 +220,6 @@ return else if(seed.kitchen_tag == "potato") to_chat(user, "You slice \the [src] into sticks.") - reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/rawsticks(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) @@ -232,7 +227,6 @@ return else if(seed.kitchen_tag == "carrot") to_chat(user, "You slice \the [src] into sticks.") - reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) @@ -240,7 +234,6 @@ return else if(seed.kitchen_tag == "watermelon") to_chat(user, "You slice \the [src] into large slices.") - reagents_per_slice = reagents.total_volume/5 for(var/i=0,i<5,i++) slice = new /obj/item/weapon/reagent_containers/food/snacks/watermelonslice(get_turf(src)) @@ -249,7 +242,6 @@ return else if(seed.kitchen_tag == "soybeans") to_chat(user, "You roughly chop up \the [src].") - reagents_per_slice = reagents.total_volume slice = new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src)) reagents.trans_to(slice, reagents_per_slice) @@ -268,7 +260,6 @@ continue G.attackby(NG, user) to_chat(user, "You add the newly-formed wood to the stack. It now contains [NG.amount] planks.") - qdel(src) return else if(istype(W, /obj/item/weapon/rollingpaper)) @@ -293,12 +284,10 @@ qdel(W) user.put_in_active_hand(J) to_chat(user, "\blue You roll the [src] into a rolling paper.") - qdel(src) else to_chat(user, "\red You can't roll a smokable from the [src].") - ..() /obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone) @@ -359,13 +348,11 @@ if(reagents && reagents.total_volume <= 0) //used-up fruit will be destroyed if(user) to_chat(user, "\The [src] has dried out and crumbles to dust.") - //user.drop_from_inventory(src) qdel(src) else if(prob(35)) //fruit that still has reagents has a chance of breaking each time it stings on hit if(user) to_chat(user, "\The [src] has fallen to bits.") - //user.drop_from_inventory(src) qdel(src) @@ -392,7 +379,6 @@ if(user.a_intent == I_DISARM && seed.get_trait(TRAIT_SPREAD) > 0) //Using disarm so we can tell if you want to plant or convert non-final plants to_chat(user, "You plant the [src.name].") - new /obj/machinery/portable_atmospherics/hydroponics/soil/invisible(get_turf(user),src.seed) new /obj/effect/plant(get_turf(user), src.seed) qdel(src) @@ -405,14 +391,12 @@ var/obj/item/stack/medical/bruise_pack/comfrey/poultice = new /obj/item/stack/medical/bruise_pack/comfrey(user.loc) poultice.heal_brute = potency to_chat(user, "You mash the leaves into a poultice.") - qdel(src) return if("aloe") var/obj/item/stack/medical/ointment/aloe/poultice = new /obj/item/stack/medical/ointment/aloe(user.loc) poultice.heal_burn = potency to_chat(user, "You mash the petals into a poultice.") - qdel(src) return if("grass") @@ -427,7 +411,6 @@ continue NG.attackby(G, user) to_chat(user, "You add the newly-formed grass to the stack. It now contains [G.amount] tiles.") - qdel(src) return if("sunflower") @@ -442,7 +425,6 @@ user.say("PRAISE THE SUN!") else to_chat(user, "PRAISE THE SUN!") - user.unEquip(src) user.put_in_hands(NF) qdel(src) @@ -451,7 +433,6 @@ var/obj/item/weapon/grown/nettle/nettle = new /obj/item/weapon/grown/nettle(user.loc) nettle.force = round((5 + potency / 5), 1) to_chat(user, "You straighten up the plant.") - user.unEquip(src) user.put_in_hands(nettle) qdel(src) @@ -460,51 +441,40 @@ var/obj/item/weapon/grown/nettle/death/DN = new /obj/item/weapon/grown/nettle/death(user.loc) DN.force = round((5 + potency / 2.5), 1) to_chat(user, "You straighten up the plant.") - user.unEquip(src) user.put_in_hands(DN) qdel(src) return if("cashpod") to_chat(user, "You crack open the cash pod...") - var/value = round(seed.get_trait(TRAIT_POTENCY)) user.unEquip(src) switch(value) if(0) to_chat(user, "It's empty! What a waste...") - if(1 to 10) to_chat(user, "It has a space dollar inside. Woo.") - new /obj/item/weapon/spacecash(get_turf(user)) if(11 to 20) to_chat(user, "It has 10 space dollars inside!") - new /obj/item/weapon/spacecash/c10(get_turf(user)) if(21 to 30) to_chat(user, "It has 20 space dollars inside! Cool!") - new /obj/item/weapon/spacecash/c20(get_turf(user)) if(31 to 40) to_chat(user, "It has 50 space dollars inside! Nice!") - new /obj/item/weapon/spacecash/c50(get_turf(user)) if(41 to 50) to_chat(user, "It has 100 space dollars inside! Sweet!") - new /obj/item/weapon/spacecash/c100(get_turf(user)) if(51 to 60) to_chat(user, "It has 200 space dollars inside! Awesome!") - new /obj/item/weapon/spacecash/c200(get_turf(user)) if(61 to 80) to_chat(user, "It has 500 space dollars inside! CHA-CHING!") - new /obj/item/weapon/spacecash/c500(get_turf(user)) else to_chat(user, "It has 1000 space dollars inside! JACKPOT!") - new /obj/item/weapon/spacecash/c1000(get_turf(user)) qdel(src) return @@ -538,5 +508,4 @@ batteries_recharged = 1 if(batteries_recharged) to_chat(usr, "Battery has recovered.") - ..() \ No newline at end of file diff --git a/code/modules/hydroponics/grown_inedible.dm b/code/modules/hydroponics/grown_inedible.dm index 3592e5091d5..fd9405cc6bf 100644 --- a/code/modules/hydroponics/grown_inedible.dm +++ b/code/modules/hydroponics/grown_inedible.dm @@ -66,7 +66,6 @@ else C.take_organ_damage(0,force) to_chat(C, "The nettle burns your bare hand!") - return 1 /obj/item/weapon/grown/nettle/afterattack(atom/A as mob|obj, mob/user,proximity) @@ -75,7 +74,6 @@ force -= rand(1, (force / 3) + 1) // When you whack someone with it, leaves fall off else to_chat(usr, "All the leaves have fallen off the nettle from violent whacking.") - usr.unEquip(src) qdel(src) @@ -94,11 +92,9 @@ user.Paralyse(5) to_chat(user, "You are stunned by the Deathnettle when you try picking it up!") - /obj/item/weapon/grown/nettle/death/afterattack(mob/living/carbon/M, mob/user) if(istype(M, /mob/living)) to_chat(M, "You are stunned by the powerful acid of the Deathnettle!") - add_logs(M, user, "attacked", src) M.eye_blurry += force/7 @@ -123,7 +119,6 @@ ..() if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/knife)) to_chat(user, "You use [W] to fashion a pipe out of the corn cob!") - new /obj/item/clothing/mask/cigarette/pipe/cobpipe (user.loc) qdel(src) return @@ -155,11 +150,9 @@ /obj/item/weapon/grown/sunflower/attack(mob/M as mob, mob/user as mob) to_chat(M, " [user] smacks you with a [name]!FLOWER POWER") - to_chat(user, " Your [name]'s FLOWER POWER strikes [M]") - // Novaflower /obj/item/weapon/grown/novaflower @@ -175,16 +168,12 @@ /obj/item/weapon/grown/novaflower/attack(mob/living/carbon/M as mob, mob/user as mob) to_chat(M, "[user] smacks you with a [name]!FLOWER POWER") - to_chat(user, " Your [name]'s FLOWER POWER strikes [M]") - if(istype(M, /mob/living)) to_chat(M, "You are heated by the warmth of the of the [name]!") - M.bodytemperature += potency/2 * TEMPERATURE_DAMAGE_COEFFICIENT /obj/item/weapon/grown/novaflower/pickup(mob/living/carbon/human/user as mob) if(!user.gloves) to_chat(user, "The [name] burns your bare hand!") - user.adjustFireLoss(rand(1,5)) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 46945d792f6..7f7addca012 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -121,18 +121,14 @@ if(get_trait(TRAIT_CARNIVOROUS) == 2) if(affecting) to_chat(target, "\The [fruit]'s thorns pierce your [affecting.name] greedily!") - else to_chat(target, "\The [fruit]'s thorns pierce your flesh greedily!") - damage = get_trait(TRAIT_POTENCY)/2 else if(affecting) to_chat(target, "\The [fruit]'s thorns dig deeply into your [affecting.name]!") - else to_chat(target, "\The [fruit]'s thorns dig deeply into your flesh!") - damage = get_trait(TRAIT_POTENCY)/5 else return @@ -192,7 +188,6 @@ return to_chat(target, "You are stung by \the [fruit]!") - for(var/rid in chems) var/injecting = min(5,max(1,get_trait(TRAIT_POTENCY)/5)) target.reagents.add_reagent(rid,injecting) @@ -720,12 +715,10 @@ if(!force_amount && get_trait(TRAIT_YIELD) == 0 && !harvest_sample) if(istype(user)) to_chat(user, "You fail to harvest anything useful.") - else if(istype(user)) to_chat(user, "You [harvest_sample ? "take a sample" : "harvest"] from the [display_name].") - //This may be a new line. Update the global if it is. if(name == "new line" || !(name in plant_controller.seeds)) uid = plant_controller.seeds.len + 1 diff --git a/code/modules/hydroponics/seed_controller.dm b/code/modules/hydroponics/seed_controller.dm index 211a738f57d..5ba2b4dcfb3 100644 --- a/code/modules/hydroponics/seed_controller.dm +++ b/code/modules/hydroponics/seed_controller.dm @@ -14,13 +14,11 @@ if(!plant_controller || !plant_controller.gene_tag_list) to_chat(usr, "Gene tags not set.") - return for(var/gene_tag in plant_controller.gene_tag_list) to_chat(usr, "[gene_tag]") - var/global/datum/controller/plants/plant_controller // Set in New(). /datum/controller/plants @@ -148,7 +146,5 @@ var/global/datum/controller/plants/plant_controller // Set in New(). if(!plant_controller || !plant_controller.plant_sprites || !plant_controller.plant_sprites.len) to_chat(world, "Cannot list plant sprites, plant controller or plant sprites list may not be initialized.") - for(var/base in plant_controller.plant_sprites) to_chat(world, "[base] : [plant_controller.plant_sprites[base]] growth states") - diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 0fafc331621..6e94201c75c 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -18,7 +18,6 @@ var/choice = alert(user, "Are you sure you want to wipe the disk?", "Xenobotany Data", "No", "Yes") if(src && user && genes && choice && choice == "Yes" && user.Adjacent(get_turf(src))) to_chat(user, "You wipe the disk data.") - name = initial(name) desc = initial(name) genes = list() @@ -84,24 +83,20 @@ if(istype(W,/obj/item/seeds)) if(seed) to_chat(user, "There is already a seed loaded.") - return var/obj/item/seeds/S =W if(S.seed && S.seed.get_trait(TRAIT_IMMUTABLE) > 0) to_chat(user, "That seed is not compatible with our genetics technology.") - else user.drop_item(W) W.loc = src seed = W to_chat(user, "You load [W] into [src].") - return if(istype(W,/obj/item/weapon/screwdriver)) open = !open to_chat(user, "You [open ? "open" : "close"] the maintenance panel.") - return if(open) @@ -112,7 +107,6 @@ if(istype(W,/obj/item/weapon/disk/botany)) if(loaded_disk) to_chat(user, "There is already a data disk loaded.") - return else var/obj/item/weapon/disk/botany/B = W @@ -120,12 +114,10 @@ if(B.genes && B.genes.len) if(!disk_needs_genes) to_chat(user, "That disk already has gene data loaded.") - return else if(disk_needs_genes) to_chat(user, "That disk does not have any gene data loaded.") - return user.drop_item(W) @@ -133,7 +125,6 @@ loaded_disk = W to_chat(user, "You load [W] into [src].") - return ..() diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm index 728a67e34e2..dee87d848d3 100644 --- a/code/modules/hydroponics/seed_packets.dm +++ b/code/modules/hydroponics/seed_packets.dm @@ -64,7 +64,6 @@ var/global/list/plant_seed_sprites = list() if(seed && !seed.roundstart) to_chat(user, "It's tagged as variety #[seed.uid].") - /obj/item/seeds/cutting name = "cuttings" desc = "Some plant cuttings." diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 4032d9b0ff4..fe905595677 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -216,14 +216,12 @@ user.visible_message("[user] puts the seeds from \the [O.name] into \the [src].", "You put the seeds from \the [O.name] into \the [src].") else to_chat(user, "There are no seeds in \the [O.name].") - return else if(istype(O, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - /obj/machinery/seed_storage/proc/add(var/obj/item/seeds/O as obj) if (istype(O.loc, /mob)) var/mob/user = O.loc diff --git a/code/modules/hydroponics/spreading/spreading.dm b/code/modules/hydroponics/spreading/spreading.dm index cdbf594abdb..c26d5b98bad 100644 --- a/code/modules/hydroponics/spreading/spreading.dm +++ b/code/modules/hydroponics/spreading/spreading.dm @@ -93,7 +93,6 @@ sleep(250) // ugly hack, should mean roundstart plants are fine. if(!plant_controller) to_chat(world, "Plant controller does not exist and [src] requires it. Aborting.") - qdel(src) return @@ -245,7 +244,6 @@ if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) if(!seed) to_chat(user, "There is nothing to take a sample from.") - return seed.harvest(user,0,1) health -= (rand(3,5)*10) diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index ec264a71115..5de1ba34473 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -53,6 +53,5 @@ //entangling people if(victim.loc == src.loc) to_chat(victim, "Tendrils [pick("wind", "tangle", "tighten")] around you!") - can_buckle = 1 buckle_mob(victim) \ No newline at end of file diff --git a/code/modules/hydroponics/trays/tray.dm b/code/modules/hydroponics/trays/tray.dm index 58ba48a6aaa..d394fcefea8 100644 --- a/code/modules/hydroponics/trays/tray.dm +++ b/code/modules/hydroponics/trays/tray.dm @@ -165,7 +165,6 @@ if(closed_system) if(user) to_chat(user, "You can't harvest from the plant while the lid is shut.") - return if(user) @@ -199,7 +198,6 @@ if(closed_system) to_chat(user, "You can't remove the dead plant while the lid is shut.") - return seed = null @@ -212,7 +210,6 @@ mutation_mod = 0 to_chat(user, "You remove the dead plant.") - check_health() return @@ -341,12 +338,10 @@ if(labelled) to_chat(usr, "You remove the label.") - labelled = null update_icon() else to_chat(usr, "There is no label to remove.") - return /obj/machinery/portable_atmospherics/hydroponics/verb/setlight() @@ -359,7 +354,6 @@ tray_light = new_light to_chat(usr, "You set the tray to a light level of [tray_light] lumens.") - /obj/machinery/portable_atmospherics/hydroponics/proc/check_level_sanity() //Make sure various values are sane. if(seed) @@ -406,7 +400,6 @@ if(istype(O, /obj/item/weapon/crowbar)) if(anchored==2) to_chat(user, "Unscrew the hoses first!") - return default_deconstruction_crowbar(O, 1) @@ -419,13 +412,11 @@ //Check if container is empty if(!C.reagents.total_volume) to_chat(user, "\red [C] is empty.") - return //Container not empty, transfer contents to tray var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this) to_chat(user, "\blue You transfer [trans] units of the solution to [src].") - check_level_sanity() process_reagents() update_icon() @@ -438,7 +429,6 @@ pestlevel -= P.pest_kill_str weedlevel -= P.weed_kill_str to_chat(user, "You spray [src] with [O].") - playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -452,7 +442,6 @@ toxins += W.toxicity weedlevel -= W.weed_kill_str to_chat(user, "You spray [src] with [O].") - playsound(loc, 'sound/effects/spray3.ogg', 50, 1, -6) qdel(O) @@ -466,7 +455,6 @@ if(seed) if(!S.reagents.total_volume) to_chat(user, "\red [S] is empty.") - return //Container not empty, transfer contents to tray S.reagents.trans_to(src, S.amount_per_transfer_from_this) @@ -477,21 +465,18 @@ else to_chat(user, "There's nothing in [src] to spray!") - else if(istype(O, /obj/item/weapon/screwdriver) && unwrenchable) //THIS NEED TO BE DONE DIFFERENTLY, SOMEONE REFACTOR THE TRAY CODE ALREADY if(anchored) if(anchored == 2) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 1 to_chat(user, "You unscrew the [src]'s hoses.") - panel_open = 0 else if(anchored == 1) playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) anchored = 2 to_chat(user, "You screw in the [src]'s hoses.") - panel_open = 1 for(var/obj/machinery/portable_atmospherics/hydroponics/h in range(1,src)) @@ -502,17 +487,14 @@ if(!seed) to_chat(user, "There is nothing to take a sample from in \the [src].") - return if(sampled) to_chat(user, "You have already sampled from this plant.") - return if(dead) to_chat(user, "The plant is dead.") - return // Create a sample. @@ -538,16 +520,13 @@ return ..() else to_chat(user, "There's no plant to inject.") - return 1 else if(seed) //Leaving this in in case we want to extract from plants later. to_chat(user, "You can't get any extract out of this plant.") - else to_chat(user, "There's nothing to draw something from.") - return 1 else if (istype(O, /obj/item/seeds)) @@ -559,12 +538,10 @@ if(!S.seed) to_chat(user, "The packet seems to be empty. You throw it away.") - qdel(O) return to_chat(user, "You plant the [S.seed.seed_name] [S.seed.seed_noun].") - seed = S.seed //Grab the seed datum. dead = 0 age = 1 @@ -580,7 +557,6 @@ else to_chat(user, "\The [src] already has seeds in it!") - else if (istype(O, /obj/item/weapon/minihoe)) // The minihoe if(weedlevel > 0) @@ -590,7 +566,6 @@ else to_chat(user, "This plot is completely devoid of weeds. It doesn't need uprooting.") - else if (istype(O, /obj/item/weapon/storage/bag/plants)) attack_hand(user) @@ -611,12 +586,10 @@ anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - else if(istype(O, /obj/item/apiary)) if(seed) to_chat(user, "[src] is already occupied!") - else user.drop_item() qdel(O) @@ -629,7 +602,6 @@ else if ((istype(O, /obj/item/weapon/tank) && !( src.destroyed ))) if (src.holding) to_chat(user, "\blue There is alreadu a tank loaded into the [src].") - return var/obj/item/weapon/tank/T = O user.drop_item() @@ -665,34 +637,26 @@ if(!seed) to_chat(user, "[src] is empty.") - return to_chat(user, "[seed.display_name] are growing here.") - if(!Adjacent(user)) return to_chat(user, "Water: [round(waterlevel,0.1)]/[maxwater]") - to_chat(user, "Nutrient: [round(nutrilevel,0.1)]/[maxnutri]") - if(weedlevel >= 5) to_chat(user, "\The [src] is infested with weeds!") - if(pestlevel >= 5) to_chat(user, "\The [src] is infested with tiny worms!") - if(dead) to_chat(user, "The plant is dead.") - else if(health <= (seed.get_trait(TRAIT_ENDURANCE)/ 2)) to_chat(user, "The plant looks unhealthy.") - if(mechanical) var/turf/T = loc var/datum/gas_mixture/environment @@ -721,7 +685,6 @@ to_chat(user, "The tray's sensor suite is reporting [light_string] and a temperature of [environment.temperature]K.") - /obj/machinery/portable_atmospherics/hydroponics/verb/close_lid_verb() set name = "Toggle Tray Lid" set category = "Object" @@ -734,7 +697,6 @@ closed_system = !closed_system to_chat(user, "You [closed_system ? "close" : "open"] the tray's lid.") - update_icon() /obj/machinery/portable_atmospherics/hydroponics/verb/eject_tank_verb() @@ -750,9 +712,7 @@ if(!holding) to_chat(usr, "\red There is no tank loaded into [src] to eject.") - if(istype(holding, /obj/item/weapon/tank)) to_chat(usr, "\blue You eject [holding.name] from [src].") - holding.loc = loc holding = null \ No newline at end of file diff --git a/code/modules/hydroponics/trays/tray_apiary.dm b/code/modules/hydroponics/trays/tray_apiary.dm index 836952ed88d..25a2698d274 100644 --- a/code/modules/hydroponics/trays/tray_apiary.dm +++ b/code/modules/hydroponics/trays/tray_apiary.dm @@ -36,11 +36,9 @@ if(!yieldmod) yieldmod += 1 // to_chat(world, "Yield increased by 1, from 0, to a total of [myseed.yield]") - else if (prob(1/(yieldmod * yieldmod) *100))//This formula gives you diminishing returns based on yield. 100% with 1 yield, decreasing to 25%, 11%, 6, 4, 2... yieldmod += 1 // to_chat(world, "Yield increased by 1, to a total of [myseed.yield]") - else ..() return @@ -49,14 +47,12 @@ if(istype(O, /obj/item/queen_bee)) if(health > 0) to_chat(user, "\red There is already a queen in there.") - else health = 10 nutrilevel += 10 user.drop_item() qdel(O) to_chat(user, "\blue You carefully insert the queen into [src], she gets busy making a hive.") - bees_in_hive = 0 else if(istype(O, /obj/item/beezeez)) beezeez += 100 @@ -64,53 +60,42 @@ user.drop_item() if(health > 0) to_chat(user, "\blue You insert [O] into [src]. A relaxed humming appears to pick up.") - else to_chat(user, "\blue You insert [O] into [src]. Now it just needs some bees.") - qdel(O) else if(istype(O, /obj/item/weapon/minihoe)) if(health > 0) to_chat(user, "\red You begin to dislodge the apiary from the tray, the bees don't like that.") - angry_swarm(user) else to_chat(user, "\blue You begin to dislodge the dead apiary from the tray.") - if(do_after(user, 50, target = src)) new hydrotray_type(src.loc) new /obj/item/apiary(src.loc) to_chat(user, "\red You dislodge the apiary from the tray.") - qdel(src) else if(istype(O, /obj/item/weapon/bee_net)) var/obj/item/weapon/bee_net/N = O if(N.caught_bees > 0) to_chat(user, "\blue You empty the bees into the apiary.") - bees_in_hive += N.caught_bees N.caught_bees = 0 else to_chat(user, "\blue There are no more bees in the net.") - else if(istype(O, /obj/item/weapon/reagent_containers/glass)) var/obj/item/weapon/reagent_containers/glass/G = O if(harvestable_honey > 0) if(health > 0) to_chat(user, "\red You begin to harvest the honey. The bees don't seem to like it.") - angry_swarm(user) else to_chat(user, "\blue You begin to harvest the honey.") - if(do_after(user,50, target = src)) G.reagents.add_reagent("honey",harvestable_honey) harvestable_honey = 0 to_chat(user, "\blue You successfully harvest the honey.") - else to_chat(user, "\blue There is no honey left to harvest.") - else angry_swarm(user) ..() @@ -252,5 +237,4 @@ H.reagents.add_reagent("toxin", toxic) to_chat(usr, "\blue You harvest the honeycomb from the hive. There is a wild buzzing!") - angry_swarm(usr) diff --git a/code/modules/hydroponics/trays/tray_tools.dm b/code/modules/hydroponics/trays/tray_tools.dm index bb4bde2da23..b4c4c5c4543 100644 --- a/code/modules/hydroponics/trays/tray_tools.dm +++ b/code/modules/hydroponics/trays/tray_tools.dm @@ -30,7 +30,6 @@ /obj/item/device/analyzer/plant_analyzer/proc/print_report(var/mob/living/user) if(!last_data) to_chat(user, "There is no scan data to print.") - return playsound(loc, "sound/goonstation/machines/printer_thermal.ogg", 50, 1) var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(get_turf(src)) @@ -101,7 +100,6 @@ if(!grown_seed) to_chat(user, "[src] can tell you nothing about \the [target].") - return form_title = "[grown_seed.seed_name] (#[grown_seed.uid])" @@ -347,7 +345,6 @@ extend = !extend if(extend) to_chat(user, "With a flick of the wrist, you extend the scythe. It's reaping time!") - icon_state = "tscythe1" item_state = "scythe0" slot_flags &= ~SLOT_BELT @@ -359,7 +356,6 @@ playsound(src.loc, 'sound/weapons/blade_unsheath.ogg', 50, 1) //Sound credit to Qat of Freesound.org else to_chat(user, "You collapse the scythe, folding it for easy storage.") - icon_state = "tscythe0" item_state = "tscythe0" //no sprite in other words slot_flags |= SLOT_BELT diff --git a/code/modules/hydroponics/trays/tray_update_icons.dm b/code/modules/hydroponics/trays/tray_update_icons.dm index 746c0eba6f2..aac0822a283 100644 --- a/code/modules/hydroponics/trays/tray_update_icons.dm +++ b/code/modules/hydroponics/trays/tray_update_icons.dm @@ -31,7 +31,6 @@ seed.update_growth_stages() if(!seed.growth_stages) to_chat(world, "Seed type [seed.get_trait(TRAIT_PLANT_ICON)] cannot find a growth stage value.") - return var/overlay_stage = 1 if(age >= seed.get_trait(TRAIT_MATURATION)) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index f3ac43660bc..12dedc60fba 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -55,12 +55,10 @@ var/list/karma_spenders = list() if(!ticker || !player_list.len) to_chat(usr, "\red You can't award karma until the game has started.") - return if(ticker.current_state == GAME_STATE_PREGAME) to_chat(usr, "\red You can't award karma until the game has started.") - return var/list/karma_list = list("Cancel") @@ -71,7 +69,6 @@ var/list/karma_spenders = list() if(!karma_list.len || karma_list.len == 1) to_chat(usr, "\red There's no-one to spend your karma on.") - return var/pickedmob = input("Who would you like to award Karma to?", "Award Karma", "Cancel") as null|mob in karma_list @@ -81,7 +78,6 @@ var/list/karma_spenders = list() if(!istype(pickedmob, /mob)) to_chat(usr, "\red That's not a mob.") - return spend_karma(pickedmob) @@ -93,45 +89,36 @@ var/list/karma_spenders = list() if(!M) to_chat(usr, "Please right click a mob to award karma directly, or use the 'Award Karma' verb to select a player from the player listing.") - return if(!istype(M, /mob)) to_chat(usr, "\red That's not a mob.") - return if(!M.client) to_chat(usr, "\red That mob has no client connected at the moment.") - return if(src.client.karma_spent) to_chat(usr, "\red You've already spent your karma for the round.") - return for(var/a in karma_spenders) if(a == src.key) to_chat(usr, "\red You've already spent your karma for the round.") - return if(M.key == src.key) to_chat(usr, "\red You can't spend karma on yourself!") - return if(M.client.address == src.client.address) message_admins("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!") log_game("\red Illegal karma spending detected from [src.key] to [M.key]. Using the same IP!") to_chat(usr, "\red The karma system is not available to multi-accounters.") - var/choice = input("Give [M.name] good karma?", "Karma") in list("Good", "Cancel") if(!choice || choice == "Cancel") return if(choice == "Good" && !(src.client.karma_spent)) if(src.client.karma_spent) to_chat(usr, "\red You've already spent your karma for the round.") - return M.client.karma += 1 to_chat(usr, "[choice] karma spent on [M.name].") - src.client.karma_spent = 1 karma_spenders.Add(src.key) if(M.client.karma <= -2 || M.client.karma >= 2) @@ -154,14 +141,12 @@ var/list/karma_spenders = list() var/currentkarma=verify_karma() to_chat(usr, {"
You have [currentkarma] available."}) - return /client/proc/verify_karma() var/currentkarma=0 if(!dbcon.IsConnected()) to_chat(usr, "\red Unable to connect to karma database. Please try again later.
") - return else var/DBQuery/query = dbcon.NewQuery("SELECT karma, karmaspent FROM [format_table_name("karmatotals")] WHERE byondkey='[src.key]'") @@ -175,11 +160,9 @@ var/list/karma_spenders = list() currentkarma = (text2num(totalkarma) - text2num(karmaspent)) /* if(totalkarma) to_chat(usr, {"
You have [currentkarma] available.
) - You've gained [totalkarma] total karma in your time here.
"} else to_chat(usr, "Your total karma is: 0
")*/ - return currentkarma /client/verb/karmashop() @@ -283,7 +266,6 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have unlocked [job].") - message_admins("[key_name(usr)] has unlocked [job].") karmacharge(cost) @@ -300,12 +282,10 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have unlocked [job].") - message_admins("[key_name(usr)] has unlocked [job].") karmacharge(cost) else to_chat(usr, "You already have this job unlocked!") - return /client/proc/DB_species_unlock(var/species,var/cost) @@ -326,7 +306,6 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have unlocked [species].") - message_admins("[key_name(usr)] has unlocked [species].") karmacharge(cost) @@ -343,12 +322,10 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have unlocked [species].") - message_admins("[key_name(usr)] has unlocked [species].") karmacharge(cost) else to_chat(usr, "You already have this species unlocked!") - return /client/proc/karmacharge(var/cost,var/refund = 0) @@ -369,7 +346,6 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have been [refund ? "refunded" : "charged"] [cost] karma.") - message_admins("[key_name(usr)] has been [refund ? "refunded" : "charged"] [cost] karma.") return @@ -396,7 +372,6 @@ You've gained [totalkarma] total karma in your time here.
"} cost = 10 else to_chat(usr, "\red That job is not refundable.") - return var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'") @@ -419,7 +394,6 @@ You've gained [totalkarma] total karma in your time here.
"} else to_chat(usr, "\red Type [type] is not a valid column.") - if(name in typelist) typelist -= name var/newtypelist = jointext(typelist,",") @@ -431,17 +405,14 @@ You've gained [totalkarma] total karma in your time here.
"} return else to_chat(usr, "You have been refunded [cost] karma for [type] [name].") - message_admins("[key_name(usr)] has been refunded [cost] karma for [type] [name].") karmacharge(text2num(cost),1) else to_chat(usr, "\red You have not bought [name].") - else to_chat(usr, "\red Your ckey ([dbckey]) was not found.") - /client/proc/checkpurchased(var/name = null) // If the first parameter is null, return a full list of purchases var/DBQuery/query = dbcon.NewQuery("SELECT * FROM [format_table_name("whitelist")] WHERE ckey='[usr.key]'") query.Execute() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 64384fb7dcb..498b7b62a37 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -33,7 +33,6 @@ update_icon() else if(istype(O, /obj/item/weapon/wrench)) to_chat(user, "\blue Now disassembling bookcase") - playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user,50, target = src)) new /obj/item/stack/sheet/wood(get_turf(src)) @@ -162,13 +161,11 @@ if(carved) if(store) to_chat(user, "[store] falls out of [title]!") - store.loc = get_turf(src.loc) store = null return else to_chat(user, "The pages of [title] have been cut out!") - return if(src.dat) user << browse("Penned by [author].
" + "[dat]", "window=book") @@ -177,7 +174,6 @@ else to_chat(user, "This book is completely blank!") - /obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(carved) if(!store) @@ -186,20 +182,16 @@ W.loc = src store = W to_chat(user, "You put [W] in [title].") - return else to_chat(user, "[W] won't fit in [title].") - return else to_chat(user, "There's already something in [title]!") - return if(istype(W, /obj/item/weapon/pen)) if(unique) to_chat(user, "These pages don't seem to take the ink well. Looks like you can't modify it.") - return var/choice = input("What would you like to change?") in list("Title", "Contents", "Author", "Cancel") switch(choice) @@ -207,7 +199,6 @@ var/newtitle = reject_bad_text(stripped_input(usr, "Write a new title:")) if(!newtitle) to_chat(usr, "The title is invalid.") - return else src.name = newtitle @@ -216,7 +207,6 @@ var/content = strip_html(input(usr, "Write your book's contents (HTML NOT allowed):"),8192) as message|null if(!content) to_chat(usr, "The content is invalid.") - return else src.dat += content @@ -224,7 +214,6 @@ var/newauthor = stripped_input(usr, "Write the author's name:") if(!newauthor) to_chat(usr, "The name is invalid.") - return else src.author = newauthor @@ -234,45 +223,36 @@ var/obj/item/weapon/barcodescanner/scanner = W if(!scanner.computer) to_chat(user, "[W]'s screen flashes: 'No associated computer found!'") - else switch(scanner.mode) if(0) scanner.book = src to_chat(user, "[W]'s screen flashes: 'Book stored in buffer.'") - if(1) scanner.book = src scanner.computer.buffer_book = src.name to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book title stored in associated computer buffer.'") - if(2) scanner.book = src for(var/datum/borrowbook/b in scanner.computer.checkouts) if(b.bookname == src.name) scanner.computer.checkouts.Remove(b) to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Book has been checked in.'") - return to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. No active check-out record found for current title.'") - if(3) scanner.book = src for(var/obj/item/weapon/book in scanner.computer.inventory) if(book == src) to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title already present in inventory, aborting to avoid duplicate entry.'") - return scanner.computer.inventory.Add(src) to_chat(user, "[W]'s screen flashes: 'Book stored in buffer. Title added to general inventory.'") - else if(istype(W, /obj/item/weapon/kitchen/knife) || istype(W, /obj/item/weapon/wirecutters)) if(carved) return to_chat(user, "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.") - carved = 1 return else @@ -298,7 +278,6 @@ if(mode > 3) mode = 0 to_chat(user, "[src] Status Display:") - var/modedesc switch(mode) if(0) @@ -312,12 +291,8 @@ else modedesc = "ERROR" to_chat(user, " - Mode [mode] : [modedesc]") - if(src.computer) to_chat(user, "Computer has been associated with this unit.") - else to_chat(user, "No associated computer found. Only local scans will function properly.") - to_chat(user, "\n") - diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index c65c82445e0..57f1b85b227 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -148,7 +148,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f if(src.arcanecheckout) new /obj/item/weapon/tome(src.loc) 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 dusty old tome sitting on the desk. You don't really remember printing it.") - user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2) src.arcanecheckout = 0 if(1) @@ -246,7 +245,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f var/obj/item/weapon/barcodescanner/scanner = W scanner.computer = src to_chat(user, "[scanner]'s associated machine has been set to [src].") - for (var/mob/V in hearers(src)) V.show_message("[src] lets out a low, short blip.", 2) else @@ -484,7 +482,6 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f set category = "Admin" if(!src.holder) to_chat(src, "Only administrators may use this command.") - return var/isbn = input("ISBN number?", "Delete Book") as num | null diff --git a/code/modules/media/broadcast/receivers/radio.dm b/code/modules/media/broadcast/receivers/radio.dm index 1d155f186bf..7b9c4ad7b15 100644 --- a/code/modules/media/broadcast/receivers/radio.dm +++ b/code/modules/media/broadcast/receivers/radio.dm @@ -15,7 +15,6 @@ /obj/machinery/media/receiver/boombox/attack_hand(var/mob/user) if(stat & (NOPOWER|BROKEN)) to_chat(usr, "\red You don't see anything to mess with.") - return user.set_machine(src) interact(user) @@ -61,7 +60,6 @@ connect_frequency() else to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)") - updateDialog() diff --git a/code/modules/media/broadcast/transmitters/broadcast.dm b/code/modules/media/broadcast/transmitters/broadcast.dm index c732e5bce96..d8607851752 100644 --- a/code/modules/media/broadcast/transmitters/broadcast.dm +++ b/code/modules/media/broadcast/transmitters/broadcast.dm @@ -137,7 +137,6 @@ else to_chat(usr, "\red Invalid FM frequency. (90.0, 200.0)") - /obj/machinery/media/transmitter/broadcast/process() if(stat & (NOPOWER|BROKEN)) return @@ -163,12 +162,10 @@ // to_chat(world, "got [transfer_moles] moles at [removed.temperature]") - if(removed) var/heat_capacity = removed.heat_capacity() // to_chat(world, "heating ([heat_capacity])") - if(heat_capacity) // Added check to avoid divide by zero (oshi-) runtime errors -- TLE if(removed.temperature < MAX_TEMP + T0C) removed.temperature = min(removed.temperature + heating_power/heat_capacity, 1000) // Added min() check to try and avoid wacky superheating issues in low gas scenarios -- TLE @@ -177,11 +174,9 @@ // to_chat(world, "now at [removed.temperature]") - env.merge(removed) // to_chat(world, "turf now at [env.temperature]") - /* // Checks heat from the environment and applies any integrity damage var/datum/gas_mixture/environment = loc.return_air() diff --git a/code/modules/media/jukebox.dm b/code/modules/media/jukebox.dm index 6337dccdb34..33a44c5f23b 100644 --- a/code/modules/media/jukebox.dm +++ b/code/modules/media/jukebox.dm @@ -116,7 +116,6 @@ var/global/loopModeNames=list( /obj/machinery/media/jukebox/attack_hand(var/mob/user) if(stat & NOPOWER) to_chat(usr, "\red You don't see anything to mess with.") - return if(stat & BROKEN && playlist!=null) user.visible_message("\red [user.name] smacks the side of \the [src.name].","\red You hammer the side of \the [src.name].") @@ -182,7 +181,6 @@ var/global/loopModeNames=list( ..() if(emagged) to_chat(usr, "\red You touch the bluescreened menu. Nothing happens. You feel dumber.") - return if (href_list["power"]) @@ -193,7 +191,6 @@ var/global/loopModeNames=list( if (href_list["playlist"]) if(!check_reload()) to_chat(usr, "\red You must wait 60 seconds between playlist reloads.") - return playlist_id=href_list["playlist"] last_reload=world.time diff --git a/code/modules/media/mediamanager.dm b/code/modules/media/mediamanager.dm index 8aa525ac896..d78afc6f9f2 100644 --- a/code/modules/media/mediamanager.dm +++ b/code/modules/media/mediamanager.dm @@ -82,7 +82,6 @@ if(vlc.attachEvent) { #ifdef DEBUG_MEDIAPLAYER to_chat(#define MP_DEBUG(x) owner, x) - #warning Please comment out #define DEBUG_MEDIAPLAYER before committing. #else #define MP_DEBUG(x) @@ -139,7 +138,6 @@ to_chat(#define MP_DEBUG(x) owner, x) targetURL = M.media_url targetStartTime = M.media_start_time // to_chat(owner, "Found audio source: [M.media_url] @ [(world.time - start_time) / 10]s.") - //else // testing("M is not playing or null.") @@ -158,7 +156,6 @@ to_chat(#define MP_DEBUG(x) owner, x) if(!media || !istype(media)) to_chat(usr, "You have no media datum to change, if you're not in the lobby tell an admin.") - return var/value = input("Choose your Jukebox volume.", "Jukebox volume", media.get_volume()) value = round(max(0, min(100, value))) diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm index bd5f8b338d0..16c247b6b50 100644 --- a/code/modules/mining/abandonedcrates.dm +++ b/code/modules/mining/abandonedcrates.dm @@ -65,34 +65,28 @@ /obj/structure/closet/crate/secure/loot/togglelock(mob/user as mob) if(locked) to_chat(user, "The crate is locked with a Deca-code lock.") - var/input = input(usr, "Enter digit from [min] to [max].", "Deca-Code Lock", "") as num if(in_range(src, user)) input = Clamp(input, 0, 10) if (input == code) to_chat(user, "The crate unlocks!") - locked = 0 overlays.Cut() overlays += greenlight else if (input == null || input > max || input < min) to_chat(user, "You leave the crate alone.") - else to_chat(user, "A red light flashes.") - lastattempt = input attempts-- if (attempts == 0) to_chat(user, "The crate's anti-tamper system activates!") - var/turf/T = get_turf(src.loc) explosion(T, -1, -1, 1, 1) qdel(src) return else to_chat(user, "You attempt to interact with the device using a hand gesture, but it appears this crate is from before the DECANECT came out.") - return else return ..() @@ -101,27 +95,20 @@ if(locked) if (istype(W, /obj/item/weapon/card/emag)) to_chat(user, "The crate unlocks!") - locked = 0 if (istype(W, /obj/item/device/multitool)) to_chat(user, "DECA-CODE LOCK REPORT:") - if (attempts == 1) to_chat(user, "* Anti-Tamper Bomb will activate on next failed access attempt.") - else to_chat(user, "* Anti-Tamper Bomb will activate after [src.attempts] failed access attempts.") - if (lastattempt == null) to_chat(user, " has been made to open the crate thus far.") - return // hot and cold if (code > lastattempt) to_chat(user, "* Last access attempt lower than expected code.") - else to_chat(user, "* Last access attempt higher than expected code.") - else ..() else ..() diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 70fd5738c2d..a8ac5e1a88c 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -103,17 +103,14 @@ var/obj/item/stack/cable_coil/CC = W if(string_attached) to_chat(user, "There already is a string attached to this coin.") - return if (CC.use(1)) overlays += image('icons/obj/items.dmi',"coin_string_overlay") string_attached = 1 to_chat(user, "You attach a string to the coin.") - else to_chat(user, "You need one length of cable to attach a string to the coin.") - return else if(istype(W,/obj/item/weapon/wirecutters)) @@ -127,7 +124,6 @@ overlays = list() string_attached = null to_chat(user, "You detach the string from the coin.") - else if(istype(W,/obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(WT.welding && WT.remove_fuel(0, user)) @@ -139,7 +135,6 @@ var/typekey = typelist[cmineral] if(ispath(typekey)) to_chat(user, "\blue You make [src] into a ring.") - new typekey(get_turf(loc)) qdel(src) else ..() diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm index a4e4c6e9eb7..60044582dec 100644 --- a/code/modules/mining/equipment_locker.dm +++ b/code/modules/mining/equipment_locker.dm @@ -210,7 +210,6 @@ points = 0 else to_chat(usr, "Required access not found.") - else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/I = usr.get_active_hand() if(istype(I)) @@ -220,7 +219,6 @@ inserted_id = I else to_chat(usr, "No valid ID.") - if(href_list["release"]) if(check_access(inserted_id) || allowed(usr)) //Check the ID inside, otherwise check the user. if(!(text2path(href_list["release"]) in stack_list)) return @@ -235,7 +233,6 @@ stack_list -= text2path(href_list["release"]) else to_chat(usr, "Required access not found.") - if(href_list["plasteel"]) if(check_access(inserted_id) || allowed(usr)) if(!(/obj/item/stack/sheet/metal in stack_list)) return @@ -252,7 +249,6 @@ unload_mineral(plasteelout) else to_chat(usr, "Required access not found.") - if(href_list["plasglass"]) if(check_access(inserted_id) || allowed(usr)) if(!(/obj/item/stack/sheet/glass in stack_list)) return @@ -269,7 +265,6 @@ unload_mineral(plasglassout) else to_chat(usr, "Required access not found.") - updateUsrDialog() return @@ -422,7 +417,6 @@ inserted_id = I else to_chat(usr, "No valid ID.") - if(href_list["purchase"]) if(istype(inserted_id)) var/datum/data/mining_equipment/prize = locate(href_list["purchase"]) @@ -504,18 +498,15 @@ var/obj/item/weapon/card/id/C = I C.mining_points += points to_chat(user, "You transfer [points] points to [C].") - points = 0 else to_chat(user, "There's no points left on [src].") - ..() /obj/item/weapon/card/mining_point_card/examine(mob/user) ..(user) to_chat(user, "There's [points] points on the card.") - /**********************Jaunter**********************/ /obj/item/device/wormhole_jaunter @@ -534,7 +525,6 @@ var/turf/device_turf = get_turf(user) if(!device_turf||device_turf.z==2||device_turf.z>=7) to_chat(user, "You're having difficulties getting the [src.name] to work.") - return else user.visible_message("[user.name] activates the [src.name]!") @@ -545,7 +535,6 @@ L += B if(!L.len) to_chat(user, "The [src.name] failed to create a wormhole.") - return var/chosen_beacon = pick(L) var/obj/effect/portal/wormhole/jaunt_tunnel/J = new /obj/effect/portal/wormhole/jaunt_tunnel(get_turf(src), chosen_beacon) @@ -617,12 +606,10 @@ if(burst_time == 50) burst_time = 30 to_chat(user, "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.") - /obj/item/weapon/resonator/afterattack(atom/target, mob/user, proximity_flag) if(proximity_flag) if(!check_allowed_items(target, 1)) return @@ -659,12 +646,10 @@ for(var/mob/living/L in src.loc) add_logs(L, creator, "used a resonator field on", object="resonator") to_chat(L, "The [src.name] ruptured with you in it!") - L.adjustBruteLoss(resonance_damage) else for(var/mob/living/L in src.loc) to_chat(L, "The [src.name] ruptured with you in it!") - L.adjustBruteLoss(resonance_damage) qdel(src) @@ -741,19 +726,15 @@ if(W.welding && !stat) if(stance != HOSTILE_STANCE_IDLE) to_chat(user, "[src] is moving around too much to repair!") - return if(maxHealth == health) to_chat(user, "[src] is at full integrity.") - else health += 10 to_chat(user, "You repair some of the armor on [src].") - return if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner)) to_chat(user, "You instruct [src] to drop any collected ore.") - DropOre() return ..() @@ -776,11 +757,9 @@ if(0) SetCollectBehavior() to_chat(M, "[src] has been set to search and store loose ore.") - if(2) SetOffenseBehavior() to_chat(M, "[src] has been set to attack hostile wildlife.") - return ..() @@ -888,11 +867,9 @@ return else to_chat(user, "[src] is only effective on the dead.") - return else to_chat(user, "[src] is only effective on lesser beings.") - return /obj/item/weapon/lazarus_injector/emag_act() @@ -907,11 +884,9 @@ ..(user) if(!loaded) to_chat(user, "[src] is empty.") - if(malfunctioning) to_chat(user, "The display on [src] seems to be flickering.") - /**********************Mining Scanner**********************/ /obj/item/device/mining_scanner @@ -1017,9 +992,7 @@ var/obj/item/organ/internal/hivelord_core/C = M if(!istype(C, /obj/item/organ/internal/hivelord_core)) to_chat(user, "The stabilizer only works on hivelord cores.") - return ..() C.preserved = 1 to_chat(user, "You inject the hivelord core with the stabilizer. It will no longer go inert.") - qdel(src) \ No newline at end of file diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm index 03782a96f7f..25bbf0f3ee5 100644 --- a/code/modules/mining/laborcamp/laborshuttle.dm +++ b/code/modules/mining/laborcamp/laborshuttle.dm @@ -19,11 +19,9 @@ var/obj/docking_port/mobile/M = shuttle_master.getShuttle("laborcamp") if(!M) to_chat(usr, "Cannot locate shuttle!") - return 0 var/obj/docking_port/stationary/S = M.get_docked() if(S && S.name == "laborcamp_away") to_chat(usr, "Shuttle is already at the outpost!") - return 0 ..() \ No newline at end of file diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index ab1759d844f..47c9c45dbc3 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -76,7 +76,6 @@ - /obj/machinery/mineral/labor_claim_console/Topic(href, href_list) usr.set_machine(src) src.add_fingerprint(usr) @@ -90,7 +89,6 @@ inserted_id.points += machine.points machine.points = 0 to_chat(src, "Points transferred.") - else if(href_list["choice"] == "insert") var/obj/item/weapon/card/id/prisoner/I = usr.get_active_hand() if(istype(I)) @@ -99,29 +97,23 @@ inserted_id = I else to_chat(usr, "Invalid ID.") - if(check_auth()) //Sanity check against hef spoofs if(href_list["choice"] == "station") if(!alone_in_area(get_area(src), usr)) to_chat(usr, "Prisoners are only allowed to be released while alone.") - else switch(shuttle_master.moveShuttle("laborcamp","laborcamp_home")) if(1) to_chat(usr, "Shuttle not found") - if(2) to_chat(usr, "Shuttle already at station") - if(3) to_chat(usr, "No permission to dock could be granted.") - else var/message = "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval." announcer.autosay(message, "Labor Camp Controller", "Security") to_chat(usr, "Shuttle received message and will be sent shortly.") - if(href_list["choice"] == "release") if(alone_in_area(get_area(loc), usr)) var/obj/docking_port/stationary/S = shuttle_master.getDock("laborcamp_home") @@ -130,11 +122,9 @@ release_door.open() else to_chat(usr, "Prisoners can only be released while docked with the station.") - else to_chat(usr, "Prisoners are only allowed to be released while alone.") - src.updateUsrDialog() return @@ -180,15 +170,10 @@ if(istype(I, /obj/item/weapon/card/id/prisoner)) var/obj/item/weapon/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.") - else to_chat(user, "Error: Invalid ID") - return ..() diff --git a/code/modules/mining/manufacturing.dm b/code/modules/mining/manufacturing.dm index 5d66474b5fb..429b0ee42bc 100644 --- a/code/modules/mining/manufacturing.dm +++ b/code/modules/mining/manufacturing.dm @@ -178,7 +178,6 @@ if (href_list["download"]) to_chat(if(!src.dl_list) usr, "\red This unit is not capable of downloading any additional schematics.") - else var/amtdl = 0 //var/dontload = 0 @@ -193,10 +192,8 @@ amtdl++ else dontload = 0*/ to_chat(if (amtdl) usr, "\blue [amtdl] new schematics downloaded from Robotics Research Database.") - to_chat(else usr, "\red No new schematics currently available in Robotics Research Database.") - if (href_list["delete"]) var/operation = text2num(href_list["delete"]) if(operation == 1) // Clear Disk Schematics @@ -205,19 +202,15 @@ src.diskload-= D amtgone++ to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.") - to_chat(else usr, "\red No disk-loaded schematics detected in database.") - if(operation == 2) // Clear Download Schematics var/amtgone = 0 for(var/datum/manufacture/D in src.download) src.download-= D amtgone++ to_chat(if (amtgone) usr, "\blue Cleared [amtgone] schematics from database.") - to_chat(else usr, "\red No downloaded schematics detected in database.") - if (href_list["eject"]) var/operation = text2num(href_list["eject"]) var/ejectamt = 0 @@ -236,7 +229,6 @@ if(11) ejecting = /obj/item/weapon/ore/fabric else to_chat(usr, "\red Error. Unknown ore type.") - return sleep(3) ejectamt = input(usr,"How many units do you want to eject?","Eject Materials") as num @@ -258,7 +250,6 @@ if (istype(O,I.cost3)) A3++ if (A1 < I.amount1 || A2 < I.amount2 || A3 < I.amount3) to_chat(usr, "\red Insufficient materials to manufacture that item.") - return // Consume Mats var/C1 = I.amount1 @@ -347,7 +338,6 @@ load = 2 else if(istype(W, /obj/item/weapon/disk/data/schematic)) to_chat(if (!src.acceptdisk) user, "\red This unit is unable to accept disks.") - else var/amtload = 0 var/dontload = 0 @@ -365,9 +355,7 @@ amtload++ else dontload = 0 to_chat(if (amtload) user, "\blue [amtload] new schematics downloaded from disk.") - to_chat(else user, "\red No new schematics available on disk.") - else if (istype(W, /obj/item/weapon/storage/bag/ore)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] uses the []'s automatic ore loader on []!", user, src, W), 1) var/amtload = 0 @@ -375,13 +363,10 @@ M.loc = src amtload++ to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [W]!") - to_chat(else user, "\red No ore loaded!") - else if(istype(W, /obj/item/weapon/card/emag)) src.hacked = 1 to_chat(user, "\blue You remove the [src]'s product locks!") - else ..() if (load == 1) @@ -407,9 +392,7 @@ M.loc = src amtload++ to_chat(if (amtload) user, "\blue [amtload] pieces of ore loaded from [O]!") - to_chat(else user, "\red No ore loaded!") - else if (istype(O, /obj/item/weapon/ore/)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing ore into []!", user, src), 1) var/staystill = user.loc @@ -418,7 +401,6 @@ sleep(3) if (user.loc != staystill) break to_chat(user, "\blue You finish stuffing ore into [src]!") - /*else if (istype(O, /obj/item/weapon/plant/wheat/metal)) for(var/mob/V in viewers(user, null)) V.show_message(text("\blue [] begins quickly stuffing [O] into []!", user, src), 1) var/staystill = user.loc @@ -428,7 +410,6 @@ sleep(3) if (user.loc != staystill) break to_chat(user, "\blue You finish stuffing [O] into [src]!"*/) - else ..() src.updateUsrDialog() diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index d3fdb6fb3b0..a468913eda3 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -220,7 +220,6 @@ var/mob/living/simple_animal/T = target if(captured) to_chat(U, "Capture failed!: The capsule already has a mob registered to it!") - else if(istype(T) && "neutral" in T.faction) T.forceMove(src) @@ -228,12 +227,10 @@ T.cancel_camera() name = "Lazarus Capsule: [initial(T.name)]" to_chat(U, "You placed a [T.name] inside the Lazarus Capsule!") - captured = T else to_chat(U, "You can't capture that mob!") - /obj/item/device/mobcapsule/throw_impact(atom/A, mob/user) ..() if(captured) diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 9ed15e58cef..e2ff03a506e 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -362,7 +362,6 @@ var/global/list/rockTurfEdgeCache if (!user.IsAdvancedToolUser()) to_chat(usr, "You don't have the dexterity to do this!") - return if (istype(P, /obj/item/weapon/pickaxe)) @@ -374,13 +373,11 @@ var/global/list/rockTurfEdgeCache return last_act = world.time to_chat(user, "You start picking...") - P.playDigSound() if(do_after(user, P.digspeed, target = src)) if(istype(src, /turf/simulated/mineral)) //sanity check against turf being deleted during digspeed delay to_chat(user, "You finish cutting into the rock.") - P.update_icon() gets_drilled(user) feedback_add_details("pick_used_mining","[P.name]") @@ -411,11 +408,9 @@ var/global/list/rockTurfEdgeCache /turf/simulated/mineral/attack_alien(var/mob/living/carbon/alien/M) to_chat(M, "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.") - gets_drilled() /turf/simulated/mineral/Bumped(AM as mob|obj) @@ -481,16 +476,13 @@ var/global/list/rockTurfEdgeCache if (dug) to_chat(user, "This area has already been dug!") - return to_chat(user, "You start digging...") - sleep(20) if ((user.loc == T && user.get_active_hand() == W)) to_chat(user, "You dig a hole.") - gets_dug() return @@ -502,16 +494,13 @@ var/global/list/rockTurfEdgeCache if (dug) to_chat(user, "This area has already been dug!") - return to_chat(user, "You start digging...") - sleep(P.digspeed) if ((user.loc == T && user.get_active_hand() == W)) to_chat(user, "You dig a hole.") - gets_dug() return diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index e07b4641300..be34465c207 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -125,7 +125,6 @@ src.add_fingerprint(usr) if(processing==1) to_chat(usr, "The machine is processing.") - return if(href_list["choose"]) chosen = href_list["choose"] diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 5f7e34f4463..a7a7b4b10df 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -68,14 +68,12 @@ if(!user.drop_item()) return to_chat(user, "You add the [C.name] into the bag.") - contents += C if (istype(W, /obj/item/weapon/moneybag)) var/obj/item/weapon/moneybag/C = W for (var/obj/O in C.contents) contents += O; to_chat(user, "You empty the [C.name] into the bag.") - return /obj/item/weapon/moneybag/Topic(href, href_list) diff --git a/code/modules/mining/ore.dm b/code/modules/mining/ore.dm index f6bd12a4c2e..f5e0f2349be 100644 --- a/code/modules/mining/ore.dm +++ b/code/modules/mining/ore.dm @@ -14,7 +14,6 @@ qdel(src) else if(W.isOn()) to_chat(user, "Not enough fuel to smelt [src].") - ..() /obj/item/weapon/ore/Crossed(AM as mob|obj) @@ -66,7 +65,6 @@ /obj/item/weapon/ore/glass/attack_self(mob/living/user as mob) to_chat(user, "You use the sand to make sandstone.") - var/sandAmt = 1 for(var/obj/item/weapon/ore/glass/G in user.loc) // The sand on the floor sandAmt += 1 @@ -97,7 +95,6 @@ var/obj/item/weapon/weldingtool/W = I if(W.welding) to_chat(user, "You can't hit a high enough temperature to smelt [src] properly!") - else ..() diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm index 4a30f138982..7d6750c4be4 100644 --- a/code/modules/mining/satchel_ore_boxdm.dm +++ b/code/modules/mining/satchel_ore_boxdm.dm @@ -20,7 +20,6 @@ for(var/obj/item/weapon/ore/O in S.contents) S.remove_from_storage(O, src) //This will move the item to this item's contents to_chat(user, "You empty the satchel into the box.") - return /obj/structure/ore_box/attack_hand(mob/user as mob) @@ -93,7 +92,6 @@ contents -= O O.loc = src.loc to_chat(usr, "You empty the box.") - src.updateUsrDialog() return @@ -109,7 +107,6 @@ obj/structure/ore_box/ex_act(severity, target) if(!istype(usr, /mob/living/carbon/human)) //Only living, intelligent creatures with hands can empty ore boxes. to_chat(usr, "You are physically incapable of emptying the ore box.") - return if( usr.stat || usr.restrained() ) @@ -117,14 +114,12 @@ obj/structure/ore_box/ex_act(severity, target) if(!Adjacent(usr)) //You can only empty the box if you can physically reach it to_chat(usr, "You cannot reach the ore box.") - return add_fingerprint(usr) if(contents.len < 1) to_chat(usr, "The ore box is empty.") - return for (var/obj/item/weapon/ore/O in contents) @@ -132,5 +127,4 @@ obj/structure/ore_box/ex_act(severity, target) O.loc = src.loc to_chat(usr, "You empty the ore box.") - return diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 161bb8666c7..82b83db73ef 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -202,10 +202,8 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(ticker) if(ticker.mode) // to_chat(world, "DEBUG: ticker not null") - if(ticker.mode.name == "AI malfunction") // to_chat(world, "DEBUG: malf mode ticker test") - if(ticker.mode:malf_mode_declared) stat(null, "Time left: [max(ticker.mode:AI_win_timeleft/(ticker.mode:apcs/3), 0)]") show_stat_emergency_shuttle_eta() @@ -216,15 +214,12 @@ 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(src, "You've given up your right to respawn!") - return if(!(mind && mind.current && can_reenter_corpse)) to_chat(src, "You have no body.") - return if(mind.current.key && copytext(mind.current.key,1,2)!="@") //makes sure we don't accidentally kick any clients to_chat(usr, "Another consciousness is in your body...It is resisting you.") - return if(mind.current.ajourn && mind.current.stat != DEAD) //check if the corpse is astral-journeying (it's client ghosted using a cultist rune). var/turf/T = get_turf(mind.current) @@ -236,7 +231,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp break if(!found_astral_rune) to_chat(usr, "The astral cord that ties your body and your spirit has been severed. You are likely to wander the realm beyond until your body is finally dead and thus reunited with you.") - return mind.current.ajourn=0 @@ -254,13 +248,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source) if(message) to_chat(src, "[message]") - to_chat(src, "(Click to re-enter)") - if(sound) to_chat(src, sound(sound)) - /mob/dead/observer/proc/show_me_the_hud(hud_index) var/datum/atom_hud/H = huds[hud_index] H.add_hud_to(src) @@ -280,35 +271,29 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(0) show_me_the_hud(DATA_HUD_SECURITY_BASIC) to_chat(src, "Security HUD set.") - if(DATA_HUD_SECURITY_BASIC) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "Medical HUD set.") - if(DATA_HUD_MEDICAL_ADVANCED) show_me_the_hud(DATA_HUD_DIAGNOSTIC) to_chat(src, "Diagnostic HUD set.") - if(DATA_HUD_DIAGNOSTIC) data_hud_seen = 0 to_chat(src, "HUDs disabled.") - /mob/dead/observer/verb/toggle_antagHUD() set category = "Ghost" set name = "Toggle AntagHUD" set desc = "Toggles AntagHUD allowing you to see who is the antagonist" if(!config.antag_hud_allowed && !client.holder) to_chat(src, "\red Admins have disabled this for this round.") - return if(!client) return var/mob/dead/observer/M = src if(jobban_isbanned(M, "AntagHUD")) to_chat(src, "\red You have been banned from using this feature") - return if(config.antag_hud_restricted && !M.has_enabled_antagHUD && !check_rights(R_ADMIN|R_MOD,0)) var/response = alert(src, "If you turn this on, you will not be able to take any part in the round.","Are you sure you want to turn this feature on?","Yes","No") @@ -329,11 +314,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp H.remove_hud_from(usr) if(!M.antagHUD) to_chat(usr, "AntagHud Toggled ON") - M.antagHUD = 1 else to_chat(usr, "AntagHud Toggled OFF") - M.antagHUD = 0 /mob/dead/observer/proc/dead_tele(A in ghostteleportlocs) @@ -343,7 +326,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!isobserver(usr)) to_chat(usr, "Not when you're not dead!") - return usr.verbs -= /mob/dead/observer/proc/dead_tele @@ -360,7 +342,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!L || !L.len) to_chat(usr, "No area available.") - usr.forceMove(pick(L)) following = null @@ -383,7 +364,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return following = target to_chat(src, "Now following [target]") - if(ismob(target)) forceMove(get_turf(target)) var/mob/M = target @@ -441,7 +421,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, "This mob is not located in the game world.") - /* Now a spell. See spells.dm /mob/dead/observer/verb/boo() set category = "Ghost" @@ -461,12 +440,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp set hidden = 1 to_chat(src, "\red You are dead! You have no mind to store memory!") - /mob/dead/observer/add_memory() set hidden = 1 to_chat(src, "\red You are dead! You have no mind to store memory!") - /mob/dead/observer/verb/analyze_air() set name = "Analyze Air" set category = "Ghost" @@ -483,13 +460,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/total_moles = environment.total_moles() to_chat(src, "\blue Results:") - if(abs(pressure - ONE_ATMOSPHERE) < 10) to_chat(src, "\blue Pressure: [round(pressure,0.1)] kPa") - else to_chat(src, "\red Pressure: [round(pressure,0.1)] kPa") - if(total_moles) var/o2_concentration = environment.oxygen/total_moles var/n2_concentration = environment.nitrogen/total_moles @@ -499,38 +473,28 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/unknown_concentration = 1-(o2_concentration+n2_concentration+co2_concentration+plasma_concentration) if(abs(n2_concentration - N2STANDARD) < 20) to_chat(src, "\blue Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)") - else to_chat(src, "\red Nitrogen: [round(n2_concentration*100)]% ([round(environment.nitrogen,0.01)] moles)") - if(abs(o2_concentration - O2STANDARD) < 2) to_chat(src, "\blue Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)") - else to_chat(src, "\red Oxygen: [round(o2_concentration*100)]% ([round(environment.oxygen,0.01)] moles)") - if(co2_concentration > 0.01) to_chat(src, "\red CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)") - else to_chat(src, "\blue CO2: [round(co2_concentration*100)]% ([round(environment.carbon_dioxide,0.01)] moles)") - if(plasma_concentration > 0.01) to_chat(src, "\red Plasma: [round(plasma_concentration*100)]% ([round(environment.toxins,0.01)] moles)") - if(unknown_concentration > 0.01) to_chat(src, "\red Unknown: [round(unknown_concentration*100)]% ([round(unknown_concentration*total_moles,0.01)] moles)") - to_chat(src, "\blue Temperature: [round(environment.temperature-T0C,0.1)]°C") - to_chat(src, "\blue Heat Capacity: [round(environment.heat_capacity(),0.1)]") - /mob/dead/observer/verb/view_manifest() set name = "View Crew Manifest" set category = "Ghost" @@ -587,7 +551,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/mob/target = locate(href_list["jump"]) var/mob/A = usr; to_chat(A, "Teleporting to [target]...") - //var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list if(target && target != usr) spawn(0) @@ -611,11 +574,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp src.anonsay = !src.anonsay if(anonsay) to_chat(src, "Your key won't be shown when you speak in dead chat.") - else to_chat(src, "Your key will be publicly visible again.") - /mob/dead/observer/verb/toggle_ghostsee() set name = "Toggle Ghost Vision" set desc = "Toggles your ability to see things only ghosts can see, like other ghosts" @@ -624,7 +585,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp updateghostsight() to_chat(usr, "You [(ghostvision?"now":"no longer")] have ghost vision.") - /mob/dead/observer/verb/toggle_darkness() set name = "Toggle Darkness" set category = "Ghost" diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 1a2998fbaac..7f63a8f1261 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -9,7 +9,6 @@ if (src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) to_chat(src, "\red You cannot talk in deadchat (muted).") - return if (src.client.handle_spam_prevention(message,MUTE_DEADCHAT)) @@ -32,7 +31,6 @@ if(src.client) if(src.client.prefs.muted & MUTE_DEADCHAT) to_chat(src, "\red You cannot emote in deadchat (muted).") - return if(src.client.handle_spam_prevention(message, MUTE_DEADCHAT)) diff --git a/code/modules/mob/dead/observer/spells.dm b/code/modules/mob/dead/observer/spells.dm index ae504a90fd3..993f2b6e344 100644 --- a/code/modules/mob/dead/observer/spells.dm +++ b/code/modules/mob/dead/observer/spells.dm @@ -34,7 +34,6 @@ var/global/list/boo_phrases=list( if(H && H.client) to_chat(H, "[pick(boo_phrases)]") - // Flicker unblessed lights in range if(istype(A,/obj/machinery/light)) var/obj/machinery/light/L = A diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index cc74d5e6ffd..8d03cdd969a 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -18,7 +18,6 @@ if(stat || !use_me && usr == src) to_chat(usr, "You are unable to emote.") - return var/muzzled = istype(src.wear_mask, /obj/item/clothing/mask/muzzle) @@ -87,18 +86,15 @@ if(client.prefs.muted & MUTE_DEADCHAT) to_chat(src, "\red You cannot send deadchat emotes (muted).") - return if(!(client.prefs.toggles & CHAT_DEAD)) to_chat(src, "\red You have deadchat muted.") - return if(!src.client.holder) if(!config.dsay_allowed) to_chat(src, "\red Deadchat is globally muted") - return @@ -124,6 +120,5 @@ if(check_rights(R_ADMIN|R_MOD, 0, M) && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to admins/mods to_chat(M, message) - else if(M.stat == DEAD && (M.client.prefs.toggles & CHAT_DEAD)) // Show the emote to regular ghosts with deadchat toggled on M.show_message(message, 2) diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index c222c73b33c..c3ca5a602c9 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -66,17 +66,13 @@ if(!language || !(language.flags & INNATE)) // INNATE is the flag for audible-emote-language, so we don't want to show an "x talks but you cannot hear them" message if it's set if(speaker == src) to_chat(src, "You cannot hear yourself speak!") - else to_chat(src, "[speaker_name][alt_name] talks but you cannot hear them.") - else if(language) to_chat(src, "[speaker_name][alt_name] [track][language.format_message(message, verb)]") - else to_chat(src, "[speaker_name][alt_name] [track][verb], \"[message]\"") - if (speech_sound && (get_dist(speaker, src) <= world.view && src.z == speaker.z)) var/turf/source = speaker? get_turf(speaker) : get_turf(src) src.playsound_local(source, speech_sound, sound_vol, 1) @@ -182,14 +178,11 @@ if(sdisabilities & DEAF || ear_deaf) if(prob(20)) to_chat(src, "You feel your headset vibrate but can hear nothing from it!") - else if(track) to_chat(src, "[part_a][track][part_b][formatted]") - else to_chat(src, "[part_a][speaker_name][part_b][formatted]") - /mob/proc/hear_signlang(var/message, var/verb = "gestures", var/datum/language/language, var/mob/speaker = null) if(!client) return @@ -223,4 +216,3 @@ heard = "...You almost hear someone talking..." to_chat(src, heard) - diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 71d8e9ac211..09f8009be75 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -48,12 +48,9 @@ if(istype(M)) M.unEquip(src) to_chat(M, "[src] wriggles out of your grip!") - to_chat(src, "You wriggle out of [M]'s grip!") - else if(istype(src.loc,/obj/item)) to_chat(src, "You struggle free of [src.loc].") - src.forceMove(get_turf(src)) if(istype(M)) @@ -78,9 +75,7 @@ H.attack_hand(grabber) to_chat(grabber, "You scoop up \the [src].") - to_chat(src, "\The [grabber] scoops you up.") - grabber.status_flags |= PASSEMOTES return H diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index c35403c43a7..777eac07ec8 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -105,13 +105,11 @@ if(istype(player,/mob/dead) && follow) var/msg_dead = "[name], [speaker_mask] ([ghost_follow_link(speaker, ghost=player)]) [format_message(message, get_spoken_verb(message))]" to_chat(player, msg_dead) - continue else if(istype(player,/mob/dead) || ((src in player.languages) && check_special_condition(player))) to_chat(player, msg) - /datum/language/proc/check_special_condition(var/mob/other) return 1 diff --git a/code/modules/mob/living/autohiss.dm b/code/modules/mob/living/autohiss.dm index 17d8a061073..4506ce50cfb 100644 --- a/code/modules/mob/living/autohiss.dm +++ b/code/modules/mob/living/autohiss.dm @@ -26,18 +26,14 @@ switch(autohiss_mode) if(AUTOHISS_OFF) to_chat(src, "Auto-hiss is now OFF.") - if(AUTOHISS_BASIC) to_chat(src, "Auto-hiss is now BASIC.") - if(AUTOHISS_FULL) to_chat(src, "Auto-hiss is now FULL.") - else autohiss_mode = AUTOHISS_OFF to_chat(src, "Auto-hiss is now OFF.") - /datum/species var/list/autohiss_basic_map = null var/list/autohiss_extra_map = null diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index 21d006ee886..fdd86c790f9 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -86,7 +86,6 @@ // to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Fire protection: [heat_protection] - Location: [loc] - src: [src]") - // Aliens are now weak to fire. //After then, it reacts to the surrounding atmosphere based on your thermal protection diff --git a/code/modules/mob/living/carbon/alien/alien_defenses.dm b/code/modules/mob/living/carbon/alien/alien_defenses.dm index 225d4a8046b..397a14fc259 100644 --- a/code/modules/mob/living/carbon/alien/alien_defenses.dm +++ b/code/modules/mob/living/carbon/alien/alien_defenses.dm @@ -8,12 +8,10 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/attack_alien(mob/living/carbon/alien/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return switch(M.a_intent) @@ -41,7 +39,6 @@ In all, this is a lot like the monkey code. /N updatehealth() else to_chat(M, "[name] is too injured for that.") - return 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 a72e93b3db4..afae056b99f 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm @@ -9,15 +9,12 @@ Doesn't work on other aliens/AI.*/ /mob/living/carbon/proc/powerc(X, Y)//Y is optional, checks for weed planting. X can be null. if(stat) to_chat(src, "You must be conscious to do this.") - return 0 else if(X && getPlasma() < X) to_chat(src, "Not enough plasma stored.") - return 0 else if(Y && (!isturf(src.loc) || istype(src.loc, /turf/space))) to_chat(src, "You can't place that here!") - return 0 else return 1 @@ -28,7 +25,6 @@ Doesn't work on other aliens/AI.*/ if(locate(/obj/structure/alien/weeds/node) in get_turf(src)) to_chat(src, "There's already a weed node here.") - return if(powerc(50,1)) @@ -49,9 +45,7 @@ Doesn't work on other aliens/AI.*/ if(msg) log_say("Alien Whisper: [key_name(src)]->[key_name(M)]: [msg]") to_chat(M, "You hear a strange, alien voice in your head...[msg]") - to_chat(src, "You said: [msg] to [M]") - for(var/mob/dead/observer/G in player_list) G.show_message("Alien message from [src] ([ghost_follow_link(src, ghost=G)]) to [M] ([ghost_follow_link(M, ghost=G)]): [msg]") return @@ -70,12 +64,9 @@ Doesn't work on other aliens/AI.*/ M.adjustPlasma(amount) adjustPlasma(-amount) to_chat(M, "[src] has transfered [amount] plasma to you.") - to_chat(src, {"You have trasferred [amount] plasma to [M]"}) - else to_chat(src, "You need to be closer.") - return @@ -91,7 +82,6 @@ Doesn't work on other aliens/AI.*/ var/obj/I = O if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid. to_chat(src, "You cannot dissolve this object.") - return // TURF CHECK else if(istype(O, /turf/simulated)) @@ -99,12 +89,10 @@ Doesn't work on other aliens/AI.*/ // R WALL if(istype(T, /turf/simulated/wall/r_wall)) to_chat(src, "You cannot dissolve this object.") - return // R FLOOR if(istype(T, /turf/simulated/floor/engine)) to_chat(src, "You cannot dissolve this object.") - return else// Not a type we can acid. return @@ -114,7 +102,6 @@ Doesn't work on other aliens/AI.*/ visible_message("[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!") else to_chat(src, "Target is too far away.") - return /mob/living/carbon/alien/humanoid/proc/neurotoxin() // ok 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 c93eb944df6..e45fa198006 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -35,12 +35,10 @@ if(src.has_brain_worms()) to_chat(src, "We cannot perform this ability at the present time!") - return if(no_queen) adjustPlasma(-500) to_chat(src, "You begin to evolve!") - for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/queen/new_xeno = new(loc) @@ -49,5 +47,4 @@ qdel(src) else to_chat(src, "We already have an alive queen.") - return \ 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 91411978d51..a5e72059ab8 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -51,7 +51,6 @@ leap_icon.icon_state = "leap_[leap_on_click ? "on":"off"]" if(message) to_chat(src, "You will now [leap_on_click ? "leap at":"slash at"] enemies!") - else return @@ -67,7 +66,6 @@ /mob/living/carbon/alien/humanoid/hunter/proc/leap_at(var/atom/A) if(pounce_cooldown) to_chat(src, "You are too fatigued to pounce right now!") - return if(leaping) //Leap while you leap, so you can leap while you leap @@ -75,7 +73,6 @@ if(!has_gravity(src) || !has_gravity(A)) to_chat(src, "It is unsafe to leap without gravity!") - //It's also extremely buggy visually, so it's balance+bugfix return if(lying) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm index f5ddc992a0e..eb2ae210e71 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -77,7 +77,6 @@ if(powerc(250)) adjustToxLoss(-250) to_chat(src, "\green You begin to evolve!") - for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/sentinel/praetorian/new_xeno = new(loc) diff --git a/code/modules/mob/living/carbon/alien/humanoid/emote.dm b/code/modules/mob/living/carbon/alien/humanoid/emote.dm index a5a09b9a378..caf3cc4e5ad 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/emote.dm @@ -107,7 +107,6 @@ if("help") to_chat(src, "burp, flip, deathgasp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roar, roll, scratch,\nscretch, shake, sign-#, sit, sulk, sway, tail, twitch, whimper") - if(!stat) if (act == "roar") playsound(src.loc, 'sound/voice/hiss5.ogg', 40, 1, 1) diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm index aafb05c6640..d4716aafccb 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm @@ -83,7 +83,6 @@ if(locate(/obj/structure/alien/egg) in get_turf(src)) to_chat(src, "There's already an egg here.") - return if(powerc(250,1))//Can't plant eggs on spess tiles. That's silly. diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 736d5a1da09..c50e4603e41 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -114,7 +114,6 @@ /mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if(M.Victim) return // can't attack while eating! @@ -186,12 +185,10 @@ /mob/living/carbon/alien/humanoid/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return if(..()) //to allow surgery to return properly. @@ -256,12 +253,10 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/humanoid/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return ..() @@ -288,7 +283,6 @@ In all, this is a lot like the monkey code. /N updatehealth() else to_chat(M, "[name] is too injured for that.") - return @@ -311,7 +305,6 @@ In all, this is a lot like the monkey code. /N updatehealth() else to_chat(L, "[name] is too injured for that.") - return diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 6ccce6f2f66..b41d5a9705d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -18,7 +18,6 @@ if (disabilities & EPILEPSY) if ((prob(1) && paralysis < 10)) to_chat(src, "You have a seizure!") - Paralyse(10) if (disabilities & COUGHING) if ((prob(5) && paralysis <= 1)) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 634bbf95117..5b2e19f011d 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -64,7 +64,6 @@ set category = "Alien" if(locate(/obj/structure/alien/egg) in get_turf(src)) to_chat(src, "There's already an egg here.") - return if(powerc(75,1))//Can't plant eggs on spess tiles. That's silly. @@ -113,7 +112,6 @@ if(no_queen) adjustToxLoss(-1000) to_chat(src, "You begin to evolve!") - for(var/mob/O in viewers(src, null)) O.show_message(text("[src] begins to twist and contort!"), 1) var/mob/living/carbon/alien/humanoid/empress/new_xeno = new(loc) @@ -125,7 +123,6 @@ qdel(src) else to_chat(src, "We already have an alive empress.") - return */ \ No newline at end of file diff --git a/code/modules/mob/living/carbon/alien/larva/emote.dm b/code/modules/mob/living/carbon/alien/larva/emote.dm index c956e0b2489..b617a1fc883 100644 --- a/code/modules/mob/living/carbon/alien/larva/emote.dm +++ b/code/modules/mob/living/carbon/alien/larva/emote.dm @@ -16,7 +16,6 @@ if (src.client) if (client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot send IC messages (muted).") - return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -112,10 +111,8 @@ m_type = 2 if("help") to_chat(src, "burp, choke, collapse, dance, drool, gasp, shiver, gnarl, jump, moan, nod, roll, scratch,\nscretch, shake, sign-#, sulk, sway, tail, twitch, whimper") - else to_chat(src, text("Invalid Emote: []", act)) - if ((message && src.stat == 0)) log_emote("[name]/[key] : [message]") if (m_type & 1) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index f12989c83e0..a513ab76a90 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -39,7 +39,6 @@ if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") - now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -126,7 +125,6 @@ /mob/living/carbon/alien/larva/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if(M.Victim) @@ -152,12 +150,10 @@ /mob/living/carbon/alien/larva/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return ..() @@ -200,12 +196,10 @@ /mob/living/carbon/alien/larva/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return ..() @@ -231,7 +225,6 @@ updatehealth() else to_chat(M, "[name] is too injured for that.") - return /mob/living/carbon/alien/larva/restrained() diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index a30f8ff9b2d..44351eb792a 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -10,20 +10,16 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 to_chat(src, text("You are now hiding.")) - for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) to_chat(O, text("[] scurries to the ground!", src)) - else layer = MOB_LAYER to_chat(src, text("\green You have stopped hiding.")) - for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) to_chat(O, text("[] slowly peaks up from the ground...", src)) - /mob/living/carbon/alien/larva/verb/evolve() set name = "Evolve" set desc = "Evolve into a fully grown Alien." @@ -35,19 +31,13 @@ if(handcuffed || legcuffed) to_chat(src, "\red You cannot evolve when you are cuffed.") - if(amount_grown >= max_grown) //TODO ~Carn //green is impossible to read, so i made these blue and changed the formatting slightly to_chat(src, "\blue You are growing into a beautiful alien! It is time to choose a caste.") - to_chat(src, "\blue There are three to choose from:") - to_chat(src, "Hunters \blue are strong and agile, able to hunt away from the hive and rapidly move through ventilation shafts. Hunters generate plasma slowly and have low reserves.") - to_chat(src, "Sentinels \blue are tasked with protecting the hive and are deadly up close and at a range. They are not as physically imposing nor fast as the hunters.") - to_chat(src, "Drones \blue are the working class, offering the largest plasma storage and generation. They are the only caste which may evolve again, turning into the dreaded alien queen.") - var/alien_caste = alert(src, "Please choose which alien caste you shall belong to.",,"Hunter","Sentinel","Drone") var/mob/living/carbon/alien/humanoid/new_xeno @@ -67,5 +57,4 @@ return else to_chat(src, "You are not fully grown.") - return diff --git a/code/modules/mob/living/carbon/alien/life.dm b/code/modules/mob/living/carbon/alien/life.dm index a49f7c0a6ea..93bf633093f 100644 --- a/code/modules/mob/living/carbon/alien/life.dm +++ b/code/modules/mob/living/carbon/alien/life.dm @@ -34,7 +34,6 @@ if(breath.temperature > (T0C + 66) && !(RESIST_COLD in mutations)) if(prob(20)) to_chat(src, "You feel a searing heat in your lungs!") - fire_alert = max(fire_alert, 1) else fire_alert = 0 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 860e5aed290..151ed93e3ef 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -12,10 +12,8 @@ ..() if(stage < 4) to_chat(finder, "It's small and weak, barely the size of a fetus.") - else to_chat(finder, "It's grown quite large, and writhes slightly as you look at it.") - if(prob(10)) AttemptGrow(0) @@ -33,10 +31,8 @@ owner.emote("cough") if(prob(2)) to_chat(owner, "Your throat feels sore.") - if(prob(2)) to_chat(owner, "Mucous runs down the back of your throat.") - if(4) if(prob(2)) owner.emote("sneeze") @@ -44,17 +40,14 @@ owner.emote("cough") if(prob(4)) to_chat(owner, "Your muscles ache.") - if(prob(20)) owner.take_organ_damage(1) if(prob(4)) to_chat(owner, "Your stomach hurts.") - if(prob(20)) owner.adjustToxLoss(1) if(5) to_chat(owner, "You feel something tearing its way out of your stomach...") - owner.adjustToxLoss(10) /obj/item/organ/internal/body_egg/alien_embryo/egg_process() @@ -107,7 +100,6 @@ new_xeno.mind.special_role = "Alien" to_chat(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100))//To get the player's attention - if(gib_on_success) owner.gib() else diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm index fd04034f152..f0935c520ce 100644 --- a/code/modules/mob/living/carbon/alien/special/facehugger.dm +++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm @@ -50,14 +50,11 @@ var/const/MAX_ACTIVE_TIME = 400 switch(stat) if(DEAD,UNCONSCIOUS) to_chat(user, "[src] is not moving.") - if(CONSCIOUS) to_chat(user, "[src] seems to be active!") - if (sterile) to_chat(user, "It looks like the proboscis has been removed.") - /obj/item/clothing/mask/facehugger/attackby(obj/item/O,mob/m, params) if(O.force) Die() diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm index 106acb44814..6ad6a672b43 100644 --- a/code/modules/mob/living/carbon/brain/MMI.dm +++ b/code/modules/mob/living/carbon/brain/MMI.dm @@ -20,17 +20,14 @@ /obj/item/device/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/organ/internal/brain/crystal )) to_chat(user, " This brain is too malformed to be able to use with the [src].") - return if(istype(O,/obj/item/organ/internal/brain) && !brainmob) //Time to stick a brain in it --NEO var/obj/item/organ/internal/brain/B = O if(!B.brainmob) to_chat(user, "You aren't sure where this brain came from, but you're pretty sure it's a useless brain.") - return if(held_brain) to_chat(user, "Somehow, this MMI still has a brain in it. Report this to the bug tracker.") - log_to_dd("[user] tried to stick a [O] into [src] in [get_area(src)], but the held brain variable wasn't cleared") return for(var/mob/V in viewers(src, null)) @@ -71,10 +68,8 @@ /obj/item/device/mmi/attack_self(mob/user as mob) if(!brainmob) to_chat(user, "You upend the MMI, but there's nothing in it.") - else to_chat(user, "You unlock and upend the MMI, spilling the brain onto the floor.") - dropbrain(get_turf(user)) icon = 'icons/obj/assemblies.dmi' icon_state = "mmi_empty" @@ -107,7 +102,6 @@ if(isnull(held_brain)) log_to_dd("[src] at [loc] attempted to drop brain without a contained brain in [get_area(src)].") to_chat(brainmob, "Your MMI did not contain a brain! We'll make a new one for you, but you'd best report this to the bugtracker!") - held_brain = new(dropspot) // Let's not ruin someone's round because of something dumb -- Crazylemon held_brain.dna = brainmob.dna.Clone() held_brain.name = "\the [brainmob.name]'s [initial(held_brain.name)]" @@ -145,11 +139,9 @@ if(brainmob.stat) to_chat(brainmob, "Can't do that while incapacitated or dead.") - radio.listening = radio.listening==1 ? 0 : 1 to_chat(brainmob, "Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.") - /obj/item/device/mmi/emp_act(severity) if(!brainmob) return diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 1dda87d0c46..5fbfd6c5012 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -49,18 +49,15 @@ H.mind.transfer_to(brainmob) to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [initial(src.name)].") - callHook("debrain", list(brainmob)) /obj/item/organ/internal/brain/examine(mob/user) // -- TLE ..(user) if(brainmob && brainmob.client)//if thar be a brain inside... the brain. to_chat(user, "You can feel the small spark of life still left in this one.") - else to_chat(user, "This one seems particularly lifeless. Perhaps it will regain some of its luster later..") - /obj/item/organ/internal/brain/remove(var/mob/living/user,special = 0) name = "[dna.real_name]'s [initial(name)]" diff --git a/code/modules/mob/living/carbon/brain/emote.dm b/code/modules/mob/living/carbon/brain/emote.dm index 108ae12029b..fd2a4879c9d 100644 --- a/code/modules/mob/living/carbon/brain/emote.dm +++ b/code/modules/mob/living/carbon/brain/emote.dm @@ -15,17 +15,14 @@ if ("alarm") to_chat(src, "You sound an alarm.") - message = "\The [src] sounds an alarm." m_type = 2 if ("alert") to_chat(src, "You let out a distressed noise.") - message = "\The [src] lets out a distressed noise." m_type = 2 if ("notice") to_chat(src, "You play a loud tone.") - message = "\The [src] plays a loud tone." m_type = 2 if ("flash") @@ -36,22 +33,18 @@ m_type = 1 if ("whistle") to_chat(src, "You whistle.") - message = "\The [src] whistles." m_type = 2 if ("beep") to_chat(src, "You beep.") - message = "\The [src] beeps." m_type = 2 if ("boop") to_chat(src, "You boop.") - message = "\The [src] boops." m_type = 2 if ("help") to_chat(src, "alarm, alert, notice, flash,blink, whistle, beep, boop") - if(message && !stat) ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/carbon/brain/life.dm b/code/modules/mob/living/carbon/brain/life.dm index 507320b7ef6..857546732d7 100644 --- a/code/modules/mob/living/carbon/brain/life.dm +++ b/code/modules/mob/living/carbon/brain/life.dm @@ -6,11 +6,9 @@ updatehealth() if(!container) to_chat(src, "You feel weak.") - else to_chat(src, "STATUS: CRITICAL AMOUNTS OF RADIATION DETECTED.") - switch(radiation) if(0 to 49) radiation-- @@ -25,10 +23,8 @@ radiation -= 5 if(!container) to_chat(src, "You feel weak.") - else to_chat(src, "STATUS: DANGEROUS AMOUNTS OF RADIATION DETECTED.") - updatehealth() if(75 to 100) diff --git a/code/modules/mob/living/carbon/brain/posibrain.dm b/code/modules/mob/living/carbon/brain/posibrain.dm index d39da7e6c02..07251303a12 100644 --- a/code/modules/mob/living/carbon/brain/posibrain.dm +++ b/code/modules/mob/living/carbon/brain/posibrain.dm @@ -19,7 +19,6 @@ if(brainmob && !brainmob.key && searching == 0) //Start the process of searching for a new user. to_chat(user, "\blue You carefully locate the manual activation switch and start the positronic brain's boot process.") - icon_state = "posibrain-searching" ghost_volunteers.Cut() src.searching = 1 @@ -34,25 +33,20 @@ if(silenced) silenced = 0 to_chat(user, "You toggle the speaker to 'on', on the [src].") - desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'on'." if(brainmob && brainmob.key) to_chat(brainmob, "Your internal speaker has been toggled to 'on'.") - else silenced = 1 to_chat(user, "You toggle the speaker to 'off', on the [src].") - desc = "A cube of shining metal, four inches to a side and covered in shallow grooves. The speaker switch is set to 'off'." if(brainmob && brainmob.key) to_chat(brainmob, "Your internal speaker has been toggled to 'off'.") - /obj/item/device/mmi/posibrain/proc/request_player() for(var/mob/dead/observer/O in player_list) if(check_observer(O)) to_chat(O, "\A [src] has been activated. (Teleport | Sign Up)") - // if(ROLE_POSIBRAIN in O.client.prefs.be_special) The Guardian implementation looks cleaner // question(O.client) @@ -93,7 +87,6 @@ if(H.mind) H.mind.transfer_to(brainmob) to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a metal cube.") - icon_state = "posibrain-occupied" return @@ -103,11 +96,8 @@ src.name = "positronic brain ([src.brainmob.name])" to_chat(src.brainmob, "You are a positronic brain, brought into existence on [station_name()].") - to_chat(src.brainmob, "As a synthetic intelligence, you answer to all crewmembers, as well as the AI.") - to_chat(src.brainmob, "Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.") - src.brainmob.mind.assigned_role = "Positronic Brain" var/turf/T = get_turf_or_move(src.loc) @@ -134,31 +124,24 @@ /obj/item/device/mmi/posibrain/proc/volunteer(var/mob/dead/observer/O) if(!searching) to_chat(O, "Not looking for a ghost, yet.") - return if(!istype(O)) to_chat(O, "\red Error.") - return if(O in ghost_volunteers) to_chat(O, "\blue Removed from registration list.") - ghost_volunteers.Remove(O) return if(!check_observer(O)) to_chat(O, "\red You cannot be \a [src].") - return if(O.has_enabled_antagHUD == 1 && config.antag_hud_restricted) to_chat(O, "\red Upon using the antagHUD you forfeited the ability to join the round.") - return if(jobban_isbanned(O, "Cyborg") || jobban_isbanned(O,"nonhumandept")) to_chat(O, "\red You are job banned from this role.") - return to_chat(O., "\blue You've been added to the list of ghosts that may become this [src]. Click again to unvolunteer.") - ghost_volunteers.Add(O) @@ -180,7 +163,6 @@ msg += "*---------*" to_chat(user, msg) - /obj/item/device/mmi/posibrain/emp_act(severity) if(!src.brainmob) return diff --git a/code/modules/mob/living/carbon/brain/say.dm b/code/modules/mob/living/carbon/brain/say.dm index 324debd7394..03d6906b876 100644 --- a/code/modules/mob/living/carbon/brain/say.dm +++ b/code/modules/mob/living/carbon/brain/say.dm @@ -10,7 +10,6 @@ var/obj/item/device/mmi/posibrain/P = container if(P && P.silenced) to_chat(usr, "You cannot speak, as your internal speaker has been toggled to 'off'.") - return if(prob(emp_damage*4)) if(prob(10))//10% chane to drop the message entirely diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fe363381b51..ac4bb584528 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -96,7 +96,6 @@ if(src.is_muzzled()) if(message) to_chat(src, "The muzzle prevents you from vomiting!") - return 0 if(stun) Stun(4) @@ -195,7 +194,6 @@ if(istype(item_in_hand,/obj/item/weapon/twohanded)) if(item_in_hand:wielded == 1) to_chat(usr, "Your other hand is too busy holding the [item_in_hand.name]") - return src.hand = !( src.hand ) if(hud_used.l_hand_hud_object && hud_used.r_hand_hud_object) @@ -263,10 +261,8 @@ if(staminaloss) if(staminaloss > 30) to_chat(src, "You're completely exhausted.") - else to_chat(src, "You feel fatigued.") - if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit)) H.play_xylophone() else @@ -329,18 +325,15 @@ switch(damage) if(1) to_chat(src, "Your eyes sting a little.") - if(prob(40)) //waiting on carbon organs E.damage += 1 if(2) to_chat(src, "Your eyes burn.") - E.damage += rand(2, 4) else to_chat(src, "Your eyes itch and burn severely!") - E.damage += rand(12, 16) if(E.damage > E.min_bruised_damage) @@ -350,18 +343,14 @@ if(E.damage > (E.min_bruised_damage + E.min_broken_damage) / 2) if(!(E.status & ORGAN_ROBOT)) to_chat(src, "Your eyes start to burn badly!") - else //snowflake conditions piss me off for the record to_chat(src, "The flash blinds you!") - else if(E.damage >= E.min_broken_damage) to_chat(src, "You can't see anything!") - else to_chat(src, "Your eyes are really starting to hurt. This can't be good for you!") - return 1 else if(damage == 0) // just enough protection @@ -369,7 +358,6 @@ to_chat(src, "Something bright flashes in the corner of your vision!") - /mob/living/carbon/proc/tintcheck() return 0 @@ -399,17 +387,14 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(stat) to_chat(src, "You must be conscious to do this!") - return if(lying) to_chat(src, "You can't vent crawl while you're stunned!") - return if(buckled_mob) to_chat(src, "You can't vent crawl with [buckled_mob] on you!") - return var/obj/machinery/atmospherics/unary/vent_found @@ -454,7 +439,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, if(failed) to_chat(src, "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 system.") @@ -465,7 +449,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, to_chat(src, "This ventilation duct is not connected to anything!") - /mob/living/proc/add_ventcrawl(obj/machinery/atmospherics/starting_machine) if(!istype(starting_machine) || !starting_machine.returnPipenet()) return @@ -677,7 +660,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, no_mask = 1 if(no_mask) to_chat(usr, "[src] is not wearing a suitable mask or helmet!") - return if(do_mob(usr, src, POCKET_STRIP_DELAY)) @@ -692,7 +674,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, no_mask2 = 1 if(no_mask2) to_chat(usr, "[src] is not wearing a suitable mask or helmet!") - return internal = ITEM if(internals) @@ -820,7 +801,6 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, spawn (t) step(src, src.dir) stop_pulling() to_chat(src, "You slipped on the [description]!") - playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3) if (stun) Stun(stun) @@ -852,23 +832,17 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump, /mob/living/carbon/proc/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness) if(istype(toEat, /obj/item/weapon/reagent_containers/food/pill)) to_chat(src, "You [toEat.apply_method] [toEat].") - else if (fullness <= 50) to_chat(src, "You hungrily chew out a piece of [toEat] and gobble it!") - else if (fullness > 50 && fullness <= 150) to_chat(src, "You hungrily begin to eat [toEat].") - else if (fullness > 150 && fullness <= 350) to_chat(src, "You take a bite of [toEat].") - else if (fullness > 350 && fullness <= 550) to_chat(src, "You unwillingly chew a bit of [toEat].") - else if (fullness > (550 * (1 + overeatduration / 2000))) // The more you eat - the more you can eat to_chat(src, "You cannot force any more of [toEat] to go down your throat.") - return 0 return 1 diff --git a/code/modules/mob/living/carbon/give.dm b/code/modules/mob/living/carbon/give.dm index e7828ea93f0..13e8fe153ea 100644 --- a/code/modules/mob/living/carbon/give.dm +++ b/code/modules/mob/living/carbon/give.dm @@ -5,18 +5,15 @@ if(!iscarbon(target)) //something is bypassing the give arguments, no clue what, adding a sanity check JIC to_chat(usr, "Wait a second... \the [target] HAS NO HANDS! AHH!")//cheesy messages ftw - return if(target.stat == 2 || usr.stat == 2|| target.client == null) return var/obj/item/I if(!usr.hand && usr.r_hand == null) to_chat(usr, " You don't have anything in your right hand to give to [target.name]") - return if(usr.hand && usr.l_hand == null) to_chat(usr, " You don't have anything in your left hand to give to [target.name]") - return if(usr.hand) I = usr.l_hand @@ -26,7 +23,6 @@ return if((I.flags & NODROP) || (I.flags & ABSTRACT)) to_chat(usr, "That's not exactly something you can give.") - return if(target.r_hand == null || target.l_hand == null) switch(alert(target,"[usr] wants to give you \a [I]?",,"Yes","No")) @@ -35,21 +31,15 @@ return if(!Adjacent(usr)) to_chat(usr, " You need to stay in reaching distance while giving an object.") - to_chat(target, " [usr.name] moved too far away.") - return if((usr.hand && usr.l_hand != I) || (!usr.hand && usr.r_hand != I)) to_chat(usr, " You need to keep the item in your active hand.") - to_chat(target, " [usr.name] seem to have given up on giving \the [I.name] to you.") - return if(target.r_hand != null && target.l_hand != null) to_chat(target, " Your hands are full.") - to_chat(usr, " Their hands are full.") - return else usr.drop_item() @@ -69,4 +59,3 @@ target.visible_message(" [usr.name] tried to hand [I.name] to [target.name] but [target.name] didn't want it.") else to_chat(usr, " [target.name]'s hands are full.") - diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 19d6d93cd5f..657d40983de 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -754,7 +754,6 @@ if (!left_hand_good && !right_hand_good) to_chat(usr, "You need at least one hand in good working order to snap your fingers.") - return message = "[src] snaps \his fingers." @@ -771,9 +770,7 @@ // playsound(src.loc, 'sound/effects/fart.ogg', 50, 1, -3) //Admins still vote no to fun if(locate(/obj/item/weapon/storage/bible) in get_turf(src)) to_chat(viewers(src), "[src] farts on the Bible!") - to_chat(viewers(src), "A mysterious force smites [src]!") - var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) s.start() @@ -815,7 +812,6 @@ emotelist += "\nSlime people specific emotes :- squish(es)-(none)/mob" to_chat(src, emotelist) - else to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") @@ -823,7 +819,6 @@ - if(message) //Humans are special fucking snowflakes and have 735 lines of emotes, they get to handle their own emotes, not call the parent log_emote("[name]/[key] : [message]") diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 455fcbc2607..1eb906d5ec1 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -216,11 +216,9 @@ if(distance <= 1 && user.stat != 1) if(pulse == PULSE_NONE) to_chat(user, "[t_He] has no pulse[src.client ? "" : " and [t_his] soul has departed"]...") - else to_chat(user, "[t_He] has a pulse!") - msg += "" if(fire_stacks > 0) msg += "[t_He] [t_is] covered in something flammable.\n" @@ -488,7 +486,6 @@ to_chat(user, msg) - //Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records. /proc/hasHUD(mob/M as mob, hudtype) if(istype(M, /mob/living/carbon/human)) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 216beb2ca65..5d27605b13c 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -169,7 +169,6 @@ if(tmob.pinned.len || (M.pulling == tmob && (tmob.restrained() && !M.restrained()) && M.stat == CONSCIOUS)) if(!(world.time % 5)) //tmob is pinned to wall, or is restrained and pulled by a concious unrestrained human to_chat(src, "[tmob] is restrained, you cannot push past.") - now_pushing = 0 return 0 @@ -181,7 +180,6 @@ if(tmob.pulling == M && (M.restrained() && !tmob.restrained()) && tmob.stat == CONSCIOUS) if(!(world.time % 5)) to_chat(src, "[tmob] is restraining [M], you cannot push past.") - now_pushing = 0 return 0 @@ -208,7 +206,6 @@ if(ishuman(tmob) && (FAT in tmob.mutations)) if(prob(40) && !(FAT in src.mutations)) to_chat(src, "You fail to push [tmob]'s fat ass out of the way.") - now_pushing = 0 return @@ -759,7 +756,6 @@ heart_attack = 0 if(stat == CONSCIOUS) to_chat(src, "You feel your heart beating again!") - . = ..() @@ -776,7 +772,6 @@ var/slot = text2num(href_list["item"]) if(slot in check_obscured_slots()) to_chat(usr, "You can't reach that! Something is covering it.") - return if(href_list["pockets"]) @@ -789,12 +784,9 @@ if(pocket_item && !(pocket_item.flags&ABSTRACT)) if(pocket_item.flags & 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.") - else if(place_item && place_item.mob_can_equip(src, pocket_id, 1) && !(place_item.flags&ABSTRACT)) to_chat(usr, "You try to place [place_item] into [src]'s [pocket_side] pocket.") - delay_denominator = 4 else return @@ -818,7 +810,6 @@ if(!thief_mode) to_chat(src, "You feel your [pocket_side] pocket being fumbled with!") - if(href_list["set_sensor"]) if(istype(w_uniform, /obj/item/clothing/under)) var/obj/item/clothing/under/U = w_uniform @@ -879,7 +870,6 @@ if(!modified) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["secrecord"]) if(hasHUD(usr,"security")) var/perpname = "wot" @@ -910,7 +900,6 @@ if(!read) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["secrecordComment"]) if(hasHUD(usr,"security")) var/perpname = "wot" @@ -933,18 +922,14 @@ var/counter = 1 while(R.fields[text("com_[]", counter)]) to_chat(usr, text("[]", R.fields[text("com_[]", counter)])) - counter++ if (counter == 1) to_chat(usr, "No comment found") - to_chat(usr, "\[Add comment\]") - if(!read) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["secrecordadd"]) if(hasHUD(usr,"security")) var/perpname = "wot" @@ -1015,7 +1000,6 @@ if(!modified) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["medrecord"]) if(hasHUD(usr,"medical")) var/perpname = "wot" @@ -1047,7 +1031,6 @@ if(!read) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["medrecordComment"]) if(hasHUD(usr,"medical")) var/perpname = "wot" @@ -1070,18 +1053,14 @@ var/counter = 1 while(R.fields[text("com_[]", counter)]) to_chat(usr, text("[]", R.fields[text("com_[]", counter)])) - counter++ if (counter == 1) to_chat(usr, "No comment found") - to_chat(usr, "\[Add comment\]") - if(!read) to_chat(usr, "\red Unable to locate a data core entry for this person.") - if (href_list["medrecordadd"]) if(hasHUD(usr,"medical")) var/perpname = "wot" @@ -1236,7 +1215,6 @@ fail_msg = "There is no exposed flesh or thin material [target_zone == "head" ? "on their head" : "on their body"] to inject into." to_chat(user, "[fail_msg]") - /mob/living/carbon/human/proc/check_obscured_slots() var/list/obscured = list() @@ -1335,22 +1313,18 @@ germs++ if (germs == 100) to_chat(world, "Reached stage 1 in [ticks] ticks") - if (germs > 100) if (prob(10)) damage++ germs++ if (germs == 1000) to_chat(world, "Reached stage 2 in [ticks] ticks") - if (germs > 1000) damage++ germs++ if (germs == 2500) to_chat(world, "Reached stage 3 in [ticks] ticks") - to_chat(world, "Mob took [tdamage] tox damage") - */ //returns 1 if made bloody, returns 0 otherwise @@ -1409,7 +1383,6 @@ msg ="[O] in your [organ.name] twists painfully as you move." to_chat(src, msg) - organ.take_damage(rand(1,3), 0, 0) if(!(organ.status & ORGAN_ROBOT)) //There is no blood in protheses. organ.status |= ORGAN_BLEEDING @@ -1435,24 +1408,19 @@ if(src.pulse) to_chat(usr, "\blue [self ? "You have a" : "[src] has a"] pulse! Counting...") - else to_chat(usr, "\red [src] has no pulse!")//it is REALLY UNLIKELY that a dead person would check his own pulse - return to_chat(usr, "Don't move until counting is finished.") - var/time = world.time sleep(60) if(usr.l_move_time >= time) //checks if our mob has moved during the sleep() to_chat(usr, "You moved while counting. Try again.") - else to_chat(usr, "\blue [self ? "Your" : "[src]'s"] pulse is [src.get_pulse(GETPULSE_HAND)].") - /mob/living/carbon/human/proc/set_species(var/new_species, var/default_colour, var/delay_icon_update = 0) var/datum/species/oldspecies = species @@ -1560,13 +1528,11 @@ if (src.gloves) to_chat(src, "Your [src.gloves] are getting in the way.") - return var/turf/simulated/T = src.loc if (!istype(T)) //to prevent doodling out of mechs and lockers to_chat(src, "You cannot reach the floor.") - return var/direction = input(src,"Which way?","Tile selection") as anything in list("Here","North","South","East","West") @@ -1574,7 +1540,6 @@ T = get_step(T,text2dir(direction)) if (!istype(T)) to_chat(src, "You cannot doodle there.") - return var/num_doodles = 0 @@ -1582,7 +1547,6 @@ num_doodles++ if (num_doodles > 4) to_chat(src, "There is no space to write on!") - return var/max_length = bloody_hands * 30 //tweeter style @@ -1597,7 +1561,6 @@ message += "-" to_chat(src, "You ran out of blood to write with!") - var/obj/effect/decal/cleanable/blood/writing/W = new(T) W.message = message W.add_fingerprint(src) @@ -1610,7 +1573,6 @@ if(incapacitated()) to_chat(src, "You cannot change your monitor or optical display in your current state.") - return if(species.flags & ALL_RPARTS) //If they can have a fully cybernetic body... @@ -1649,7 +1611,6 @@ if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) to_chat(src, "You cannot leap in your current state.") - return var/list/choices = list() @@ -1669,7 +1630,6 @@ if(stat || paralysis || stunned || weakened || lying || restrained() || buckled) to_chat(src, "You cannot leap in your current state.") - return last_special = world.time + 75 @@ -1685,7 +1645,6 @@ if(!src.Adjacent(T)) to_chat(src, "\red You miss!") - return T.Weaken(5) @@ -1699,7 +1658,6 @@ if(l_hand) if(r_hand) to_chat(src, "\red You need to have one hand free to grab someone.") - return else use_hand = "right" @@ -1726,18 +1684,15 @@ if(stat || paralysis || stunned || weakened || lying) to_chat(src, "\red You cannot do that in your current state.") - return var/obj/item/weapon/grab/G = locate() in src if(!G || !istype(G)) to_chat(src, "\red You are not grabbing anyone.") - return if(G.state < GRAB_AGGRESSIVE) to_chat(src, "\red You must have an aggressive grab to gut your prey!") - return last_special = world.time + 50 @@ -1843,7 +1798,6 @@ if(prob(current_size * 5) && hand.w_class >= ((11-current_size)/2) && unEquip(hand)) step_towards(hand, src) to_chat(src, "\The [S] pulls \the [hand] from your grip!") - apply_effect(current_size * 3, IRRADIATE) if(mob_negates_gravity()) return @@ -1897,7 +1851,6 @@ /mob/living/carbon/human/selfFeed(var/obj/item/weapon/reagent_containers/food/toEat, fullness) if(!check_has_mouth()) to_chat(src, "Where do you intend to put \the [toEat]? You don't have a mouth!") - return 0 return ..() @@ -1905,7 +1858,6 @@ if(!check_has_mouth()) if(!((istype(toEat, /obj/item/weapon/reagent_containers/food/drinks) && (get_species() == "Machine")))) to_chat(user, "Where do you intend to put \the [toEat]? \The [src] doesn't have a mouth!") - return 0 return ..() @@ -1913,14 +1865,11 @@ if(!check_has_mouth()) if(!get_species() == "Machine") to_chat(src, "Where do you intend to put \the [src]? You don't have a mouth!") - return 0 else to_chat(src, "You pour a bit of liquid from [toDrink] into your connection port.") - else to_chat(src, "You swallow a gulp of [toDrink].") - return 1 /mob/living/carbon/human/can_track(mob/living/user) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index e24858cf552..25be2232432 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -1,12 +1,10 @@ /mob/living/carbon/human/attack_hand(mob/living/carbon/human/M as mob) if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return if(frozen) to_chat(M, "\red Do not touch Admin-Frozen people.") - return var/mob/living/carbon/human/H = M @@ -16,7 +14,6 @@ temp = H.organs_by_name["l_hand"] if(!temp || !temp.is_usable()) to_chat(H, "\red You can't use your hand.") - return ..() @@ -74,19 +71,15 @@ return 1 if(!H.check_has_mouth()) to_chat(H, "You don't have a mouth, you cannot perform CPR!") - return if(!check_has_mouth()) to_chat(H, "They don't have a mouth, you cannot perform CPR!") - return if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH) && !M.wear_mask.mask_adjusted)) to_chat(M, "Remove your mask!") - return 0 if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted)) to_chat(M, "Remove his mask!") - return 0 M.visible_message("\The [M] is trying to perform CPR on \the [src]!", \ @@ -100,15 +93,12 @@ "You perform CPR on \the [src].") to_chat(src, "You feel a breath of fresh air enter your lungs. It feels good.") - to_chat(M, "Repeat at least every 7 seconds.") - add_logs(src, M, "CPRed") return 1 else to_chat(M, "You need to stay still while performing CPR!") - if(I_GRAB) if(attacker_style && attacker_style.grab_act(H, src)) return 1 @@ -127,23 +117,18 @@ if(M.mind && M.mind.vampire && (M.mind in ticker.mode.vampires) && !M.mind.vampire.draining) if((head && (head.flags & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags & MASKCOVERSMOUTH))) to_chat(M, "Remove their mask!") - return 0 if((M.head && (M.head.flags & HEADCOVERSMOUTH)) || (M.wear_mask && (M.wear_mask.flags & MASKCOVERSMOUTH))) to_chat(M, "Remove your mask!") - return 0 if(mind && mind.vampire && (mind in ticker.mode.vampires)) to_chat(M, "Your fangs fail to pierce [src.name]'s cold flesh") - return 0 if(SKELETON in mutations) to_chat(M, "There is no blood in a skeleton!") - return 0 if(issmall(src) && !ckey) //Monkeyized humans are okay, humanized monkeys are okey, monkeys are not. to_chat(M, "Blood from a monkey is useless!") - return 0 //we're good to suck the blood, blaah M.mind.vampire.handle_bloodsucking(src) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index db8772c1334..c0e58942cfc 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -155,7 +155,6 @@ var/obj/item/organ/external/O = pick(candidates) O.mutate() to_chat(src, "Something is not right with your [O.name]...") - O.add_autopsy_data("Mutation", amount) return @@ -165,7 +164,6 @@ if(O.status & ORGAN_MUTATED) O.unmutate() to_chat(src, "Your [O.name] is shaped normally again.") - return @@ -176,7 +174,6 @@ to_chat(src, "Your [O.name] is shaped normally again.") - // Defined here solely to take species flags into account without having to recast at mob/living level. /mob/living/carbon/human/getOxyLoss() if(species.flags & NO_BREATHE) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 8ea0a6fc4e8..5f8e44f840a 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -177,14 +177,11 @@ emp_act return if(!(affecting.status & ORGAN_ROBOT)) to_chat(user, "\red That limb isn't robotic.") - return if(affecting.sabotaged) to_chat(user, "\red [src]'s [affecting.name] is already sabotaged!") - else to_chat(user, "\red You sneakily slide the card into the dataport on [src]'s [affecting.name] and short out the safeties.") - affecting.sabotaged = 1 return 1 @@ -202,7 +199,6 @@ emp_act src.loc.add_blood(src) --src.meatleft to_chat(user, "\red You hack off a chunk of meat from [src.name]") - if(!src.meatleft) src.attack_log += "\[[time_stamp()]\] Was chopped up into meat by [key_name(user)]" user.attack_log += "\[[time_stamp()]\] Chopped up [key_name(src)] into meat" @@ -217,7 +213,6 @@ emp_act var/obj/item/organ/external/affecting = get_organ(ran_zone(user.zone_sel.selecting)) if(!affecting || affecting.is_stump() || (affecting.status & ORGAN_DESTROYED)) to_chat(user, "They are missing that limb!") - return 1 var/hit_area = affecting.name diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 70effa20c9b..568de281cf1 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -8,7 +8,6 @@ var/obj/item/weapon/storage/S = H.get_inactive_hand() if(!I) to_chat(H, "You are not holding anything to equip.") - return if(istype(I, /obj/item/clothing/head/helmet/space/rig)) // If the item to be equipped is a rigid suit helmet @@ -16,7 +15,6 @@ if(C.rig_restrict_helmet) to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping. - return 0 if(H.equip_to_appropriate_slot(I)) @@ -40,7 +38,6 @@ to_chat(H, "\red You are unable to equip that.") - /mob/living/carbon/human/proc/equip_in_one_of_slots(obj/item/W, list/slots, del_on_fail = 1) for (var/slot in slots) if (equip_to_slot_if_possible(W, slots[slot], del_on_fail = 0)) @@ -306,7 +303,6 @@ uniform.attackby(W,src) else to_chat(src, "You are trying to equip this item to an unsupported inventory slot. Report this to a coder!") - return /mob/living/carbon/human/put_in_hands(obj/item/W) @@ -421,7 +417,6 @@ if(!(I.flags & ONESIZEFITSALL)) if(!disable_warning) to_chat(src, "You're too fat to wear the [I].") - return 0 switch(slot) @@ -469,7 +464,6 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 if(!(I.slot_flags & SLOT_BELT)) return @@ -514,7 +508,6 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 if(!(I.slot_flags & SLOT_ID)) return 0 @@ -525,7 +518,6 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 if(!(I.slot_flags & SLOT_PDA)) return 0 @@ -538,7 +530,6 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 if(I.slot_flags & SLOT_DENYPOCKET) return @@ -552,7 +543,6 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 if(I.slot_flags & SLOT_DENYPOCKET) return 0 @@ -567,17 +557,14 @@ if(!wear_suit) if(!disable_warning) to_chat(src, "You need a suit before you can attach this [name].") - return 0 if(!wear_suit.allowed) if(!disable_warning) to_chat(src, "You somehow have a suit with no defined allowed items for suit storage, stop that.") - return 0 if(I.w_class > 4) if(!disable_warning) to_chat(src, "The [name] is too big to attach.") - return 0 if(istype(I, /obj/item/device/pda) || istype(I, /obj/item/weapon/pen) || is_type_in_list(I, wear_suit.allowed)) return 1 @@ -604,13 +591,11 @@ if(!w_uniform) if(!disable_warning) to_chat(src, "You need a jumpsuit before you can attach this [name].") - return 0 var/obj/item/clothing/under/uniform = w_uniform if(uniform.accessories.len && !uniform.can_attach_accessory(src)) if(!disable_warning) to_chat(src, "You already have an accessory of this type attached to your [uniform].") - return 0 if(!(I.slot_flags & SLOT_TIE)) return 0 diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 7db1d26a8fc..c2ec65368a4 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -188,7 +188,6 @@ reagents.add_reagent("radium", rads/10) if( prob(10) ) to_chat(src, "You feel relaxed.") - return if (radiation > 100) @@ -197,7 +196,6 @@ Weaken(10) if(!lying) to_chat(src, "You feel weak.") - emote("collapse") if (radiation < 0) @@ -232,7 +230,6 @@ Weaken(3) if(!lying) to_chat(src, "You feel weak.") - emote("collapse") updatehealth() @@ -242,7 +239,6 @@ damage = 3 if(prob(1)) to_chat(src, "You mutate!") - randmutb(src) domutcheck(src,null) emote("gasp") @@ -254,7 +250,6 @@ damage = 5 if(prob(1)) to_chat(src, "You mutate!") - randmutb(src) domutcheck(src,null) emote("gasp") @@ -399,7 +394,6 @@ var/loc_temp = get_temperature(environment) // to_chat(world, "Loc temp: [loc_temp] - Body temp: [bodytemperature] - Fireloss: [getFireLoss()] - Thermal protection: [get_thermal_protection()] - Fire protection: [thermal_protection + add_fire_protection(loc_temp)] - Heat capacity: [environment_heat_capacity] - Location: [loc] - src: [src]") - //Body temperature is adjusted in two steps. Firstly your body tries to stabilize itself a bit. if(stat != 2) stabilize_temperature_from_calories() @@ -705,7 +699,6 @@ if(FAT in mutations) if(overeatduration < 100) to_chat(src, "You feel fit again!") - mutations.Remove(FAT) update_mutantrace(0) update_mutations(0) @@ -714,7 +707,6 @@ else if(overeatduration > 500) to_chat(src, "You suddenly feel blubbery!") - mutations.Add(FAT) update_mutantrace(0) update_mutations(0) @@ -897,19 +889,16 @@ if(remoteview_target.stat != CONSCIOUS) to_chat(src, "Your psy-connection grows too faint to maintain!") - isRemoteObserve = 0 if(PSY_RESIST in remoteview_target.mutations) to_chat(src, "Your mind is shut out!") - isRemoteObserve = 0 // Not on the station or mining? var/turf/temp_turf = get_turf(remoteview_target) if(!temp_turf in config.contact_levels) to_chat(src, "Your psy-connection grows too faint to maintain!") - isRemoteObserve = 0 if(remote_view) @@ -982,7 +971,6 @@ if(shock_stage == 10) to_chat(src, ""+pick("It hurts so much!", "You really need some painkillers..", "Dear god, the pain!")) - if(shock_stage >= 30) if(shock_stage == 30) custom_emote(1,"is having trouble keeping their eyes open.") eye_blurry = max(2, eye_blurry) @@ -991,24 +979,20 @@ if(shock_stage == 40) to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) - if(shock_stage >=60) if(shock_stage == 60) custom_emote(1,"falls limp.") if (prob(2)) to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) - Weaken(20) if(shock_stage >= 80) if (prob(5)) to_chat(src, ""+pick("The pain is excrutiating!", "Please, just end the pain!", "Your whole body is going numb!")) - Weaken(20) if(shock_stage >= 120) if (prob(2)) to_chat(src, ""+pick("You black out!", "You feel like you could die any moment now.", "You're about to lose consciousness.")) - Paralyse(5) if(shock_stage == 150) @@ -1099,7 +1083,6 @@ if(H.species && H.species.flags & NO_BREATHE) return //no puking if you can't smell! to_chat(H, "You smell something foul...") - H.fakevomit() /mob/living/carbon/human/proc/handle_heartbeat() @@ -1121,7 +1104,6 @@ heartbeat = 0 to_chat(src, sound('sound/effects/electheart.ogg',0,0,0,30))//Credit to GhostHack (www.ghosthack.de) for sound. - else heartbeat++ return @@ -1140,10 +1122,8 @@ heartbeat = 0 if(H.status & ORGAN_ASSISTED) to_chat(src, sound('sound/effects/pacemakebeat.ogg',0,0,0,50)) - else to_chat(src, sound('sound/effects/singlebeat.ogg',0,0,0,50)) - else heartbeat++ diff --git a/code/modules/mob/living/carbon/human/login.dm b/code/modules/mob/living/carbon/human/login.dm index 8d744a9728e..c9c23b31857 100644 --- a/code/modules/mob/living/carbon/human/login.dm +++ b/code/modules/mob/living/carbon/human/login.dm @@ -3,7 +3,6 @@ if(species && species.ventcrawler) to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") - update_pipe_vision() update_hud() return diff --git a/code/modules/mob/living/carbon/human/species/apollo.dm b/code/modules/mob/living/carbon/human/species/apollo.dm index 7c2302a356a..a7735a00db9 100644 --- a/code/modules/mob/living/carbon/human/species/apollo.dm +++ b/code/modules/mob/living/carbon/human/species/apollo.dm @@ -51,10 +51,8 @@ for(var/mob/living/carbon/C in living_mob_list) if(C.get_int_organ(/obj/item/organ/internal/wryn/hivenode)) to_chat(C, "Your antennae tingle as you are overcome with pain...") - to_chat(C, "It feels like part of you has died.") - /datum/species/wryn/handle_attack_hand(var/mob/living/carbon/human/H, var/mob/living/carbon/human/M) if(M.a_intent == I_HARM) if(H.handcuffed) @@ -64,7 +62,6 @@ M.visible_message("[M] begins to violently pull off [H]'s antennae.") to_chat(H, "[M] grips your antennae and starts violently pulling!") - do_after(H, 250, target = src) if(p_loc == M.loc && p_loc_m == H.loc) var/obj/item/organ/internal/wryn/hivenode/node = new /obj/item/organ/internal/wryn/hivenode @@ -72,11 +69,8 @@ node.remove(H) node.loc = M.loc to_chat(M, "You hear a loud crunch as you mercilessly pull off [H]'s antennae.") - to_chat(H, "You hear a loud crunch as your antennae is ripped off your head by [M].") - to_chat(H, "It's so quiet...") - H.h_style = "Bald" H.update_hair() diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index 5a56b6b508e..5bced02a651 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -113,7 +113,6 @@ H.equip_or_collect(new helm(H), slot_head) H.equip_or_collect(new/obj/item/weapon/tank/plasma/plasmaman(H), tank_slot) // Bigger plasma tank from Raggy. to_chat(H, "You are now running on plasma internals from the [H.s_store] in your [tank_slot_name]. You must breathe plasma in order to survive, and are extremely flammable.") - H.internal = H.get_item_by_slot(tank_slot) if (H.internals) H.internals.icon_state = "internal1" @@ -193,12 +192,10 @@ if(breath.temperature < cold_level_1) if(prob(20)) to_chat(src, "\red You feel your face freezing and an icicle forming in your lungs!") - else if(breath.temperature > heat_level_1) if(prob(20)) to_chat(src, "\red You feel your face burning and a searing heat in your lungs!") - switch(breath.temperature) if(-INFINITY to cold_level_3) H.apply_damage(COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold") @@ -226,7 +223,6 @@ if(!istype(H.wear_suit, /obj/item/clothing/suit/space/eva/plasmaman) || !istype(H.head, /obj/item/clothing/head/helmet/space/eva/plasmaman)) to_chat(H, "Your body reacts with the atmosphere and bursts into flame!") - H.adjust_fire_stacks(0.5) H.IgniteMob() diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 1c7d2b258b2..f810be86382 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -289,14 +289,12 @@ if(breath.temperature < cold_level_1) if(prob(20)) to_chat(H, "\red You feel your face freezing and an icicle forming in your lungs!") - else if(breath.temperature > heat_level_1) if(prob(20)) to_chat(H, "\red You feel your face burning and a searing heat in your lungs!") - switch(breath.temperature) if(-INFINITY to cold_level_3) H.apply_damage(cold_env_multiplier*COLD_GAS_DAMAGE_LEVEL_3, BURN, "head", used_weapon = "Excessive Cold") diff --git a/code/modules/mob/living/carbon/human/species/station.dm b/code/modules/mob/living/carbon/human/species/station.dm index 633df4a8b98..56566b71a92 100644 --- a/code/modules/mob/living/carbon/human/species/station.dm +++ b/code/modules/mob/living/carbon/human/species/station.dm @@ -276,7 +276,6 @@ else H.equip_or_collect(new /obj/item/weapon/tank/emergency_oxygen/vox(H), slot_l_hand) to_chat(H, "You are now running on nitrogen internals from the [H.l_hand] in your hand. Your species finds oxygen toxic, so you must breathe nitrogen only.") - H.internal = H.l_hand if (H.internals) H.internals.icon_state = "internal1" @@ -445,20 +444,17 @@ if(!istype(S)) if(!silent) to_chat(src, "You're not a slime person!") - return if(src in S.recolor_list) S.recolor_list -= src if(!silent) to_chat(src, "You adjust your internal chemistry to filter out pigments from things you consume.") - else S.recolor_list += src if(!silent) to_chat(src, "You adjust your internal chemistry to permit pigments in chemicals you consume to tint you.") - /mob/living/carbon/human/verb/toggle_recolor_verb() set category = "IC" set name = "Toggle Reagent Recoloring" @@ -478,12 +474,10 @@ if(stat || paralysis || stunned) to_chat(src, "You cannot regenerate missing limbs in your current state.") - return if(nutrition < SLIMEPERSON_MINHUNGER) to_chat(src, "You're too hungry to regenerate a limb!") - return var/list/missing_limbs = list() @@ -500,7 +494,6 @@ if(!missing_limbs.len) to_chat(src, "You're not missing any limbs!") - return var/limb_select = input(src, "Choose a limb to regrow", "Limb Regrowth") as null|anything in missing_limbs @@ -510,12 +503,10 @@ if(do_after(src, SLIMEPERSON_REGROWTHDELAY, needhand=0, target = src)) if(stat || paralysis || stunned) to_chat(src, "You cannot regenerate missing limbs in your current state.") - return if(nutrition < SLIMEPERSON_MINHUNGER) to_chat(src, "You're too hungry to regenerate a limb!") - return var/obj/item/organ/external/O = organs_by_name[chosen_limb] @@ -525,11 +516,9 @@ if(istype(O)) if(!O.is_stump()) to_chat(src, "Your limb has already been replaced in some way!") - return else to_chat(src, "You distribute the damaged tissue around your body, out of the way of your new pseudopod!") - var/obj/item/organ/external/doomedStump = O stored_brute = doomedStump.brute_dam stored_burn = doomedStump.burn_dam @@ -541,7 +530,6 @@ var/obj/item/organ/external/potential_parent = organs_by_name[initial(limb_path.parent_organ)] if(!istype(potential_parent) || potential_parent.is_stump()) to_chat(src, "You've lost the organ that you've been growing your new part on!") - return // No rayman for you // Grah this line will leave a "not used" warning, in spite of the fact that the new() proc WILL do the thing. // Bothersome. @@ -556,7 +544,6 @@ visible_message("[src] finishes regrowing their missing [new_limb]!", "You finish regrowing your [limb_select]") else to_chat(src, "You need to hold still in order to regrow a limb!") - return #undef SLIMEPERSON_HUNGERCOST diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index e62ea67602b..f37cd16a5a3 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -643,7 +643,6 @@ var/global/list/damage_icon_parts = list() standing.icon = 'icons/mob/uniform_fat.dmi' else to_chat(src, "\red You burst out of \the [w_uniform]!") - unEquip(w_uniform) return else @@ -859,7 +858,6 @@ var/global/list/damage_icon_parts = list() standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]") else to_chat(src, "\red You burst out of \the [wear_suit]!") - unEquip(wear_suit) return else diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index fc12a861daf..43794bed7b8 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -279,7 +279,6 @@ var/total_health = (health - staminaloss) if(total_health <= config.health_threshold_softcrit && !stat) to_chat(src, "You're too exhausted to keep going...") - Weaken(5) setStaminaLoss(health - 2) return diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm index b63afe0b073..64838a1704d 100644 --- a/code/modules/mob/living/carbon/slime/emote.dm +++ b/code/modules/mob/living/carbon/slime/emote.dm @@ -14,7 +14,6 @@ if (src.client) if (client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot send IC messages (muted).") - return if (src.client.handle_spam_prevention(message,MUTE_IC)) return @@ -61,10 +60,8 @@ if ("help") //This is an exception to_chat(src, "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, custom, jiggle, light, moan, shiver, sway, twitch, vibrate") - else to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") - if ((message && src.stat == 0)) if (m_type & 1) for(var/mob/O in viewers(src, null)) diff --git a/code/modules/mob/living/carbon/slime/examine.dm b/code/modules/mob/living/carbon/slime/examine.dm index 9b1ff32b05f..7d2e2d5e62c 100644 --- a/code/modules/mob/living/carbon/slime/examine.dm +++ b/code/modules/mob/living/carbon/slime/examine.dm @@ -42,4 +42,3 @@ msg += "*---------*" to_chat(user, msg) - diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm index 4c17c2f3f20..d0ced0684a3 100644 --- a/code/modules/mob/living/carbon/slime/powers.dm +++ b/code/modules/mob/living/carbon/slime/powers.dm @@ -7,7 +7,6 @@ if(stat) to_chat(src, "I must be conscious to do this...") - return var/list/choices = list() @@ -27,29 +26,22 @@ for(var/mob/living/carbon/slime/met in view()) if(met.Victim == M && met != src) to_chat(src, "The [met.name] is already feeding on this subject...") - return to_chat(src, "\blue I have latched onto the subject and begun feeding...") - to_chat(M, "\red The [src.name] has latched onto your head!") - Feedon(M) else to_chat(src, "This subject does not have a strong enough life energy...") - else to_chat(src, "This subject does not have an edible life energy...") - else to_chat(src, "I must not feed on my brothers...") - else to_chat(src, "This subject does not have an edible life energy...") - /mob/living/carbon/slime/proc/Feedon(var/mob/living/M) Victim = M src.loc = M.loc @@ -155,24 +147,20 @@ if(client) to_chat(src, "This subject does not have a strong enough life energy anymore...") - else M.canmove = 1 if(client) to_chat(src, "I have stopped feeding...") - else if(client) to_chat(src, "I have stopped feeding...") - Victim = null /mob/living/carbon/slime/proc/Feedstop() if(Victim) if(Victim.client) to_chat(Victim, "[src] has let go of your head!") - Victim = null /mob/living/carbon/slime/proc/UpdateFeed(var/mob/M) @@ -187,7 +175,6 @@ if(stat) to_chat(src, "I must be conscious to do this...") - return if(!is_adult) if(amount_grown >= 10) @@ -198,25 +185,21 @@ name = text("[colour] [is_adult ? "adult" : "baby"] slime ([number])") else to_chat(src, "I am not ready to evolve yet...") - else to_chat(src, "I have already evolved...") - /mob/living/carbon/slime/verb/Reproduce() set category = "Slime" set desc = "This will make you split into four Slimes." if(stat) to_chat(src, "I must be conscious to do this...") - return if(is_adult) if(amount_grown >= 10) if(stat) to_chat(src, "I must be conscious to do this...") - return var/list/babies = list() @@ -244,7 +227,5 @@ qdel(src) else to_chat(src, "I am not ready to reproduce yet...") - else to_chat(src, "I am not old enough to reproduce yet...") - diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 223f924b63a..532f6a4aba0 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -233,7 +233,6 @@ /mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (Victim) return // can't attack while eating! @@ -295,12 +294,10 @@ /mob/living/carbon/slime/attack_hand(mob/living/carbon/human/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return ..() @@ -375,7 +372,6 @@ return else to_chat(M, "\red Not enough charge! ") - return */ @@ -424,12 +420,10 @@ /mob/living/carbon/slime/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return switch(M.a_intent) @@ -510,7 +504,6 @@ else Friends[user] = 1 to_chat(user, "You feed the slime the plasma. It chirps happily.") - var/obj/item/stack/sheet/mineral/plasma/S = W S.use(1) return @@ -518,7 +511,6 @@ attacked += 10 if(prob(25)) to_chat(user, "[W] passes right through [src]!") - return if(Discipline && prob(50)) // wow, buddy, why am I getting attacked?? Discipline = 0 @@ -603,5 +595,4 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 if(istype(toEat, /obj/item/weapon/reagent_containers/food/drinks)) return 1 to_chat(user, "This creature does not seem to have a mouth!") - return 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/superheroes.dm b/code/modules/mob/living/carbon/superheroes.dm index b96fe011f6b..d8f741928fd 100644 --- a/code/modules/mob/living/carbon/superheroes.dm +++ b/code/modules/mob/living/carbon/superheroes.dm @@ -54,7 +54,6 @@ to_chat(H, desc) - /datum/superheroes/owlman name = "Owlman" class = "Superhero" @@ -151,86 +150,64 @@ for(var/mob/living/carbon/human/target in targets) if(ticker.mode.greyshirts.len >= 3) to_chat(usr, "You have already recruited the maximum number of henchmen.") - if(!in_range(usr, target)) to_chat(usr, "You need to be closer to enthrall [target].") - charge_counter = charge_max return if(!target.ckey) to_chat(usr, "The target has no mind.") - charge_counter = charge_max return if(target.stat) to_chat(usr, "The target must be conscious.") - charge_counter = charge_max return if(!ishuman(target)) to_chat(usr, "You can only recruit humans.") - charge_counter = charge_max return if(target.mind.assigned_role != "Civilian") to_chat(usr, "You can only recruit Civilians.") - if(recruiting) to_chat(usr, "You are already recruiting!") - charge_counter = charge_max return recruiting = 1 to_chat(usr, "This target is valid. You begin the recruiting process.") - to_chat(target, "[usr] focuses in concentration. Your head begins to ache.") - for(var/progress = 0, progress <= 3, progress++) switch(progress) if(1) to_chat(usr, "You begin by introducing yourself and explaining what you're about.") - usr.visible_message("[usr]'s introduces himself and explains his plans.") if(2) to_chat(usr, "You begin the recruitment of [target].") - usr.visible_message("[usr] leans over towards [target], whispering excitedly as he gives a speech.") to_chat(target, "You feel yourself agreeing with [usr], and a surge of loyalty begins building.") - target.Weaken(12) sleep(20) if(isloyal(target)) to_chat(usr, "They are enslaved by Nanotrasen. You feel their interest in your cause wane and disappear.") - usr.visible_message("[usr] stops talking for a moment, then moves back away from [target].") to_chat(target, "Your loyalty implant activates and a sharp pain reminds you of your loyalties to Nanotrasen.") - return if(3) to_chat(usr, "You begin filling out the application form with [target].") - usr.visible_message("[usr] pulls out a pen and paper and begins filling an application form with [target].") to_chat(target, "You are being convinced by [usr] to fill out an application form to become a henchman.")//Ow the edge - if(!do_mob(usr, target, 100)) //around 30 seconds total for enthralling, 45 for someone with a loyalty implant to_chat(usr, "The enrollment process has been interrupted - you have lost the attention of [target].") - to_chat(target, "You move away and are no longer under the charm of [usr]. The application form is null and void.") - recruiting = 0 return recruiting = 0 to_chat(usr, "You have recruited [target] as your henchman!") - to_chat(target, "You have decided to enroll as a henchman for [usr]. You are now part of the feared 'Greyshirts'.") - to_chat(target, "You must follow the orders of [usr], and help him succeed in his dastardly schemes.") - to_chat(target, "You may not harm other Greyshirt or [usr]. However, you do not need to obey other Greyshirts.") - ticker.mode.greyshirts += target.mind target.set_species("Human") target.h_style = "Bald" diff --git a/code/modules/mob/living/default_language.dm b/code/modules/mob/living/default_language.dm index 154b64611c9..f6c9c3abc0e 100644 --- a/code/modules/mob/living/default_language.dm +++ b/code/modules/mob/living/default_language.dm @@ -7,10 +7,8 @@ if(language) to_chat(src, "You will now speak [language] if you do not specify a language when speaking.") - else to_chat(src, "You will now speak whatever your standard default language is if you do not specify one when speaking.") - default_language = language // Silicons can't neccessarily speak everything in their languages list @@ -23,7 +21,5 @@ if(default_language) to_chat(src, "You are currently speaking [default_language] by default.") - else to_chat(src, "Your current default language is your species or mob type default.") - diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 69753f5694c..ae101b15c5d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -68,7 +68,6 @@ updatehealth() to_chat(src, "You have given up life and succumbed to death.") - /mob/living/proc/InCritical() return (src.health < 0 && src.health > -95.0 && stat == UNCONSCIOUS) @@ -94,7 +93,6 @@ /mob/living/proc/burn_skin(burn_amount) if(istype(src, /mob/living/carbon/human)) // to_chat(world, "DEBUG: burn_skin(), mutations=[mutations]") - if (RESIST_HEAT in src.mutations) //fireproof return 0 var/mob/living/carbon/human/H = src //make this damage method divide the damage to be done among all the body parts, then burn each body part for that much damage. will have better effect then just randomly picking a body part @@ -127,7 +125,6 @@ temperature = desired // if(istype(src, /mob/living/carbon/human)) // to_chat(world, "[src] ~ [src.bodytemperature] ~ [temperature]") - return temperature @@ -421,14 +418,11 @@ if(config.allow_Metadata) if(client) to_chat(usr, "[src]'s Metainfo:
[client.prefs.metadata]") - else to_chat(usr, "[src] does not have any stored infomation!") - else to_chat(usr, "OOC Metadata is not supported by this server!") - return /mob/living/Move(atom/newloc, direct) @@ -577,10 +571,8 @@ var/mob/living/captive_brain/H = src to_chat(H, "\red You begin doggedly resisting the parasite's control (this will take approximately sixty seconds).") - to_chat(B.host, "\red You feel the captive mind of [src] begin to resist your control.") - spawn(rand(350,450)+B.host.brainloss) if(!B || !B.controlling) @@ -588,10 +580,8 @@ B.host.adjustBrainLoss(rand(5,10)) to_chat(H, "\red With an immense exertion of will, you regain control of your body!") - to_chat(B.host, "\red You feel control of the host brain ripped from your grasp, and retract your probosci before the wild neural impulses can damage you.") - B.detatch() verbs -= /mob/living/carbon/proc/release_control @@ -644,7 +634,6 @@ C.last_special = world.time + CLICK_CD_BREAKOUT to_chat(C, "\red You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stay still)") - for(var/mob/O in viewers(L)) O.show_message("\red [usr] attempts to unbuckle themself!", 1) @@ -655,7 +644,6 @@ for(var/mob/O in viewers(C)) O.show_message("\red [usr] manages to unbuckle themself!", 1) to_chat(C, "\blue You successfully unbuckle yourself.") - C.buckled.user_unbuckle_mob(C,C) else @@ -699,7 +687,6 @@ displaytime = 5 to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)") - for(var/mob/O in viewers(CM)) O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1) spawn(0) @@ -712,7 +699,6 @@ to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.handcuffed].") - if(hulklien) CM.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" )) qdel(CM.handcuffed) @@ -745,7 +731,6 @@ to_chat(CM, "\red You attempt to remove \the [HC]. (This will take around [displaytime] [hulklien ? "seconds" : "minute[displaytime==1 ? "" : "s"]"] and you need to stand still)") - for(var/mob/O in viewers(CM)) O.show_message( "\red [usr] attempts to [hulklien ? "break" : "remove"] \the [HC]!", 1) @@ -758,7 +743,6 @@ to_chat(CM, "\blue You successfully [hulklien ? "break" : "remove"] \the [CM.legcuffed].") - if(!hulklien) CM.unEquip(CM.legcuffed) @@ -797,7 +781,6 @@ /mob/living/proc/Exhaust() to_chat(src, "You're too exhausted to keep going...") - Weaken(5) /mob/living/proc/get_visible_name() @@ -842,7 +825,6 @@ /mob/living/stripPanelUnequip(obj/item/what, mob/who, where, var/silent = 0) if(what.flags & NODROP) to_chat(src, "You can't remove \the [what.name], it appears to be stuck!") - return if(!silent) who.visible_message("[src] tries to remove [who]'s [what.name].", \ @@ -861,12 +843,10 @@ what = src.get_active_hand() if(what && (what.flags & NODROP)) to_chat(src, "You can't put \the [what.name] on [who], it's stuck to your hand!") - return if(what) if(!what.mob_can_equip(who, where, 1)) to_chat(src, "\The [what.name] doesn't fit in that place!") - return if(!silent) visible_message("[src] tries to put [what] on [who].") diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index 22a5fe7435e..b48aa36a64c 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -18,25 +18,19 @@ armor = max(0, armor - armour_penetration) if(penetrated_text) to_chat(src, "[penetrated_text]") - else to_chat(src, "Your armor was penetrated!") - if(armor >= 100) if(absorb_text) to_chat(src, "[absorb_text]") - else to_chat(src, "Your armor absorbs the blow!") - else if(armor > 0) if(soften_text) to_chat(src, "[soften_text]") - else to_chat(src, "Your armor softens the blow!") - return armor //if null is passed for def_zone, then this should return something appropriate for all zones (e.g. area effect damage) @@ -51,7 +45,6 @@ C.attack_self(src)//Should shut it off update_icons() to_chat(src, "\blue Your [C.name] was disrupted!") - Stun(2) //Armor @@ -249,7 +242,6 @@ for(var/obj/item/weapon/grab/G in src.grabbed_by) if(G.assailant == user) to_chat(user, "You already grabbed [src].") - return add_logs(src, user, "grabbed", addition="passively") @@ -257,7 +249,6 @@ var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(user, src) if(buckled) to_chat(user, "You cannot grab [src], \he is buckled in!") - if(!G) //the grab will delete itself in New if src is anchored return 0 user.put_in_active_hand(G) diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm index cd32fd22204..a64126db27a 100644 --- a/code/modules/mob/living/login.dm +++ b/code/modules/mob/living/login.dm @@ -9,7 +9,6 @@ //Vents if(ventcrawler) to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.") - //Should update regardless of if we can ventcrawl, since we can end up in pipes in other ways. update_pipe_vision() diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 6caf2fa042b..ef2cc344cdf 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -120,7 +120,6 @@ proc/get_radio_key_from_channel(var/channel) if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "\red You cannot speak in IC (Muted).") - return message = trim_strip_html_properly(message) @@ -162,7 +161,6 @@ proc/get_radio_key_from_channel(var/channel) if(is_muzzled()) to_chat(src, "You're muzzled and cannot speak!") - return message = trim_left(message) @@ -315,7 +313,6 @@ proc/get_radio_key_from_channel(var/channel) if(act == "help") return //except help, because help is handled individually to_chat(src, "\blue Unusable emote '[act]'. Say *help for a list.") - /mob/living/whisper(message as text) message = trim_strip_html_properly(message) @@ -341,7 +338,6 @@ proc/get_radio_key_from_channel(var/channel) if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot speak in IC (Muted).") - return if(stat) @@ -351,7 +347,6 @@ proc/get_radio_key_from_channel(var/channel) if(is_muzzled()) to_chat(src, "You're muzzled and cannot speak!") - return var/message_range = 1 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index d25f9a767c9..b037cf1aa75 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -202,18 +202,12 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/proc/on_mob_init() 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.") - to_chat(src, "While observing through a camera, you can use most (networked) devices which you can see, such as computers, APCs, intercoms, doors, etc.") - to_chat(src, "To use something, simply click on it.") - to_chat(src, "Use say :b to speak to your cyborgs through binary. Use say :h to speak from an active holopad.") - to_chat(src, "For department channels, use the following say commands:") - var/radio_text = "" for(var/i = 1 to common_radio.channels.len) var/channel = common_radio.channels[i] @@ -224,12 +218,10 @@ var/list/ai_verbs_default = list( to_chat(src, radio_text) - if (!(ticker && ticker.mode && (mind in ticker.mode.malf_ai))) show_laws() to_chat(src, "These laws may be changed by other players, or by you being the traitor.") - job = "AI" /mob/living/silicon/ai/rename_character(oldname, newname) @@ -339,7 +331,6 @@ var/list/ai_verbs_default = list( else icon_state = "ai" //else // to_chat(usr, "You can only change your display once!") - //return @@ -368,7 +359,6 @@ var/list/ai_verbs_default = list( if(message_cooldown) to_chat(src, "Please allow one minute to pass between announcements.") - return var/input = input(usr, "Please write a message to announce to the station crew.", "A.I. Announcement") as message|null @@ -430,7 +420,6 @@ var/list/ai_verbs_default = list( to_chat(src, "[anchored ? "You are now anchored." : "You are now unanchored."]") - /mob/living/silicon/ai/update_canmove() return 0 @@ -512,7 +501,6 @@ var/list/ai_verbs_default = list( else to_chat(src, "Unable to locate the holopad.") - if(href_list["say_word"]) play_vox_word(href_list["say_word"], null, src) return @@ -523,7 +511,6 @@ var/list/ai_verbs_default = list( ai_actual_track(target) else to_chat(src, "Target is not on or near any active cameras on the station.") - return if (href_list["trackbot"]) @@ -532,7 +519,6 @@ var/list/ai_verbs_default = list( ai_actual_track(target) else to_chat(src, "Target is not on or near any active cameras on the station.") - return if (href_list["callbot"]) //Command a bot to move to a selected location. @@ -541,7 +527,6 @@ var/list/ai_verbs_default = list( return //True if there is no bot found, the bot is manually emagged, or the AI is carded with wireless off. waypoint_mode = 1 to_chat(src, "Set your waypoint by clicking on a valid location free of obstructions.") - return if (href_list["interface"]) //Remotely connect to a bot! @@ -558,7 +543,6 @@ var/list/ai_verbs_default = list( var/obj/mecha/M = locate(href_list["ai_take_control"]) if(controlled_mech) to_chat(src, "You are already loaded into an onboard computer!") - return if(M) M.transfer_ai(AI_MECH_HACK,src, usr) //Called om the mech itself. @@ -570,13 +554,11 @@ var/list/ai_verbs_default = list( A.cameraFollow = target to_chat(A, "Now tracking [target.name] on camera.") - if (usr.machine == null) usr.machine = usr while (src.cameraFollow == target) to_chat(usr, "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb).") - sleep(40) continue @@ -593,12 +575,10 @@ var/list/ai_verbs_default = list( /mob/living/silicon/ai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return switch(M.a_intent) @@ -651,7 +631,6 @@ var/list/ai_verbs_default = list( set desc = "Wirelessly control various automatic robots." if(stat == 2) to_chat(src, "Critical error. System offline.") - return if(check_unable(AI_CHECK_WIRELESS | AI_CHECK_RADIO)) @@ -689,7 +668,6 @@ var/list/ai_verbs_default = list( else to_chat(src, "Selected location is not visible.") - /mob/living/silicon/ai/proc/call_bot(var/turf/waypoint) if(!Bot) @@ -697,7 +675,6 @@ var/list/ai_verbs_default = list( 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.") - return Bot.call_bot(src, waypoint) @@ -733,7 +710,6 @@ var/list/ai_verbs_default = list( if(usr.stat == 2) to_chat(usr, "You can't change your camera network because you are dead!") - return var/mob/living/silicon/ai/U = usr @@ -766,7 +742,6 @@ var/list/ai_verbs_default = list( U.eyeobj.setLoc(get_turf(C)) break to_chat(src, "\blue Switched to [network] camera network.") - //End of code by Mord_Sith @@ -782,7 +757,6 @@ var/list/ai_verbs_default = list( if(usr.stat == 2) to_chat(usr, "You cannot change your emotional status because you are dead!") - return if(check_unable()) @@ -859,7 +833,6 @@ var/list/ai_verbs_default = list( var/obj/machinery/power/apc/apc = src.loc if(!istype(apc)) to_chat(src, "\blue You are already in your Main Core.") - return apc.malfvacate() @@ -877,7 +850,6 @@ var/list/ai_verbs_default = list( if (!camera_light_on) to_chat(src, "Camera lights deactivated.") - for (var/obj/machinery/camera/C in lit_cameras) C.set_light(0) lit_cameras = list() @@ -888,7 +860,6 @@ var/list/ai_verbs_default = list( to_chat(src, "Camera lights activated.") - /mob/living/silicon/ai/proc/sensor_mode() set name = "Set Sensor Augmentation" set desc = "Augment visual feed with internal sensor overlays." @@ -905,7 +876,6 @@ var/list/ai_verbs_default = list( arrivalmsg = newmsg to_chat(usr, "The arrival message has been successfully changed.") - // Handled camera lighting, when toggled. // It will get the nearest camera from the eyeobj, lighting it. @@ -961,7 +931,6 @@ var/list/ai_verbs_default = list( return to_chat(src, "Accessing Subspace Transceiver control...") - if (src.aiRadio) src.aiRadio.interact(src) @@ -974,15 +943,12 @@ var/list/ai_verbs_default = list( var/obj/item/weapon/card/id/id = H.wear_id if(istype(id) && id.is_untrackable()) to_chat(src, "Unable to locate an airlock") - return if(H.digitalcamo) to_chat(src, "Unable to locate an airlock") - return if (!near_camera(target)) to_chat(src, "Target is not near any active cameras.") - return var/obj/machinery/door/airlock/tobeopened var/dist = -1 @@ -991,53 +957,42 @@ var/list/ai_verbs_default = list( if(dist < 0) dist = get_dist(D, target) // to_chat(world, dist) - tobeopened = D else if(dist > get_dist(D, target)) dist = get_dist(D, target) // to_chat(world, dist) - tobeopened = D // to_chat(world, "found [tobeopened.name] closer") - else // to_chat(world, "[D.name] not close enough | [get_dist(D, target)] | [dist]") - if(tobeopened) switch(alert(src, "Do you want to open \the [tobeopened] for [target]?","Doorknob_v2a.exe","Yes","No")) if("Yes") var/nhref = "src=\ref[tobeopened];aiEnable=7" tobeopened.Topic(nhref, params2list(nhref), tobeopened, 1) to_chat(src, "\blue You've opened \the [tobeopened] for [target].") - if("No") to_chat(src, "\red You deny the request.") - else to_chat(src, "\red You've failed to open an airlock for [target]") - return /mob/living/silicon/ai/proc/check_unable(var/flags = 0) if(stat == DEAD) to_chat(usr, "You are dead!") - return 1 if(lacks_power()) to_chat(usr, "Power systems failure!") - return 1 if((flags & AI_CHECK_WIRELESS) && src.control_disabled) to_chat(usr, "Wireless control is disabled!") - return 1 if((flags & AI_CHECK_RADIO) && src.aiRadio.disabledAi) to_chat(src, "System Error - Transceiver Disabled!") - return 1 return 0 @@ -1051,12 +1006,10 @@ var/list/ai_verbs_default = list( if(!mind) to_chat(user, "No intelligence patterns detected.")//No more magical carding of empty cores, AI RETURN TO BODY!!!11 - return if (mind.special_role == "malfunction") //AI MALF!! to_chat(user, "ERROR: Remote transfer interface disabled.")//Do ho ho ho~ - return new /obj/structure/AIcore/deactivated(loc)//Spawns a deactivated terminal at AI location. aiRestorePowerRoutine = 0//So the AI initially has power. @@ -1064,10 +1017,8 @@ var/list/ai_verbs_default = list( aiRadio.disabledAi = 1 //No talking on the built-in radio for you either! loc = card//Throw AI into the card. 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.") - // Pass lying down or getting up to our pet human, if we're in a rig. /mob/living/silicon/ai/lay_down() set name = "Rest" diff --git a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm index d031aad02b0..d65e6e0d7d8 100644 --- a/code/modules/mob/living/silicon/ai/examine.dm +++ b/code/modules/mob/living/silicon/ai/examine.dm @@ -24,7 +24,6 @@ msg += "*---------*" to_chat(user, msg) - user.showLaws(src) diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index 3967c329a73..b18c011bb23 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -117,7 +117,6 @@ var/datum/cameranet/cameranet = new() // to_chat(world, "X1: [x1] - Y1: [y1] - X2: [x2] - Y2: [y2]") - for(var/x = x1; x <= x2; x += CHUNK_SIZE) for(var/y = y1; y <= y2; y += CHUNK_SIZE) if(chunkGenerated(x, y, T.z)) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index bbfb08c82d3..317aae2dd6b 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -102,7 +102,6 @@ src.eyeobj.loc = src.loc else to_chat(src, "ERROR: Eyeobj not found. Creating new eye...") - src.eyeobj = new(src.loc) src.eyeobj.ai = src src.eyeobj.name = "[src.name] (AI Eye)" // Give it a name @@ -117,4 +116,3 @@ return //won't work if dead acceleration = !acceleration to_chat(usr, "Camera acceleration has been toggled [acceleration ? "on" : "off"].") - diff --git a/code/modules/mob/living/silicon/ai/latejoin.dm b/code/modules/mob/living/silicon/ai/latejoin.dm index 512af50d6d6..585c484a73a 100644 --- a/code/modules/mob/living/silicon/ai/latejoin.dm +++ b/code/modules/mob/living/silicon/ai/latejoin.dm @@ -17,7 +17,6 @@ var/global/list/empty_playable_ai_cores = list() if(ticker && ticker.mode && ticker.mode.name == "AI malfunction") to_chat(usr, "You cannot use this verb in malfunction. If you need to leave, please adminhelp.") - return // Guard against misclicks, this isn't the sort of thing we want happening accidentally diff --git a/code/modules/mob/living/silicon/ai/laws.dm b/code/modules/mob/living/silicon/ai/laws.dm index e869eb7e654..74816aeeb89 100755 --- a/code/modules/mob/living/silicon/ai/laws.dm +++ b/code/modules/mob/living/silicon/ai/laws.dm @@ -12,7 +12,6 @@ who = src to_chat(who, "Obey these laws:") - src.laws_sanity_check() src.laws.show_laws(who) diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm index b47a155e51e..dabaf2c4153 100644 --- a/code/modules/mob/living/silicon/ai/life.dm +++ b/code/modules/mob/living/silicon/ai/life.dm @@ -19,7 +19,6 @@ if(malfhack) if(malfhack.aidisabled) to_chat(src, "ERROR: APC access disabled, hack attempt canceled.") - malfhacking = 0 malfhack = null @@ -49,12 +48,10 @@ if(aiRestorePowerRoutine == 2) to_chat(src, "Alert cancelled. Power has been restored without our assistance.") - aiRestorePowerRoutine = 0 clear_fullscreen("blind") else if(aiRestorePowerRoutine == 3) to_chat(src, "Alert cancelled. Power has been restored.") - aiRestorePowerRoutine = 0 clear_fullscreen("blind") @@ -73,35 +70,28 @@ if(!aiRestorePowerRoutine) aiRestorePowerRoutine = 1 to_chat(src, "You have lost power!") - if(!is_special_character(src)) set_zeroth_law("") spawn(20) to_chat(src, "Backup battery online. Scanners, camera, and radio interface offline. Beginning fault-detection.") - sleep(50) my_area = get_area(src) T = get_turf(src) if(my_area && my_area.power_equip && !istype(T, /turf/space)) to_chat(src, "Alert cancelled. Power has been restored without our assistance.") - aiRestorePowerRoutine = 0 return to_chat(src, "Fault confirmed: missing external power. Shutting down main control system to save power.") - sleep(20) to_chat(src, "Emergency control system online. Verifying connection to power network.") - sleep(50) T = get_turf(src) if(istype(T, /turf/space)) to_chat(src, "Unable to verify! No power connection detected!") - aiRestorePowerRoutine = 2 return to_chat(src, "Connection verified. Searching for APC in power network.") - sleep(50) my_area = get_area(src) @@ -122,14 +112,12 @@ to_chat(src, "Unable to locate APC!") else to_chat(src, "Lost connection with the APC!") - aiRestorePowerRoutine = 2 return if(my_area.power_equip) if (!istype(T, /turf/space)) to_chat(src, "Alert cancelled. Power has been restored without our assistance.") - aiRestorePowerRoutine = 0 clear_fullscreen("blind") return @@ -143,16 +131,13 @@ to_chat(src, "Power port upload access confirmed. Loading control program into APC power port software.") if(4) to_chat(src, "Transfer complete. Forcing APC to execute program.") - sleep(50) to_chat(src, "Receiving control information from APC.") - sleep(2) //bring up APC dialog aiRestorePowerRoutine = 3 theAPC.attack_ai(src) to_chat(src, "Here are your current laws:") - src.show_laws() //WHY THE FUCK IS THIS HERE sleep(50) theAPC = null diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index c82803adb11..d5315deaefb 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -31,7 +31,6 @@ var/const/VOX_PATH = "sound/vox_fem/" if(announcing_vox > world.time) to_chat(src, "Please wait [round((announcing_vox - world.time) / 10)] seconds.") - return var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", last_announcement) as text|null @@ -60,7 +59,6 @@ var/const/VOX_PATH = "sound/vox_fem/" if(incorrect_words.len) to_chat(src, "These words are not available on the announcement system: [english_list(incorrect_words)].") - return announcing_vox = world.time + VOX_DELAY @@ -86,10 +84,8 @@ var/const/VOX_PATH = "sound/vox_fem/" var/turf/T = get_turf(M) if(T && T.z == z_level && !isdeaf(M)) to_chat(M, voice) - else to_chat(only_listener, voice) - return 1 return 0 @@ -99,6 +95,5 @@ var/const/VOX_PATH = "sound/vox_fem/" var/list/vox_files = flist(VOX_PATH) for(var/file in vox_files) // to_chat(src, "Downloading [file]") - var/sound/S = sound("[VOX_PATH][file]") src << browse_rsc(S) diff --git a/code/modules/mob/living/silicon/laws.dm b/code/modules/mob/living/silicon/laws.dm index 0e0f34dd290..27e431e1675 100644 --- a/code/modules/mob/living/silicon/laws.dm +++ b/code/modules/mob/living/silicon/laws.dm @@ -20,7 +20,6 @@ if(tracking_entities) to_chat(src, "Internal camera is currently being accessed.") - /mob/living/silicon/proc/add_ion_law(var/law) laws_sanity_check() laws.add_ion_law(law) @@ -77,7 +76,6 @@ /mob/living/silicon/proc/dostatelaws(var/method, var/prefix, var/datum/ai_laws/laws) if(stating_laws[prefix]) to_chat(src, "[method]: Already stating laws using this communication method.") - return stating_laws[prefix] = 1 @@ -91,7 +89,6 @@ if(!can_state) to_chat(src, "[method]: Unable to state laws. Communication method unavailable.") - stating_laws[prefix] = 0 /mob/living/silicon/proc/statelaw(var/law) diff --git a/code/modules/mob/living/silicon/pai/emote.dm b/code/modules/mob/living/silicon/pai/emote.dm index 79986a486ec..8328290ba80 100644 --- a/code/modules/mob/living/silicon/pai/emote.dm +++ b/code/modules/mob/living/silicon/pai/emote.dm @@ -3,5 +3,4 @@ if ("help") to_chat(src, "ping, beep, buzz.") - ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/examine.dm b/code/modules/mob/living/silicon/pai/examine.dm index 26f8cafbf7e..814efb1899b 100644 --- a/code/modules/mob/living/silicon/pai/examine.dm +++ b/code/modules/mob/living/silicon/pai/examine.dm @@ -22,5 +22,4 @@ msg += "*---------*" to_chat(user, msg) - */ \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/life.dm b/code/modules/mob/living/silicon/pai/life.dm index 029d07e37d2..ac8e20238d3 100644 --- a/code/modules/mob/living/silicon/pai/life.dm +++ b/code/modules/mob/living/silicon/pai/life.dm @@ -10,7 +10,6 @@ silence_time = null to_chat(src, "Communication circuit reinitialized. Speech and messaging functionality restored.") - if(cable) if(get_dist(src, cable) > 1) var/turf/T = get_turf_or_move(loc) diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index a6a183eee20..82cc717dab9 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -164,7 +164,6 @@ src.silence_time = world.timeofday + 120 * 10 // Silence for 2 minutes to_chat(src, "Communication circuit overload. Shutting down and reloading communication circuits - speech and messaging functionality will be unavailable until the reboot is complete.") - if(prob(20)) var/turf/T = get_turf_or_move(src.loc) for (var/mob/M in viewers(T)) @@ -176,7 +175,6 @@ src.master = null src.master_dna = null to_chat(src, "You feel unbound.") - if(2) var/command if(severity == 1) @@ -185,11 +183,9 @@ command = pick("Serve", "Kill", "Love", "Hate", "Disobey", "Devour", "Fool", "Enrage", "Entice", "Observe", "Judge", "Respect", "Disrespect", "Consume", "Educate", "Destroy", "Disgrace", "Amuse", "Entertain", "Ignite", "Glorify", "Memorialize", "Analyze") src.pai_law0 = "[command] your master." to_chat(src, "Pr1m3 d1r3c71v3 uPd473D.") - if(3) to_chat(src, "You feel an electric surge run through your circuitry and become acutely aware at how lucky you are that you can still feel at all.") - /mob/living/silicon/pai/ex_act(severity) ..() @@ -229,12 +225,10 @@ /mob/living/silicon/pai/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(src.loc, /turf) && istype(src.loc.loc, /area/start)) to_chat(M, "You cannot attack someone in the spawn area.") - return switch(M.a_intent) @@ -291,7 +285,6 @@ nanomanager.update_uis(src) to_chat(usr, "You reset your record-viewing software.") - /mob/living/silicon/pai/cancel_camera() set category = "pAI Commands" set name = "Cancel Camera View" @@ -311,7 +304,6 @@ if(usr.stat == 2) to_chat(usr, "You can't change your camera network because you are dead!") - return for (var/obj/machinery/camera/C in Cameras) @@ -323,7 +315,6 @@ src.network = input(usr, "Which network would you like to view?") as null|anything in cameralist to_chat(src, "\blue Switched to [src.network] camera network.") - //End of code by Mord_Sith */ @@ -351,12 +342,10 @@ if(src.loc != card) to_chat(src, "\red You are already in your mobile form!") - return if(world.time <= last_special) to_chat(src, "\red You must wait before folding your chassis out again!") - return last_special = world.time + 200 @@ -389,12 +378,10 @@ if(src.loc == card) to_chat(src, "\red You are already in your card form!") - return if(world.time <= last_special) to_chat(src, "\red You must wait before returning to your card form!") - return close_up() @@ -446,7 +433,6 @@ icon_state = resting ? "[chassis]_rest" : "[chassis]" to_chat(src, "You are now [resting ? "resting" : "getting up"]") - canmove = !resting //Overriding this will stop a number of headaches down the track. @@ -455,7 +441,6 @@ var/obj/item/stack/nanopaste/N = W if (stat == DEAD) to_chat(user, "\The [src] is beyond help, at this point.") - else if (getBruteLoss() || getFireLoss()) adjustBruteLoss(-15) adjustFireLoss(-15) @@ -466,7 +451,6 @@ else to_chat(user, "All [src.name]'s systems are nominal.") - return else if(W.force) visible_message("[user.name] attacks [src] with [W]!") @@ -529,7 +513,6 @@ return if(istype(AM,/obj/item)) to_chat(src, "You are far too small to pull anything!") - return /mob/living/silicon/pai/update_canmove() @@ -557,7 +540,6 @@ to_chat(user, msg) - /mob/living/silicon/pai/bullet_act(var/obj/item/projectile/Proj) ..(Proj) updatehealth() @@ -595,10 +577,8 @@ get_scooped(H) else to_chat(src, "You need to stay in reaching distance to be picked up.") - if("No") to_chat(src, "[H] decided not to pick you up.") - else if(Adjacent(H)) get_scooped(H) diff --git a/code/modules/mob/living/silicon/pai/personality.dm b/code/modules/mob/living/silicon/pai/personality.dm index f6f2e14f994..49b7e394d44 100644 --- a/code/modules/mob/living/silicon/pai/personality.dm +++ b/code/modules/mob/living/silicon/pai/personality.dm @@ -18,14 +18,10 @@ to_chat(F["name"], src.name) - to_chat(F["description"], src.description) - to_chat(F["role"], src.role) - to_chat(F["comments"], src.comments) - F["version"] << 1 return 1 diff --git a/code/modules/mob/living/silicon/pai/recruit.dm b/code/modules/mob/living/silicon/pai/recruit.dm index b5c616b4319..980e1bb09ee 100644 --- a/code/modules/mob/living/silicon/pai/recruit.dm +++ b/code/modules/mob/living/silicon/pai/recruit.dm @@ -352,7 +352,6 @@ var/datum/paiController/paiController // Global handler for pAI candidates if(player_old_enough_antag(O.client,ROLE_PAI)) if(check_recruit(O)) to_chat(O, "\blue A pAI card is looking for personalities. (Teleport | Sign Up)") - //question(O.client) proc/check_recruit(var/mob/dead/observer/O) if(jobban_isbanned(O, "pAI") || jobban_isbanned(O,"nonhumandept")) diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 6861110b920..2c7bc900d68 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,6 +1,5 @@ /mob/living/silicon/pai/say(var/msg) if(silence_time) to_chat(src, "Communication circuits remain uninitialized.") - else ..(msg) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 21c69edf5f0..e85345db226 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -20,7 +20,6 @@ var/global/list/default_pai_software = list() if(pai_software_by_key[P.id]) var/datum/pai_software/O = pai_software_by_key[P.id] to_chat(world, "pAI software module [P.name] has the same key as [O.name]!") - r = 0 continue pai_software_by_key[P.id] = P diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index cdebdc27d5c..9019a61b206 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -57,7 +57,6 @@ if(!M || !M.loc || count > 6) //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) to_chat(src, "You are not being carried by anyone!") - return 0 M = M.loc count++ @@ -70,16 +69,12 @@ v.show_message("[M] presses \his thumb against [P].", 3, "[P] makes a sharp clicking sound as it extracts DNA material from [M].", 2) var/datum/dna/dna = M.dna to_chat(P, "

[M]'s UE string : [dna.unique_enzymes]

") - if(dna.unique_enzymes == P.master_dna) to_chat(P, "DNA is a match to stored Master DNA.") - else to_chat(P, "DNA does not match stored Master DNA.") - else to_chat(P, "[M] does not seem like \he is going to provide a DNA sample willingly.") - return 1 /datum/pai_software/radio_config @@ -508,10 +503,8 @@ break if(T.loc) to_chat(AI, "Network Alert: Brute-force encryption crack in progress in [T.loc].") - else to_chat(AI, "Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.") - var/obj/machinery/door/D = cable.machine if(!istype(D)) hack_aborted = 1 @@ -710,7 +703,6 @@ if(!held || !held.loc || count > 6) //For a runtime where M ends up in nullspace (similar to bluespace but less colourful) to_chat(src, "You are not being carried by anyone!") - return 0 held = held.loc count++ diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm index 0c9087e5d99..c6ae0f57ddf 100644 --- a/code/modules/mob/living/silicon/robot/component.dm +++ b/code/modules/mob/living/silicon/robot/component.dm @@ -185,13 +185,9 @@ if(( (CLUMSY in user.mutations) || user.getBrainLoss() >= 60) && prob(50)) user.visible_message("[user] has analyzed the floor's vitals!", "You try to analyze the floor's vitals!") to_chat(user, "Analyzing Results for The floor:\n\t Overall Status: Healthy") - to_chat(user, "\t Damage Specifics: [0]-[0]-[0]-[0]") - to_chat(user, "Key: Suffocation/Toxin/Burns/Brute") - to_chat(user, "Body Temperature: ???") - return var/scan_type @@ -201,7 +197,6 @@ scan_type = "prosthetics" else to_chat(user, "You can't analyze non-robotic things!") - return user.visible_message("[user] has analyzed [M]'s components.","You have analyzed [M]'s components.") @@ -210,18 +205,13 @@ var/BU = M.getFireLoss() > 50 ? "[M.getFireLoss()]" : M.getFireLoss() var/BR = M.getBruteLoss() > 50 ? "[M.getBruteLoss()]" : M.getBruteLoss() to_chat(user, "Analyzing Results for [M]:\n\t Overall Status: [M.stat > 1 ? "fully disabled" : "[M.health]% functional"]") - to_chat(user, "\t Key: Electronics/Brute") - to_chat(user, "\t Damage Specifics: [BU] - [BR]") - if(M.timeofdeath && M.stat == DEAD) to_chat(user, "Time of Disable: [M.timeofdeath]") - var/mob/living/silicon/robot/H = M var/list/damaged = H.get_damaged_components(1,1,1) to_chat(user, "Localized Damage:") - if(length(damaged)>0) for(var/datum/robot_component/org in damaged) user.show_message(text("\t []: [][] - [] - [] - []", \ @@ -233,20 +223,15 @@ (org.powered) ? "Power ON" : "Power OFF"),1) else to_chat(user, "\t Components are OK.") - if(H.emagged && prob(5)) to_chat(user, "\t ERROR: INTERNAL SYSTEMS COMPROMISED") - if("prosthetics") var/mob/living/carbon/human/H = M to_chat(user, "Analyzing Results for \the [H]:") - to_chat(user, "Key: Electronics/Brute") - to_chat(user, "External prosthetics:") - var/organ_found if(H.internal_organs.len) for(var/obj/item/organ/external/E in H.organs) @@ -254,14 +239,10 @@ continue organ_found = 1 to_chat(user, "[E.name]: [round(E.brute_dam)] [round(E.burn_dam)]") - if(!organ_found) to_chat(user, "No prosthetics located.") - to_chat(user, "
") - to_chat(user, "Internal prosthetics:") - organ_found = null if(H.internal_organs.len) for(var/obj/item/organ/internal/O in H.internal_organs) @@ -269,9 +250,7 @@ continue organ_found = 1 to_chat(user, "[capitalize(O.name)]: [O.damage]") - if(!organ_found) to_chat(user, "No prosthetics located.") - src.add_fingerprint(user) diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm index 2ce6b4903f2..9a5c1a9f4d5 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone.dm @@ -109,12 +109,10 @@ if(istype(W, /obj/item/borg/upgrade/)) to_chat(user, "\red The maintenance drone chassis not compatible with \the [W].") - return else if (istype(W, /obj/item/weapon/crowbar)) to_chat(user, "The machine is hermetically sealed. You can't open the case.") - return else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) @@ -123,19 +121,16 @@ if(!config.allow_drone_spawn || emagged || health < -35) //It's dead, Dave. to_chat(user, "\red The interface is fried, and a distressing burned smell wafts from the robot's interior. You're not rebooting this one.") - return if(!allowed(usr)) to_chat(user, "\red Access denied.") - return var/delta = (world.time / 10) - last_reboot if(reboot_cooldown > delta) var/cooldown_time = round(reboot_cooldown - ((world.time / 10) - last_reboot), 1) to_chat(usr, "\red The reboot system is currently offline. Please wait another [cooldown_time] seconds.") - return user.visible_message("\red \the [user] swipes \his ID card through \the [src], attempting to reboot it.", "\red You swipe your ID card through \the [src], attempting to reboot it.") @@ -159,7 +154,6 @@ else to_chat(user, "\red Access denied.") - return ..() @@ -167,7 +161,6 @@ /mob/living/silicon/robot/drone/emag_act(user as mob) if(!client || stat == 2) to_chat(user, "\red There's not much point subverting this heap of junk.") - return if(!ishuman(user)) @@ -176,16 +169,12 @@ if(emagged) to_chat(src, "\red [user] attempts to load subversive software into you, but your hacked subroutined ignore the attempt.") - to_chat(user, "\red You attempt to subvert [src], but the sequencer has no effect.") - return to_chat(user, "\red You swipe the sequencer across [src]'s interface and watch its eyes flicker.") - to_chat(src, "\red You feel a sudden burst of malware loaded into your execute-as-root buffer. Your tiny brain methodically parses, loads and executes the script.") - message_admins("[key_name_admin(user)] emagged drone [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged drone [key_name(src)]. Laws overridden.") var/time = time2text(world.realtime,"hh:mm:ss") @@ -200,10 +189,8 @@ set_zeroth_law("Only [H.real_name] and people he designates as being such are Syndicate Agents.") to_chat(src, "Obey these laws:") - laws.show_laws(src) to_chat(src, "\red \b ALERT: [H.real_name] is your new master. Obey your new laws and his commands.") - return //DRONE LIFE/DEATH @@ -243,10 +230,8 @@ if(stat != 2) if(emagged) to_chat(src, "\red You feel something attempting to modify your programming, but your hacked subroutines are unaffected.") - else to_chat(src, "\red A reset-to-factory directive packet filters through your data connection, and you obediently modify your programming to suit it.") - full_law_reset() show_laws() @@ -254,10 +239,8 @@ if(stat != 2) if(emagged) to_chat(src, "\red You feel a system kill order percolate through your tiny brain, but it doesn't seem like a good idea to you.") - else to_chat(src, "\red You feel a system kill order percolate through your tiny brain, and you obediently destroy yourself.") - death() /mob/living/silicon/robot/drone/proc/full_law_reset() @@ -296,21 +279,14 @@ lawupdate = 0 to_chat(src, "Systems rebooted. Loading base pattern maintenance protocol... loaded.") - full_law_reset() to_chat(src, "
You are a maintenance drone, a tiny-brained robotic repair machine.") - to_chat(src, "You have no individual will, no personality, and no drives or urges other than your laws.") - to_chat(src, "Use ; to talk to other drones, and say to speak silently to your nearby fellows.") - to_chat(src, "Remember, you are lawed against interference with the crew. Also remember, you DO NOT take orders from the AI.") - to_chat(src, "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.") - to_chat(src, "Make sure crew members do not notice you..") - /* sprite["Default"] = "repairbot" sprite["Mk2 Mousedrone"] = "mk2" @@ -346,13 +322,11 @@ var/obj/item/O = AM if(O.w_class > 2) to_chat(src, "You are too small to pull that.") - return else ..() else to_chat(src, "You are too small to pull that.") - return /mob/living/silicon/robot/drone/add_robot_verbs() diff --git a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm index 346fa52a0f9..305c89e87cb 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_abilities.dm @@ -11,14 +11,12 @@ return to_chat(src, "\blue You configure your internal beacon, tagging yourself for delivery to '[tag]'.") - mail_destination = TAGGERLOCATIONS.Find(tag) //Auto flush if we use this verb inside a disposal chute. var/obj/machinery/disposal/D = src.loc if(istype(D)) to_chat(src, "\blue \The [D] acknowledges your signal.") - D.flush_count = D.flush_every_ticks return @@ -31,12 +29,10 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 to_chat(src, text("\blue You are now hiding.")) - else layer = MOB_LAYER to_chat(src, text("\blue You have stopped hiding.")) - /mob/living/silicon/robot/drone/verb/light() set name = "Light On/Off" set desc = "Activate a low power omnidirectional LED. Toggled on or off." diff --git a/code/modules/mob/living/silicon/robot/drone/drone_console.dm b/code/modules/mob/living/silicon/robot/drone/drone_console.dm index 7fc2aa863df..5e7077f7000 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_console.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_console.dm @@ -21,7 +21,6 @@ if(!allowed(user)) to_chat(user, "\red Access denied.") - return interact(user) @@ -56,7 +55,6 @@ if(!allowed(usr)) to_chat(usr, "\red Access denied.") - return if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon))) @@ -73,23 +71,19 @@ drone_call_area = t_area to_chat(usr, "\blue You set the area selector to [drone_call_area].") - else if (href_list["ping"]) to_chat(usr, "\blue You issue a maintenance request for all active drones, highlighting [drone_call_area].") - for(var/mob/living/silicon/robot/drone/D in world) if(D.client && D.stat == 0) to_chat(D, "-- Maintenance drone presence requested in: [drone_call_area].") - else if (href_list["resync"]) var/mob/living/silicon/robot/drone/D = locate(href_list["resync"]) if(D.stat != 2) to_chat(usr, "\red You issue a law synchronization directive for the drone.") - D.law_resync() else if (href_list["shutdown"]) @@ -98,7 +92,6 @@ if(D.stat != 2) to_chat(usr, "\red You issue a kill command for the unfortunate drone.") - message_admins("[key_name_admin(usr)] issued kill order for drone [key_name_admin(D)] from control console.") log_game("[key_name(usr)] issued kill order for [key_name(src)] from control console.") D.shut_down() @@ -114,12 +107,10 @@ dronefab = fab to_chat(usr, "\blue Drone fabricator located.") - return to_chat(usr, "\red Unable to locate drone fabricator.") - else if (href_list["toggle_fab"]) if(!dronefab) @@ -128,11 +119,9 @@ if(get_dist(src,dronefab) > 3) dronefab = null to_chat(usr, "\red Unable to locate drone fabricator.") - return dronefab.produce_drones = !dronefab.produce_drones to_chat(usr, "\blue You [dronefab.produce_drones ? "enable" : "disable"] drone production in the nearby fabricator.") - src.updateUsrDialog() \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 939a547da1f..b5026a882fe 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -73,7 +73,6 @@ if(!silent) to_chat(src.loc, "You drop \the [wrapped].") - wrapped.forceMove(get_turf(src)) wrapped = null @@ -127,14 +126,12 @@ //We can grab the item, finally. if(grab) to_chat(user, "You collect \the [I].") - I.forceMove(src) wrapped = I return else to_chat(user, "Your gripper cannot hold \the [target].") - else if(istype(target,/obj/machinery/power/apc)) var/obj/machinery/power/apc/A = target if(A.opened) @@ -203,17 +200,14 @@ to_chat(D, "You begin decompiling the other drone.") - if(!do_after(D,50, target = target)) to_chat(D, "You need to remain still while decompiling such a large object.") - return if(!M || !D) return to_chat(D, "You carefully and thoroughly decompile your downed fellow, storing as much of its resources as you can within yourself.") - qdel(M) new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -286,10 +280,8 @@ if(grabbed_something) to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") - else to_chat(user, "Nothing on \the [T] is useful to you.") - return //PRETTIER TOOL LIST. @@ -297,7 +289,6 @@ if(weapon_lock) to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") - return if(!module) diff --git a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm index 040632662a2..881fde51dee 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm @@ -50,7 +50,6 @@ if(produce_drones && drone_progress >= 100 && istype(user,/mob/dead) && config.allow_drone_spawn && count_drones() < config.max_maint_drones) to_chat(user, "
A drone is prepared. Select 'Join As Drone' from the Ghost tab to spawn as a maintenance drone.") - /obj/machinery/drone_fabricator/proc/count_drones() var/drones = 0 for(var/mob/living/silicon/robot/drone/D in world) @@ -87,7 +86,6 @@ if(!(config.allow_drone_spawn)) to_chat(src, "\red That verb is not currently permitted.") - return if (!src.stat) @@ -98,19 +96,16 @@ if(jobban_isbanned(src,"nonhumandept") || jobban_isbanned(src,"Drone")) to_chat(usr, "\red You are banned from playing drones and cannot spawn as a drone.") - return if(!ticker || ticker.current_state < 3) to_chat(src, "You can't join as a drone before the game starts!") - return var/drone_age = 14 // 14 days to play as a drone var/player_age_check = check_client_age(usr.client, drone_age) if(player_age_check && config.use_age_restriction_for_antags) to_chat(usr, "This role is not yet available to you. You need to wait another [player_age_check] days.") - return var/deathtime = world.time - src.timeofdeath @@ -119,7 +114,6 @@ var/mob/dead/observer/G = src if(G.has_enabled_antagHUD == 1 && config.antag_hud_restricted) to_chat(usr, "\blue Upon using the antagHUD you forfeited the ability to join the round.") - return if(G.started_as_observer == 1) joinedasobserver = 1 @@ -136,9 +130,7 @@ if (deathtime < 6000 && joinedasobserver == 0) to_chat(usr, "You have been dead for[pluralcheck] [deathtimeseconds] seconds.") - to_chat(usr, "You must wait 10 minutes to respawn as a drone!") - return for(var/obj/machinery/drone_fabricator/DF in world) @@ -147,7 +139,6 @@ if(DF.count_drones() >= config.max_maint_drones) to_chat(src, "\red There are too many active drones in the world for you to spawn.") - return if(DF.drone_progress >= 100) @@ -155,4 +146,3 @@ return to_chat(src, "\red There are no available drone spawn points, sorry.") - diff --git a/code/modules/mob/living/silicon/robot/drone/drone_say.dm b/code/modules/mob/living/silicon/robot/drone/drone_say.dm index 99a372f7f21..9ce0b6c027e 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_say.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_say.dm @@ -3,7 +3,6 @@ if (src.client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot send IC messages (muted).") - return 0 if (src.client.handle_spam_prevention(message,MUTE_IC)) return 0 @@ -32,13 +31,11 @@ if(D.client && D.local_transmit) to_chat(D, "[src] transmits, \"[message]\"") - for (var/mob/M in player_list) if (istype(M, /mob/new_player)) continue else if(M.stat == 2 && M.client && M.client.prefs.toggles & CHAT_GHOSTEARS) to_chat(M, "[src] transmits, \"[message]\"") - return 1 return ..(message, 0) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index 5d5b3cf0811..0c841f41207 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -145,7 +145,6 @@ else to_chat(src, "You are not THE LAW, pal.") - if("halt") if (istype(module,/obj/item/weapon/robot_module/security)) message = "[src]'s speakers skreech, \"Halt! Security!\"." @@ -155,7 +154,6 @@ else to_chat(src, "You are not security.") - if ("flip") m_type = 1 message = "[src] does a flip!" @@ -164,5 +162,4 @@ if ("help") to_chat(src, "salute, bow-(none)/mob, clap, flap, aflap, twitch, twitch_s, nod, deathgasp, glare-(none)/mob, stare-(none)/mob, look, beep, ping, \nbuzz, law, halt") - ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index d664fae834c..8d2af648463 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -45,5 +45,4 @@ msg += "\nIt is [pose]" to_chat(user, msg) - user.showLaws(src) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/inventory.dm b/code/modules/mob/living/silicon/robot/inventory.dm index 30c29527128..97b15ecda1a 100644 --- a/code/modules/mob/living/silicon/robot/inventory.dm +++ b/code/modules/mob/living/silicon/robot/inventory.dm @@ -44,7 +44,6 @@ return if(activated(O)) to_chat(src, "Already activated") - return if (is_component_functioning("power cell") && cell) if(istype(O, /obj/item/borg)) @@ -52,7 +51,6 @@ if(B.powerneeded) if((cell.charge * 100 / cell.maxcharge) < B.powerneeded) to_chat(src, "Not enough power to activate [B.name]!") - return if(!module_state_1) O.mouse_opacity = initial(O.mouse_opacity) @@ -80,7 +78,6 @@ sight_mode |= module_state_3:sight_mode else to_chat(src, "You need to disable a module first!") - src.update_icons() /mob/living/silicon/robot/proc/uneq_active() diff --git a/code/modules/mob/living/silicon/robot/laws.dm b/code/modules/mob/living/silicon/robot/laws.dm index 394e7f79bde..bc575831537 100644 --- a/code/modules/mob/living/silicon/robot/laws.dm +++ b/code/modules/mob/living/silicon/robot/laws.dm @@ -16,39 +16,30 @@ if(connected_ai.stat || connected_ai.control_disabled) to_chat(src, "AI signal lost, unable to sync laws.") - else lawsync() photosync() to_chat(src, "Laws synced with AI, be sure to note any changes.") - // TODO: Update to new antagonist system. if(mind && mind.special_role == "traitor" && mind.original == src) to_chat(src, "Remember, your AI does NOT share or know about your law 0.") - else to_chat(src, "No AI selected to sync laws with, disabling lawsync protocol.") - lawupdate = 0 to_chat(who, "Obey these laws:") - laws.show_laws(who) // TODO: Update to new antagonist system. if (mind && (mind.special_role == "traitor" && mind.original == src) && connected_ai) to_chat(who, "Remember, [connected_ai.name] is technically your master, but your objective comes first.") - else if (connected_ai) to_chat(who, "Remember, [connected_ai.name] is your master, other AIs can be ignored.") - else if (emagged) to_chat(who, "Remember, you are not required to listen to the AI.") - else to_chat(who, "Remember, you are not bound to any AI, you are not required to listen to them.") - /mob/living/silicon/robot/lawsync() laws_sanity_check() var/datum/ai_laws/master = connected_ai && lawupdate ? connected_ai.laws : null diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm index 010ffb676d7..d247d726003 100644 --- a/code/modules/mob/living/silicon/robot/life.dm +++ b/code/modules/mob/living/silicon/robot/life.dm @@ -30,7 +30,6 @@ if(B.powerneeded) if((cell.charge * 100 / cell.maxcharge) < B.powerneeded) to_chat(src, "Deactivating [B.name] due to lack of power!") - uneq_module(B) if(cell.charge <= 0) uneq_all() @@ -105,17 +104,14 @@ if(uneq_module(module_state_3)) to_chat(src, "SYSTEM ERROR: Module 3 OFFLINE.") - if(health < 0) if(uneq_module(module_state_2)) to_chat(src, "SYSTEM ERROR: Module 2 OFFLINE.") - if(health < -50) if(uneq_module(module_state_1)) to_chat(src, "CRITICAL ERROR: All modules OFFLINE.") - if(paralysis || stunned || weakened) stat = UNCONSCIOUS @@ -282,7 +278,6 @@ if(weaponlock_time <= 0) if(src.client) to_chat(src, "\red Weapon Lock Timed Out!") - weapon_lock = 0 weaponlock_time = 120 diff --git a/code/modules/mob/living/silicon/robot/photos.dm b/code/modules/mob/living/silicon/robot/photos.dm index 6fdee77418c..33f739c41c9 100644 --- a/code/modules/mob/living/silicon/robot/photos.dm +++ b/code/modules/mob/living/silicon/robot/photos.dm @@ -11,4 +11,3 @@ synced = 1 if(synced) to_chat(src, "Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI.") - diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 236b5f3316e..390ad8d07dc 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -248,7 +248,6 @@ var/list/robot_verbs_default = list( 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.") - ghostize() error("A borg has been destroyed, but its MMI lacked a brainmob, so the mind could not be transferred. Player: [ckey].") mmi = null @@ -268,7 +267,6 @@ var/list/robot_verbs_default = list( var/list/modules = list("Standard", "Engineering", "Medical", "Miner", "Janitor", "Service", "Security") if(security_level == (SEC_LEVEL_GAMMA || SEC_LEVEL_EPSILON) || crisis) to_chat(src, "\red Crisis mode active. Combat module available.") - modules+="Combat" if(ticker && ticker.mode && ticker.mode.name == "nations") var/datum/game_mode/nations/N = ticker.mode @@ -421,7 +419,6 @@ var/list/robot_verbs_default = list( if(!is_component_functioning("diagnosis unit")) to_chat(src, "\red Your self-diagnosis component isn't functioning.") - var/dat = self_diagnosis() src << browse(dat, "window=robotdiagnosis") @@ -446,12 +443,10 @@ var/list/robot_verbs_default = list( if(C.toggled) C.toggled = 0 to_chat(src, "\red You disable [C.name].") - else C.toggled = 1 to_chat(src, "\red You enable [C.name].") - /mob/living/silicon/robot/proc/sensor_mode() set name = "Set Sensor Augmentation" set desc = "Augment visual feed with internal sensor overlays." @@ -559,7 +554,6 @@ var/list/robot_verbs_default = list( if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(20)) to_chat(usr, "\red You fail to push [tmob]'s fat ass out of the way.") - now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -603,7 +597,6 @@ var/list/robot_verbs_default = list( to_chat(usr, "\blue You install the [W.name].") - return if (istype(W, /obj/item/weapon/weldingtool) && user.a_intent == I_HELP) @@ -611,7 +604,6 @@ var/list/robot_verbs_default = list( return if (!getBruteLoss()) to_chat(user, "Nothing to fix!") - return var/obj/item/weapon/weldingtool/WT = W user.changeNext_move(CLICK_CD_MELEE) @@ -623,14 +615,12 @@ var/list/robot_verbs_default = list( user.visible_message("\The [user] patches some dents on \the [src] with \the [WT].") else to_chat(user, "Need more welding fuel!") - return else if(istype(W, /obj/item/stack/cable_coil) && user.a_intent == I_HELP && (wiresexposed || istype(src,/mob/living/silicon/robot/drone))) if (!getFireLoss()) to_chat(user, "Nothing to fix!") - return var/obj/item/stack/cable_coil/coil = W adjustFireLoss(-30) @@ -643,21 +633,17 @@ var/list/robot_verbs_default = list( if(opened) if(cell) to_chat(user, "You close the cover.") - opened = 0 update_icons() else if(wiresexposed && wires.IsAllCut()) //Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob. if(!mmi) to_chat(user, "\The [src] has no brain to remove.") - return to_chat(user, "You jam the crowbar into the robot and begin levering [mmi].") - if(do_after(user,3 SECONDS, target = src)) to_chat(user, "You damage some parts of the chassis, but eventually manage to rip out [mmi]!") - var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc) C.l_leg = new/obj/item/robot_parts/l_leg(C) C.r_leg = new/obj/item/robot_parts/r_leg(C) @@ -684,7 +670,6 @@ var/list/robot_verbs_default = list( var/datum/robot_component/C = components[remove] var/obj/item/robot_parts/robot_component/I = C.wrapped to_chat(user, "You remove \the [I].") - if(istype(I)) I.brute = C.brute_damage I.burn = C.electronics_damage @@ -698,10 +683,8 @@ var/list/robot_verbs_default = list( else if(locked) to_chat(user, "The cover is locked and cannot be opened.") - else to_chat(user, "You open the cover.") - opened = 1 update_icons() @@ -709,17 +692,14 @@ var/list/robot_verbs_default = list( var/datum/robot_component/C = components["power cell"] if(wiresexposed) to_chat(user, "Close the panel first.") - else if(cell) to_chat(user, "There is a power cell already installed.") - else user.drop_item() W.loc = src cell = W to_chat(user, "You insert the power cell.") - C.installed = 1 C.wrapped = W C.install() @@ -734,11 +714,9 @@ var/list/robot_verbs_default = list( else to_chat(user, "You can't reach the wiring.") - else if(istype(W, /obj/item/weapon/screwdriver) && opened && !cell) // haxing wiresexposed = !wiresexposed to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") - update_icons() else if(istype(W, /obj/item/weapon/screwdriver) && opened && cell) // radio @@ -746,7 +724,6 @@ var/list/robot_verbs_default = list( radio.attackby(W,user)//Push it to the radio to let it handle everything else to_chat(user, "Unable to locate a radio.") - update_icons() else if(istype(W, /obj/item/device/encryptionkey/) && opened) @@ -755,46 +732,36 @@ var/list/robot_verbs_default = list( else to_chat(user, "Unable to locate a radio.") - else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card if(emagged)//still allow them to open the cover to_chat(user, "The interface seems slightly damaged") - if(opened) to_chat(user, "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 interface.") - update_icons() else to_chat(user, "\red 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 borgs internals!") - else if(!src.module && U.require_module) to_chat(user, "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!") - else if(!user.drop_item()) return if(U.action(src)) to_chat(user, "You apply the upgrade to [src].") - U.forceMove(src) else to_chat(user, "Upgrade error.") - else spark_system.start() return ..() @@ -806,18 +773,15 @@ var/list/robot_verbs_default = list( if(!opened)//Cover is closed if(locked) to_chat(user, "You emag the cover lock.") - locked = 0 else to_chat(user, "The cover is already unlocked.") - return if(opened)//Cover is open if(emagged) return//Prevents the X has hit Y with Z message also you cant emag them twice if(wiresexposed) to_chat(user, "You must close the panel first") - return else sleep(6) @@ -826,7 +790,6 @@ var/list/robot_verbs_default = list( src.hud_used.update_robot_modules_display() //Shows/hides the emag item if the inventory screen is already open. disconnect_from_ai() to_chat(user, "You emag [src]'s interface.") - // message_admins("[key_name_admin(user)] emagged cyborg [key_name_admin(src)]. Laws overridden.") log_game("[key_name(user)] emagged cyborg [key_name(src)]. Laws overridden.") clear_supplied_laws() @@ -836,30 +799,21 @@ var/list/robot_verbs_default = list( lawchanges.Add("[time] : [M.name]([M.key]) emagged [name]([key])") set_zeroth_law("Only [M.real_name] and people he designates as being such are Syndicate Agents.") to_chat(src, "\red ALERT: Foreign software detected.") - sleep(5) to_chat(src, "\red Initiating diagnostics...") - sleep(20) to_chat(src, "\red SynBorg v1.7 loaded.") - sleep(5) to_chat(src, "\red LAW SYNCHRONISATION ERROR") - sleep(5) to_chat(src, "\red Would you like to send a report to NanoTraSoft? Y/N") - sleep(10) to_chat(src, "\red > N") - sleep(20) to_chat(src, "\red ERRORERRORERROR") - to_chat(src, "Obey these laws:") - laws.show_laws(src) to_chat(src, "\red \b ALERT: [M.real_name] is your new master. Obey your new laws and his commands.") - if(src.module && istype(src.module, /obj/item/weapon/robot_module/miner)) for(var/obj/item/weapon/pickaxe/drill/cyborg/D in src.module.modules) qdel(D) @@ -885,16 +839,13 @@ var/list/robot_verbs_default = list( update_icons() to_chat(usr, "You unlock your cover.") - /mob/living/silicon/robot/attack_alien(mob/living/carbon/alien/humanoid/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if (istype(loc, /turf) && istype(loc.loc, /area/start)) to_chat(M, "No attacking people at spawn, you jackass.") - return switch(M.a_intent) @@ -997,7 +948,6 @@ var/list/robot_verbs_default = list( cell.add_fingerprint(user) user.put_in_active_hand(cell) to_chat(user, "You remove \the [cell].") - cell = null update_icons() diag_hud_set_borgcell() @@ -1083,7 +1033,6 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/proc/installed_modules() if(weapon_lock) to_chat(src, "\red Weapon lock active, unable to use modules! Count:[weaponlock_time]") - return if(!module) @@ -1171,10 +1120,8 @@ var/list/robot_verbs_default = list( contents -= O else to_chat(src, "Module isn't activated.") - else to_chat(src, "Module isn't activated") - installed_modules() return 1 @@ -1186,13 +1133,11 @@ var/list/robot_verbs_default = list( /mob/living/silicon/robot/proc/control_headlamp() if(stat || lamp_recharging) to_chat(src, "This function is currently offline.") - return //Some sort of magical "modulo" thing which somehow increments lamp power by 2, until it hits the max and resets to 0. lamp_intensity = (lamp_intensity+2) % (lamp_max+2) to_chat(src, "[lamp_intensity ? "Headlamp power set to Level [lamp_intensity/2]" : "Headlamp disabled."]") - update_headlamp() /mob/living/silicon/robot/proc/update_headlamp(var/turn_off = 0, var/cooldown = 100) @@ -1200,7 +1145,6 @@ var/list/robot_verbs_default = list( if(lamp_intensity && (turn_off || stat)) to_chat(src, "Your headlamp has been deactivated.") - lamp_intensity = 0 lamp_recharging = 1 spawn(cooldown) //10 seconds by default, if the source of the deactivation does not keep stat that long. @@ -1257,7 +1201,6 @@ var/list/robot_verbs_default = list( cleaned_human.update_inv_shoes(0,0) cleaned_human.clean_blood() to_chat(cleaned_human, "[src] cleans your face!") - return #undef BORG_CAMERA_BUFFER @@ -1296,7 +1239,6 @@ var/list/robot_verbs_default = list( if(R) R.UnlinkSelf() to_chat(R, "Buffers flushed and reset. Camera system shutdown. All systems operational.") - src.verbs -= /mob/living/silicon/robot/proc/ResetSecurityCodes /mob/living/silicon/robot/mode() @@ -1341,7 +1283,6 @@ var/list/robot_verbs_default = list( lockcharge = null else to_chat(src, "Something is badly wrong with the sprite selection. Harass a coder.") - icon_state = module_sprites[1] lockcharge = null return @@ -1359,21 +1300,17 @@ var/list/robot_verbs_default = list( else to_chat(src, "Your icon has been set. You now require a module reset to change it.") - /mob/living/silicon/robot/proc/notify_ai(var/notifytype, var/oldname, var/newname) if(!connected_ai) return switch(notifytype) if(1) //New Cyborg to_chat(connected_ai, "

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

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

NOTICE - Cyborg reclassification detected: [oldname] is now designated as [newname].
") - /mob/living/silicon/robot/proc/disconnect_from_ai() if(connected_ai) sync() // One last sync attempt @@ -1426,7 +1363,6 @@ var/list/robot_verbs_default = list( if(isnull(ckey) && !searching_for_ckey) searching_for_ckey = 1 to_chat(user, "Now checking for possible borgs.") - var/list/borg_candidates = pollCandidates("Do you want to play as a Nanotrasen Combat borg?") if(borg_candidates.len > 0 && isnull(ckey)) searching_for_ckey = 0 @@ -1439,11 +1375,9 @@ var/list/robot_verbs_default = list( else searching_for_ckey = 0 to_chat(user, "Unable to connect to Central Command. Please wait and try again later.") - return else to_chat(user, "[src] is already checking for possible borgs.") - return /mob/living/silicon/robot/syndicate @@ -1478,7 +1412,6 @@ var/list/robot_verbs_default = list( if(playstyle_string) to_chat(src, playstyle_string) - playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0) /mob/living/silicon/robot/syndicate/medical diff --git a/code/modules/mob/living/silicon/robot/robot_damage.dm b/code/modules/mob/living/silicon/robot/robot_damage.dm index 7b52c10f96a..54bc69b7020 100644 --- a/code/modules/mob/living/silicon/robot/robot_damage.dm +++ b/code/modules/mob/living/silicon/robot/robot_damage.dm @@ -9,9 +9,7 @@ var/mob/dead/observer/ghost = get_ghost() if(ghost) to_chat(ghost, "Your cyborg shell has been repaired, re-enter if you want to continue! (Verbs -> Ghost -> Re-enter corpse)") - to_chat(ghost, sound('sound/effects/genetics.ogg')) - return @@ -93,13 +91,11 @@ if(cell.charge <= 0) cell.charge = 0 to_chat(src, "\red Your shield has overloaded!") - else brute -= absorb_brute burn -= absorb_burn to_chat(src, "\red Your shield absorbs some of the impact!") - var/datum/robot_component/armour/A = get_armour() if(A) A.take_damage(brute,burn,sharp,edge) @@ -146,13 +142,11 @@ if(cell.charge <= 0) cell.charge = 0 to_chat(src, "\red Your shield has overloaded!") - else brute -= absorb_brute burn -= absorb_burn to_chat(src, "\red Your shield absorbs some of the impact!") - var/datum/robot_component/armour/A = get_armour() if(A) A.take_damage(brute,burn,sharp) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index 7ef838c4a18..13c48d03ac5 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -22,7 +22,6 @@ else mode = 1 to_chat(user, "Changed printing mode to '[mode == 2 ? "Rename Paper" : "Write Paper"]'") - playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) return diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm index 956e5927fcc..07ea4bfa0bb 100644 --- a/code/modules/mob/living/silicon/say.dm +++ b/code/modules/mob/living/silicon/say.dm @@ -9,7 +9,6 @@ if(message_mode) if(!is_component_functioning("radio")) to_chat(src, "Your radio isn't functional at this time.") - return 0 if(message_mode == "general") message_mode = null @@ -23,7 +22,6 @@ else if(message_mode) if (aiRadio.disabledAi || aiRestorePowerRoutine || stat) to_chat(src, "System Error - Transceiver Disabled.") - return 0 if(message_mode == "general") message_mode = null @@ -86,14 +84,12 @@ rendered_b = "[voice_name] [speaking.format_message(message_stars, verb)]" to_chat(src, "Holopad transmitted, [real_name] [speaking.format_message(message, verb)]")//The AI can "hear" its own message. - else rendered_a = "[name] [verb], \"[message]\"" rendered_b = "[voice_name] [verb], \"[message_stars]\"" to_chat(src, "Holopad transmitted, [real_name] [verb], \"[message]\"")//The AI can "hear" its own message. - for(var/mob/M in hearers(T.loc))//The location is the object, default distance. if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to. M.show_message(rendered_a, 2) @@ -103,7 +99,6 @@ This is another way of saying that we won't bother dealing with them.*/ else to_chat(src, "No holopad connected.") - return return 1 @@ -121,12 +116,10 @@ var/rendered = "[name] [message]" to_chat(src, "Holopad action relayed, [real_name] [message]") - for(var/mob/M in viewers(T.loc)) M.show_message(rendered, 2) else //This shouldn't occur, but better safe then sorry. to_chat(src, "No holopad connected.") - return return 1 diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index f7813d04b45..a49e79a59e7 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -75,9 +75,7 @@ Stun(3) flash_eyes(affect_silicon = 1) to_chat(src, "\red *BZZZT*") - to_chat(src, "\red Warning: Electromagnetic pulse detected.") - ..() @@ -87,7 +85,6 @@ /mob/living/silicon/can_inject(var/mob/user, var/error_msg) if(error_msg) to_chat(user, "Their outer shell is too tough.") - return 0 /mob/living/silicon/IsAdvancedToolUser() @@ -283,19 +280,15 @@ if ("Security") add_sec_hud() to_chat(src, "Security records overlay enabled.") - if ("Medical") add_med_hud() to_chat(src, "Life signs monitor overlay enabled.") - if ("Diagnostic") add_diag_hud() to_chat(src, "Robotics diagnostic overlay enabled.") - if ("Disable") to_chat(src, "Sensor augmentations disabled.") - /mob/living/silicon/proc/receive_alarm(var/datum/alarm_handler/alarm_handler, var/datum/alarm/alarm, was_raised) if(!next_alarm_notice) next_alarm_notice = world.time + SecondsToTicks(10) @@ -325,7 +318,6 @@ if(!reported) reported = 1 to_chat(src, "--- [AH.category] Detected ---") - raised_alarm(A) for(var/datum/alarm_handler/AH in queued_alarms) @@ -336,14 +328,11 @@ if(!reported) reported = 1 to_chat(src, "--- [AH.category] Cleared ---") - to_chat(src, "\The [A.alarm_name()].") - if(alarm_raised) to_chat(src, "\[Show Alerts\]") - for(var/datum/alarm_handler/AH in queued_alarms) var/list/alarms = queued_alarms[AH] alarms.Cut() @@ -351,14 +340,12 @@ /mob/living/silicon/proc/raised_alarm(var/datum/alarm/A) to_chat(src, "[A.alarm_name()]!") - /mob/living/silicon/ai/raised_alarm(var/datum/alarm/A) var/cameratext = "" for(var/obj/machinery/camera/C in A.cameras()) cameratext += "[(cameratext == "")? "" : "|"][C.c_tag]" to_chat(src, "[A.alarm_name()]! ([(cameratext)? cameratext : "No Camera"])") - /mob/living/silicon/adjustToxLoss(var/amount) return diff --git a/code/modules/mob/living/simple_animal/bees.dm b/code/modules/mob/living/simple_animal/bees.dm index 438c60528e8..959444ea5e4 100644 --- a/code/modules/mob/living/simple_animal/bees.dm +++ b/code/modules/mob/living/simple_animal/bees.dm @@ -46,7 +46,6 @@ M.apply_damage((round(feral/10,1)*(max((round(strength/20,1)),1)))+toxic, TOX) // Bee venom based on how angry I am and how many there are of me! to_chat(M, "\red You have been stung!") - //if we're chasing someone, get a little bit angry if(target_mob && prob(10)) feral++ diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 89075e51173..2a53be92ee5 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -178,7 +178,6 @@ locked = 0 emagged = 1 to_chat(user, "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 @@ -187,27 +186,22 @@ bot_reset() turn_on() //The bot automatically turns on when emagged, unless recently hit with EMP. to_chat(src, "(#$*#$^^( OVERRIDE DETECTED") - show_laws() add_logs(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!") - /mob/living/simple_animal/bot/examine(mob/user) ..() if(health < maxHealth) if(health > maxHealth/3) to_chat(user, "[src]'s parts look loose.") - else to_chat(user, "[src]'s parts look very loose!") - else to_chat(user, "[src] is in pristine condition.") - /mob/living/simple_animal/bot/adjustBruteLoss(amount) . = ..() @@ -270,7 +264,6 @@ else to_chat(user, "[src]'s interface is not responding!") - /mob/living/simple_animal/bot/proc/interact(mob/user) show_controls(user) @@ -279,29 +272,22 @@ if(!locked) open = !open to_chat(user, "The maintenance panel is now [open ? "opened" : "closed"].") - else to_chat(user, "The maintenance panel is locked.") - else if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/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") - if(open) to_chat(user, "Please close the access panel before locking it.") - else to_chat(user, "Access denied.") - else if(istype(W, /obj/item/device/paicard)) if(paicard) to_chat(user, "A [paicard] is already inserted!") - else if(allow_pai && !key) if(!locked && !open) var/obj/item/device/paicard/card = W @@ -313,27 +299,21 @@ user.visible_message("[user] inserts [W] into [src]!","You insert [W] into [src].") paicard.pai.mind.transfer_to(src) to_chat(src, "You sense your form change as you are uploaded into [src].") - bot_name = name name = paicard.pai.name faction = user.faction add_logs(user, paicard.pai, "uploaded to [src.bot_name],") else to_chat(user, "[W] is inactive.") - else to_chat(user, "The personality slot is locked.") - else to_chat(user, "[src] is not compatible with [W]") - else if(istype(W, /obj/item/weapon/hemostat) && paicard) if(open) to_chat(user, "Close the access panel before manipulating the personality slot!") - else to_chat(user, "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].") @@ -343,11 +323,9 @@ if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != "harm") if(health >= maxHealth) to_chat(user, "[src] does not need a repair!") - return if(!open) to_chat(user, "Unable to repair with the maintenance panel closed!") - return var/obj/item/weapon/weldingtool/WT = W if(WT.remove_fuel(0, user)) @@ -358,7 +336,6 @@ user.visible_message("[user] repairs [src]!","You repair [src].") else to_chat(user, "The welder must be on for this task!") - else if(W.force) //if force is non-zero var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread @@ -523,14 +500,12 @@ 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(message) to_chat(calling_ai, "\icon[src] [name] called to [end_area.name]. [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.") - calling_ai = null path = list() @@ -540,14 +515,12 @@ Pass a positive integer as an argument to override a bot's default speed. if(!success) if(calling_ai) to_chat(calling_ai, "\icon[src] [get_turf(src) == ai_waypoint ? "[src] successfully arrived to waypoint." : "[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.") - calling_ai = null path = list() summon_target = null @@ -674,22 +647,17 @@ Pass a positive integer as an argument to override a bot's default speed. switch(command) if("stop") to_chat(src, "STOP PATROL") - if("go") to_chat(src, "START PATROL") - if("summon") var/area/a = get_area(user_turf) to_chat(src, "PRIORITY ALERT: [user] in [a.name]!") - if("home") to_chat(src, "RETURN HOME!") - if("ejectpai") else to_chat(src, "Unidentified control sequence recieved: [command]") - /obj/machinery/bot_core/receive_signal(datum/signal/signal) owner.receive_signal(signal) @@ -839,7 +807,6 @@ Pass a positive integer as an argument to override a bot's default speed. if(topic_denied(usr)) to_chat(usr, "[src]'s interface is not responding!") - return 1 add_fingerprint(usr) @@ -861,23 +828,19 @@ Pass a positive integer as an argument to override a bot's default speed. hacked = 1 locked = 1 to_chat(usr, "[text_hack]") - show_laws() bot_reset() else if(!hacked) to_chat(usr, "[text_dehack_fail]") - else emagged = 0 hacked = 0 to_chat(usr, "[text_dehack]") - show_laws() bot_reset() if("ejectpai") if(paicard && (!locked || issilicon(usr) || check_rights(R_ADMIN, 0, usr))) to_chat(usr, "You eject [paicard] from [bot_name]") - ejectpai(usr) update_controls() @@ -951,7 +914,6 @@ Pass a positive integer as an argument to override a bot's default speed. add_logs(src, paicard.pai, "ejected") if(announce) to_chat(paicard.pai, "You feel your control fade as [paicard] ejects from [bot_name].") - paicard = null name = bot_name faction = initial(faction) @@ -990,30 +952,20 @@ Pass a positive integer as an argument to override a bot's default speed. set category = "IC" to_chat(src, "Directives:") - if(paicard && paicard.pai && paicard.pai.master && paicard.pai.pai_law0) to_chat(src, "Your master, [paicard.pai.master], may overrule any and all laws.") - to_chat(src, "0. [paicard.pai.pai_law0]") - if(emagged >= 2) to_chat(src, "1. #$!@#$32K#$") - else to_chat(src, "1. You are a machine built to serve the station's crew and AI(s).") - to_chat(src, "2. Your function is to [bot_purpose].") - to_chat(src, "3. You cannot serve your function if you are broken.") - to_chat(src, "4. Serve your function to the best of your ability.") - if(paicard && paicard.pai && paicard.pai.pai_laws) to_chat(src, "Supplemental Directive(s):") - to_chat(src, "[paicard.pai.pai_laws]") - /mob/living/simple_animal/bot/get_access() . = ..() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index ddea9e7bbf6..0dc75f742f8 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -62,17 +62,13 @@ if(bot_core.allowed(user) && !open && !emagged) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] \the [src] behaviour controls.") - else if(emagged) to_chat(user, "ERROR") - if(open) to_chat(user, "Please close the access panel before locking it.") - else to_chat(user, "\The [src] doesn't seem to respect your authority.") - else return ..() @@ -82,7 +78,6 @@ if(user) to_chat(user, "[src] buzzes and beeps.") - /mob/living/simple_animal/bot/cleanbot/process_scan(obj/effect/decal/cleanable/D) for(var/T in target_types) if(istype(D, T)) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index c7d62d6e4cf..2c2ca652d10 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -23,7 +23,6 @@ var/mob/living/simple_animal/bot/cleanbot/A = new /mob/living/simple_animal/bot/cleanbot(T) A.name = created_name to_chat(user, "You add the robot arm to the bucket and sensor assembly. Beep boop!") - user.unEquip(src, 1) qdel(src) @@ -67,7 +66,6 @@ qdel(W) build_step++ to_chat(user, "You add the robot leg to [src].") - name = "legs/frame assembly" if(build_step == 1) item_state = "ed209_leg" @@ -89,7 +87,6 @@ qdel(W) build_step++ to_chat(user, "You add the armor to [src].") - name = "vest/legs/frame assembly" item_state = "[lasercolor]ed209_shell" icon_state = "[lasercolor]ed209_shell" @@ -101,7 +98,6 @@ build_step++ name = "shielded frame assembly" to_chat(user, "You weld the vest to [src].") - if(4) switch(lasercolor) if("b") @@ -121,7 +117,6 @@ qdel(W) build_step++ to_chat(user, "You add the helmet to [src].") - name = "covered and shielded frame assembly" item_state = "[lasercolor]ed209_hat" icon_state = "[lasercolor]ed209_hat" @@ -133,7 +128,6 @@ qdel(W) build_step++ to_chat(user, "You add the prox sensor to [src].") - name = "covered, shielded and sensored frame assembly" item_state = "[lasercolor]ed209_prox" icon_state = "[lasercolor]ed209_prox" @@ -143,16 +137,13 @@ 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!") - return to_chat(user, "You start to wire [src]...") - if(do_after(user, 40, target = src)) if(coil.get_amount() >= 1 && build_step == 6) coil.use(1) build_step = 7 to_chat(user, "You wire the ED-209 assembly.") - name = "wired ED-209 assembly" if(7) @@ -177,7 +168,6 @@ name = newname build_step++ to_chat(user, "You add [W] to [src].") - item_state = "[lasercolor]ed209_taser" icon_state = "[lasercolor]ed209_taser" qdel(W) @@ -186,20 +176,17 @@ if(istype(W, /obj/item/weapon/screwdriver)) playsound(loc, 'sound/items/Screwdriver.ogg', 100, 1) to_chat(user, "You start attaching the gun to the frame...") - if(do_after(user, 40, target = src)) build_step++ name = "armed [name]" to_chat(user, "Taser gun attached.") - if(9) if(istype(W, /obj/item/weapon/stock_parts/cell)) if(!user.unEquip(W)) return build_step++ to_chat(user, "You complete the ED-209.") - var/turf/T = get_turf(src) new /mob/living/simple_animal/bot/ed209(T,created_name,lasercolor) qdel(W) @@ -237,7 +224,6 @@ return if(contents.len >= 1) to_chat(user, "They won't fit in, as there is already stuff inside.") - return if(T.use(10)) if(user.s_active) @@ -245,12 +231,10 @@ var/obj/item/weapon/toolbox_tiles/B = new /obj/item/weapon/toolbox_tiles user.put_in_hands(B) to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.") - user.unEquip(src, 1) qdel(src) else to_chat(user, "You need 10 floor tiles to start building a floorbot.") - return /obj/item/weapon/toolbox_tiles/attackby(obj/item/W, mob/user, params) @@ -261,7 +245,6 @@ B.created_name = created_name user.put_in_hands(B) to_chat(user, "You add the sensor to the toolbox and tiles.") - user.unEquip(src, 1) qdel(src) @@ -282,7 +265,6 @@ var/mob/living/simple_animal/bot/floorbot/A = new /mob/living/simple_animal/bot/floorbot(T) A.name = created_name to_chat(user, "You add the robot arm to the odd looking toolbox assembly. Boop beep!") - user.unEquip(src, 1) qdel(src) else if(istype(W, /obj/item/weapon/pen)) @@ -326,7 +308,6 @@ //Making a medibot! if(contents.len >= 1) to_chat(user, "You need to empty [src] out first!") - return var/obj/item/weapon/firstaid_arm_assembly/A = new /obj/item/weapon/firstaid_arm_assembly @@ -355,7 +336,6 @@ qdel(S) user.put_in_hands(A) to_chat(user, "You add the robot arm to the first aid kit.") - user.unEquip(src, 1) qdel(src) @@ -378,7 +358,6 @@ qdel(W) build_step++ to_chat(user, "You add the health sensor to [src].") - name = "First aid/robot arm/health analyzer assembly" overlays += image('icons/obj/aibots.dmi', "na_scanner") @@ -389,7 +368,6 @@ qdel(W) build_step++ to_chat(user, "You complete the Medibot. Beep boop!") - var/turf/T = get_turf(src) var/mob/living/simple_animal/bot/medbot/S = new /mob/living/simple_animal/bot/medbot(T) S.skin = skin @@ -424,7 +402,6 @@ var/obj/item/weapon/secbot_assembly/A = new /obj/item/weapon/secbot_assembly user.put_in_hands(A) to_chat(user, "You add the signaler to the helmet.") - user.unEquip(src, 1) qdel(src) else @@ -439,7 +416,6 @@ build_step++ overlays += "hs_hole" to_chat(user, "You weld a hole in [src]!") - else if(build_step == 1) var/obj/item/weapon/weldingtool/WT = I if(WT.remove_fuel(0, user)) @@ -447,13 +423,11 @@ overlays -= "hs_hole" to_chat(user, "You weld the hole in [src] shut!") - else if(isprox(I) && (build_step == 1)) if(!user.unEquip(I)) return build_step++ to_chat(user, "You add the prox sensor to [src]!") - overlays += "hs_eye" name = "helmet/signaler/prox sensor assembly" qdel(I) @@ -463,7 +437,6 @@ return build_step++ to_chat(user, "You add the robot arm to [src]!") - name = "helmet/signaler/prox sensor/robot arm assembly" overlays += "hs_arm" qdel(I) @@ -473,7 +446,6 @@ return build_step++ to_chat(user, "You complete the Securitron! Beep boop.") - var/mob/living/simple_animal/bot/secbot/S = new /mob/living/simple_animal/bot/secbot S.forceMove(get_turf(src)) S.name = created_name @@ -493,19 +465,16 @@ new /obj/item/device/assembly/signaler(get_turf(src)) new /obj/item/clothing/head/helmet(get_turf(src)) to_chat(user, "You disconnect the signaler from the helmet.") - qdel(src) else if(build_step == 2) overlays -= "hs_eye" new /obj/item/device/assembly/prox_sensor(get_turf(src)) to_chat(user, "You detach the proximity sensor from [src].") - build_step-- else if(build_step == 3) overlays -= "hs_arm" new /obj/item/robot_parts/l_arm(get_turf(src)) to_chat(user, "You remove the robot arm from [src].") - build_step-- \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 72b951138b6..a68837ef7ff 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -178,7 +178,6 @@ Auto Patrol[]"}, if(emagged == 2) if(user) to_chat(user, "You short out [src]'s target assessment circuits.") - oldtarget_name = user.name audible_message("[src] buzzes oddly!") declare_arrests = 0 diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index fd624d373bd..c988f856ef7 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -98,12 +98,10 @@ amount += loaded if(loaded > 0) to_chat(user, "You load [loaded] tiles into the floorbot. He now contains [amount] tiles.") - nagged = 0 update_icon() else to_chat(user, "You need at least one floor tile to put into [src]!") - else ..() @@ -113,7 +111,6 @@ if(user) to_chat(user, "[src] buzzes and beeps.") - /mob/living/simple_animal/bot/floorbot/Topic(href, href_list) if(..()) return 1 diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index eb1e5591f46..3534bbf55b2 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -222,11 +222,9 @@ if(istype(W, /obj/item/weapon/reagent_containers/glass)) if(locked) to_chat(user, "You cannot insert a beaker because the panel is locked!") - return if(!isnull(reagent_glass)) to_chat(user, "There is already a beaker loaded!") - return if(!user.drop_item()) return @@ -234,7 +232,6 @@ W.forceMove(src) reagent_glass = W to_chat(user, "You insert [W].") - show_controls(user) return @@ -250,7 +247,6 @@ declare_crit = 0 if(user) to_chat(user, "You short out [src]'s reagent synthesis circuits.") - audible_message("[src] buzzes oddly!") flick("medibot_spark", src) if(user) diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index be1a59d55f2..e2bad0bcd3b 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -116,7 +116,6 @@ ) else to_chat(user, "[src] does not need a repair!") - else if((istype(I, /obj/item/device/multitool) || istype(I, /obj/item/weapon/wirecutters)) && open) return attack_hand(user) else if(load && ismob(load)) // chance to knock off rider @@ -126,7 +125,6 @@ "You knock [load] off [src] with \the [I]!") else to_chat(user, "You hit [src] with \the [I] but to no effect!") - ..() else ..() @@ -139,7 +137,6 @@ if(!open) locked = !locked to_chat(user, "You [locked ? "lock" : "unlock"] the [src]'s controls!") - flick("mulebot-emagged", src) playsound(loc, 'sound/effects/sparks1.ogg', 100, 0) @@ -189,7 +186,6 @@ else if(cell && !open) if(!turn_on()) to_chat(usr, "You can't switch on [src]!") - return else return @@ -254,7 +250,6 @@ return 1 else to_chat(user, "Access denied.") - return 0 // TODO: remove this; PDAs currently depend on it @@ -480,7 +475,6 @@ if(on) var/speed = (wires.Motor1() ? 1 : 0) + (wires.Motor2() ? 2 : 0) // to_chat(world, "speed: [speed]") - var/num_steps = 0 switch(speed) if(0) @@ -524,13 +518,11 @@ if(istype(next, /turf/simulated)) // to_chat(world, "at ([x],[y]) moving to ([next.x],[next.y])") - var/oldloc = loc var/moved = step_towards(src, next) // attempt to move if(cell) cell.use(1) if(moved && oldloc!=loc) // successful move // to_chat(world, "Successful move.") - blockcount = 0 path -= loc @@ -542,7 +534,6 @@ else // failed to move // to_chat(world, "Unable to move.") - blockcount++ mode = BOT_BLOCKED if(blockcount == 3) @@ -563,18 +554,15 @@ else buzz(ANNOYED) // to_chat(world, "Bad turf.") - mode = BOT_NAV return else // to_chat(world, "No path.") - mode = BOT_NAV return if(BOT_NAV) // calculate new path // to_chat(world, "Calc new path.") - mode = BOT_WAIT_FOR_NAV spawn(0) calc_path() @@ -652,7 +640,6 @@ loaddir = dir //The MULE will attempt to load a crate in whatever direction the MULE is "facing". if(calling_ai) to_chat(calling_ai, "\icon[src] [src] wirelessly plays a chiming sound!") - playsound(calling_ai, 'sound/machines/chime.ogg',40, 0) calling_ai = null radio_channel = "AI Private" //Report on AI Private instead if the AI is controlling us. @@ -740,17 +727,13 @@ if("start") if(load) to_chat(src, "DELIVER [load] TO [destination]") - else to_chat(src, "PICK UP DELIVERY AT [destination]") - if("unload") if(load) to_chat(src, "UNLOAD") - else to_chat(src, "LOAD") - if("autoret", "autopick", "target") else ..() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 002ed319ad6..1d3d2198fcc 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -184,7 +184,6 @@ Auto Patrol: []"}, if(emagged == 2) if(user) to_chat(user, "You short out [src]'s target assessment circuits.") - oldtarget_name = user.name audible_message("[src] buzzes oddly!") declare_arrests = 0 diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 3b1e0020e0b..6c630ec0117 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -54,7 +54,6 @@ to_chat(user, msg) - /mob/living/simple_animal/construct/attack_animal(mob/living/simple_animal/M as mob) if(istype(M, /mob/living/simple_animal/construct/builder)) health += 5 @@ -256,7 +255,6 @@ if(usr.energy<300) to_chat(usr, "\red You do not have enough power stored!") - return if(usr.stat) diff --git a/code/modules/mob/living/simple_animal/friendly/corgi.dm b/code/modules/mob/living/simple_animal/friendly/corgi.dm index 4822fbe7cf1..fa49d9bdffd 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi.dm @@ -69,11 +69,9 @@ if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) ) if( O.force ) to_chat(user, "[src] is wearing too much armor! You can't cause \him any damage.") - visible_message(" [user] hits [src] with [O], however [src] is too armored.") else to_chat(user, "[src] is wearing too much armor! You can't reach \his skin.") - visible_message("[user] gently taps [src] with [O].") if(health>0 && prob(15)) custom_emote(1, "looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression.") @@ -82,7 +80,6 @@ if (istype(O, /obj/item/weapon/razor)) if (shaved) to_chat(user, "You can't shave this corgi, it's already been shaved!") - return user.visible_message("[user] starts to shave [src] using \the [O].", "You start to shave [src] using \the [O]...") if(do_after(user, 50, target = src)) @@ -111,7 +108,6 @@ if(inventory_head) if(inventory_head.flags & NODROP) to_chat(usr, "\The [inventory_head] is stuck too hard to [src] for you to remove!") - return name = real_name desc = initial(desc) @@ -126,20 +122,17 @@ regenerate_icons() else to_chat(usr, "There is nothing to remove from its [remove_from].") - return if("back") if(inventory_back) if(inventory_back.flags & NODROP) to_chat(usr, "\The [inventory_back] is stuck too hard to [src] for you to remove!") - return inventory_back.loc = src.loc inventory_back = null regenerate_icons() else to_chat(usr, "There is nothing to remove from its [remove_from].") - return show_inv(usr) @@ -158,7 +151,6 @@ if("back") if(inventory_back) to_chat(usr, "It's already wearing something!") - return else var/obj/item/item_to_add = usr.get_active_hand() @@ -185,10 +177,8 @@ if( ! ( item_to_add.type in allowed_types ) ) to_chat(usr, "You set [item_to_add] on [src]'s back, but \he shakes it off!") - if(!usr.drop_item()) to_chat(usr, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s back!") - return item_to_add.loc = loc if(prob(25)) @@ -219,7 +209,6 @@ if(inventory_head) if(user) to_chat(user, "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.") @@ -372,11 +361,9 @@ if(valid) if(user && !user.drop_item()) to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!") - return 0 if(health <= 0) to_chat(user, "There is merely a dull, lifeless look in [real_name]'s eyes as you put the [item_to_add] on \him.") - 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 \his tail once and barks.", @@ -388,10 +375,8 @@ else if(user && !user.drop_item()) to_chat(user, "\The [item_to_add] is stuck to your hand, you cannot put it on [src]'s head!") - return 0 to_chat(user, "You set [item_to_add] on [src]'s head, but \he shakes it off!") - item_to_add.loc = loc if(prob(25)) step_rand(item_to_add) @@ -484,7 +469,6 @@ if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") - now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) @@ -551,7 +535,6 @@ /mob/living/simple_animal/pet/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]!") - return ..() @@ -576,7 +559,6 @@ /mob/living/simple_animal/pet/corgi/Lisa/Topic(href, href_list) if(href_list["remove_inv"] || href_list["add_inv"]) to_chat(usr, "\red [src] already has a cute bow!") - return ..() diff --git a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm index a244ce83cf9..dc687743197 100644 --- a/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm +++ b/code/modules/mob/living/simple_animal/friendly/corgi_powers.dm @@ -3,11 +3,9 @@ set desc = "d'awwww." set category = "Corgi" to_chat(src, text("[pick("You dance around","You chase your tail")].")) - for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) to_chat(O, text("[] [pick("dances around","chases its tail")].", src)) - for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2)) dir = i sleep(1) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 2de110a2fb4..f5880e5ba7d 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -52,7 +52,6 @@ if(istype(O, /obj/item/weapon/wirecutters)) if(prob(50)) to_chat(user, "\red \b This kills the crab.") - health -= 20 death() else @@ -72,7 +71,6 @@ M.show_message("\blue [user] applies the [MED] on [src]") else to_chat(user, "\blue this [src] is dead, medical items won't bring it back to life.") - else if(O.force) health -= O.force @@ -81,7 +79,6 @@ M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else to_chat(usr, "\red This weapon is ineffective, it does no damage.") - for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") @@ -108,7 +105,6 @@ inventory_head = null else to_chat(usr, "\red There is nothing to remove from its [remove_from].") - return if("mask") if(inventory_mask) @@ -116,7 +112,6 @@ inventory_mask = null else to_chat(usr, "\red There is nothing to remove from its [remove_from].") - return //show_inv(usr) //Commented out because changing Ian's name and then calling up his inventory opens a new inventory...which is annoying. @@ -128,13 +123,11 @@ var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") - return switch(add_to) if("head") if(inventory_head) to_chat(usr, "\red It's is already wearing something.") - return else var/obj/item/item_to_add = usr.get_active_hand() @@ -177,7 +170,6 @@ if( ! ( item_to_add.type in allowed_types ) ) to_chat(usr, "\red It doesn't seem too keen on wearing that item.") - return usr.drop_item() @@ -241,7 +233,6 @@ if("mask") if(inventory_mask) to_chat(usr, "\red It's already wearing something.") - return else var/obj/item/item_to_add = usr.get_active_hand() @@ -258,7 +249,6 @@ if( ! ( item_to_add.type in allowed_types ) ) to_chat(usr, "\red This object won't fit.") - return usr.drop_item() diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index 6c1fb0486dc..4606558d271 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -54,9 +54,7 @@ if(M.a_intent == I_HELP) if(M.species && M.species.name == "Diona") to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") - to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") - src.verbs += /mob/living/simple_animal/diona/proc/split src.verbs -= /mob/living/simple_animal/diona/proc/merge src.forceMove(M) @@ -90,11 +88,9 @@ if(istype(M,/mob/living/carbon/human)) to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") - M.status_flags |= PASSEMOTES to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") - src.loc = M src.verbs += /mob/living/simple_animal/diona/proc/split src.verbs -= /mob/living/simple_animal/diona/proc/merge @@ -111,10 +107,8 @@ return to_chat(src.loc, "You feel a pang of loss as [src] splits away from your biomass.") - to_chat(src, "You wiggle out of the depths of [src.loc]'s biomass and plop to the ground.") - var/mob/living/M = src.loc src.loc = get_turf(src) @@ -170,12 +164,10 @@ if(donors.len < 5) to_chat(src, "You need more blood in order to ascend to a new state of consciousness...") - return if(nutrition < 500) to_chat(src, "You need to binge on weeds in order to have the energy to grow...") - return src.split() @@ -219,12 +211,10 @@ if(M.species.flags & NO_BLOOD) to_chat(src, "That donor has no blood to take.") - return if(donors.Find(M.real_name)) to_chat(src, "That donor offers you nothing new.") - return src.visible_message("[src] flicks out a feeler and neatly steals a sample of [M]'s blood.","You flick out a feeler and neatly steal a sample of [M]'s blood.") @@ -243,16 +233,13 @@ if(donors.len == 5) ready_evolve = 1 to_chat(src, "You feel ready to move on to your next stage of growth.") - else if(donors.len == 3) universal_understand = 1 to_chat(src, "You feel your awareness expand, and realize you know how to understand the creatures around you.") - else to_chat(src, "The blood seeps into your small form, and you draw out the echoes of memories and personality from it, working them into your budding mind.") - /mob/living/simple_animal/diona/put_in_hands(obj/item/W) W.loc = get_turf(src) W.layer = initial(W.layer) @@ -260,7 +247,6 @@ /mob/living/simple_animal/diona/put_in_active_hand(obj/item/W) to_chat(src, "You don't have any hands!") - return /mob/living/simple_animal/diona/emote(var/act, var/m_type=1, var/message = null) 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 9e5086fd0cc..fd32aa4fd0c 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -82,10 +82,8 @@ milk_content -= transfered else if(G.reagents.total_volume >= G.volume) to_chat(user, "\red \The [O] is full.") - else to_chat(user, "\red The udder is dry. Wait a bit longer...") - else ..() @@ -128,10 +126,8 @@ milk_content -= transfered else if(G.reagents.total_volume >= G.volume) to_chat(user, "\red \The [O] is full.") - else to_chat(user, "\red The udder is dry. Wait a bit longer...") - else ..() @@ -153,7 +149,6 @@ "[src] looks at you with a resigned expression.", "[src] seems resigned to its fate.") to_chat(M, pick(responses)) - else ..() @@ -251,13 +246,10 @@ var/global/chicken_count = 0 qdel(O) eggsleft += rand(1, 4) // to_chat(world, eggsleft) - else to_chat(user, "\blue [name] doesn't seem hungry!") - else to_chat(user, "\blue [name] doesn't seem interested in [O]!") - else ..() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index dcb54f0eacc..6e8ef064bd5 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -38,7 +38,6 @@ for(var/mob/M in view()) to_chat(M, 'sound/effects/mousesqueek.ogg') - /mob/living/simple_animal/mouse/Life() . = ..() if(stat == UNCONSCIOUS) @@ -106,7 +105,6 @@ /mob/living/simple_animal/mouse/start_pulling(var/atom/movable/AM)//Prevents mouse from pulling things to_chat(src, "You are too small to pull anything.") - return /mob/living/simple_animal/mouse/Crossed(AM as mob|obj) @@ -114,9 +112,7 @@ if(!stat) var/mob/M = AM to_chat(M, "\blue \icon[src] Squeek!") - to_chat(M, 'sound/effects/mousesqueek.ogg') - ..() /mob/living/simple_animal/mouse/death() diff --git a/code/modules/mob/living/simple_animal/friendly/slime.dm b/code/modules/mob/living/simple_animal/friendly/slime.dm index 79e13f85d3d..eac1a448571 100644 --- a/code/modules/mob/living/simple_animal/friendly/slime.dm +++ b/code/modules/mob/living/simple_animal/friendly/slime.dm @@ -26,7 +26,6 @@ if(istype(tmob, /mob/living/carbon/human) && (FAT in tmob.mutations)) if(prob(70)) to_chat(src, "\red You fail to push [tmob]'s fat ass out of the way.") - now_pushing = 0 return if(!(tmob.status_flags & CANPUSH)) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index c484f6b6164..590dfa47b5e 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -47,11 +47,9 @@ var/obj/item/device/mmi/B = O if(src.mmi) //There's already a brain in it. to_chat(user, "\red There's already a brain in [src]!") - return if(!B.brainmob) to_chat(user, "\red Sticking an empty MMI into the frame would sort of defeat the purpose.") - return if(!B.brainmob.key) var/ghost_can_reenter = 0 @@ -66,22 +64,18 @@ break if(!ghost_can_reenter) to_chat(user, "[O] is completely unresponsive; there's no point.") - return if(B.brainmob.stat == DEAD) to_chat(user, "\red [O] is dead. Sticking it into the frame would sort of defeat the purpose.") - return if(jobban_isbanned(B.brainmob, "Cyborg") || jobban_isbanned(B.brainmob,"nonhumandept")) to_chat(user, "\red [O] does not seem to fit.") - return to_chat(user, "\blue You install [O] in [src]!") - user.drop_item() src.mmi = O src.transfer_personality(O) @@ -102,15 +96,12 @@ W.show_message(text("\red [user] has spot-welded some of the damage to [src]!"), 1) else to_chat(user, "\blue [src] is undamaged!") - else to_chat(user, "Need more welding fuel!") - return else if(istype(O, /obj/item/weapon/card/id)||istype(O, /obj/item/device/pda)) if (!mmi) to_chat(user, "\red There's no reason to swipe your ID - the spiderbot has no brain to remove.") - return 0 var/obj/item/weapon/card/id/id_card @@ -123,7 +114,6 @@ if(access_robotics in id_card.access) to_chat(user, "\blue You swipe your access card and pop the brain out of [src].") - eject_brain() if(held_item) @@ -133,7 +123,6 @@ return 1 else to_chat(user, "\red You swipe your card, with no effect.") - return 0 else @@ -147,7 +136,6 @@ M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else to_chat(usr, "\red This weapon is ineffective, it does no damage.") - for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") @@ -155,7 +143,6 @@ /mob/living/simple_animal/spiderbot/emag_act(user as mob) if (emagged) to_chat(user, "\red [src] is already overloaded - better run.") - return 0 else emagged = 1 @@ -164,7 +151,6 @@ to_chat(src, "\red Your cell seems to be outputting a lot of power...") spawn(200) to_chat(src, "\red Internal heat sensors are spiking! Something is badly wrong with your cell!") - spawn(300) src.explode() @@ -246,7 +232,6 @@ if(!held_item) to_chat(usr, "\red You have nothing to drop!") - return 0 if(istype(held_item, /obj/item/weapon/grenade)) @@ -275,7 +260,6 @@ if(held_item) to_chat(src, "\red You are already holding \the [held_item]") - return 1 var/list/items = list() @@ -293,15 +277,12 @@ visible_message("\blue [src] scoops up \the [held_item]!", "\blue You grab \the [held_item]!", "You hear a skittering noise and a clink.") return held_item to_chat(src, "\red \The [selection] is too far away.") - return 0 to_chat(src, "\red There is nothing of interest to take.") - return 0 /mob/living/simple_animal/spiderbot/examine(mob/user) ..(user) if(src.held_item) to_chat(user, "It is carrying \a [src.held_item] \icon[src.held_item].") - 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 29d4ed31406..9b1459027e4 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -16,7 +16,6 @@ L.reagents.add_reagent("spidertoxin", poison_per_bite) if(prob(poison_per_bite)) to_chat(L, "You feel a tiny prick.") - L.reagents.add_reagent(poison_type, poison_per_bite) @@ -232,10 +231,8 @@ var/obj/effect/spider/eggcluster/E = locate() in get_turf(src) if(E) to_chat(src, "There is already a cluster of eggs here!") - else if(!fed) to_chat(src, "You are too hungry to do this!") - else if(busy != LAYING_EGGS) busy = LAYING_EGGS src.visible_message("\the [src] begins to lay a cluster of eggs.") diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 7aa3e8f0203..9c9ec79fd34 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -45,11 +45,9 @@ if(C.stat == DEAD) if(C.status_flags & XENO_HOST) to_chat(src, "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...") - spawn(100) death() return diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index ade260176ea..0d5d4b89772 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -297,18 +297,15 @@ var/mob/living/carbon/human/H = M if(inert) to_chat(user, "[src] have become inert, its healing properties are no more.") - return else if(H.stat == DEAD) to_chat(user, "[src] are useless on the dead.") - return if(H != user) H.visible_message("[user] forces [H] to eat [src]... they quickly regenerate all injuries!") else to_chat(user, "You chomp into [src], barely managing to hold it down, but feel amazingly refreshed in mere moments.") - playsound(src.loc,'sound/items/eatfood.ogg', rand(10,50), 1) H.revive() qdel(src) @@ -487,11 +484,9 @@ if(current_armor.["melee"] < 80) current_armor.["melee"] = min(current_armor.["melee"] + 10, 80) to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - qdel(src) else to_chat(user, "You can't improve [C] any further.") - return if(istype(target, /obj/mecha/working/ripley)) var/obj/mecha/D = target @@ -502,22 +497,18 @@ damage_absorption["fire"] = damage_absorption["fire"] - 0.05 damage_absorption["laser"] = damage_absorption["laser"] - 0.025 to_chat(user, "You strengthen [target], improving its resistance against melee attacks.") - qdel(src) if(D.icon_state == "ripley-open") D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-open") D.desc = "Autonomous Power Loader Unit. Its armour is enhanced with some goliath hide plates." else to_chat(user, "You can't add armour onto the mech while someone is inside!") - if(damage_absorption.["brute"] == 0.3) if(D.icon_state == "ripley-open") D.overlays += image("icon"="mecha.dmi", "icon_state"="ripley-g-full-open") D.desc = "Autonomous Power Loader Unit. It's wearing a fearsome carapace entirely composed of goliath hide plates - the pilot must be an experienced monster hunter." else to_chat(user, "You can't add armour onto the mech while someone is inside!") - else to_chat(user, "You can't improve [D] any further!") - return \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 58a44d686f6..82a7f09af80 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -37,11 +37,9 @@ ..(user) if(health >= maxHealth) to_chat(user, "It looks healthy.") - else to_chat(user, "It looks like it's been roughed up.") - /mob/living/simple_animal/hostile/mushroom/Life() ..() if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten @@ -133,7 +131,6 @@ qdel(I) else to_chat(user, "[src] won't eat it!") - return if(I.force) Bruise() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index dd782663516..1f431269e8d 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -65,7 +65,6 @@ icon_state = "angelseen" if(client) to_chat(src, "You cannot move, there are eyes on you!") - return 0 icon_state = "angel" return ..() @@ -103,7 +102,6 @@ icon_state = "angelseen" if(client) to_chat(src, "You cannot attack, there are eyes on you!") - return icon_state = "angelattack" ..() diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 15728458cc2..e4285c98a0b 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -63,7 +63,6 @@ playsound(loc, O.hitsound, 25, 1, -1) else to_chat(usr, "\red This weapon is ineffective, it does no damage.") - visible_message("\red [user] gently taps [src] with the [O]. ") diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm index 6f7d0a5a07c..0ecab13b44a 100644 --- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm @@ -125,13 +125,9 @@ /mob/living/simple_animal/hostile/winter/santa/stage_4/death() to_chat(world, "
") - to_chat(world, "THE FAT MAN HAS FALLEN!") - to_chat(world, "SANTA CLAUS HAS BEEN DEFEATED!") - to_chat(world, "
") - ..() var/obj/item/weapon/grenade/clusterbuster/xmas/X = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src)) var/obj/item/weapon/grenade/clusterbuster/xmas/Y = new /obj/item/weapon/grenade/clusterbuster/xmas(get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 7c3dc5d0516..858ae10fc18 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -158,20 +158,17 @@ possible_phrase = copytext(possible_phrase,3,length(possible_phrase)) else to_chat(usr, "\red There is nothing to remove from its [remove_from].") - return show_inv(usr) else if(href_list["add_inv"]) var/add_to = href_list["add_inv"] if(!usr.get_active_hand()) to_chat(usr, "\red You have nothing in your hand to put on its [add_to].") - return switch(add_to) if("ears") if(ears) to_chat(usr, "\red It's already wearing something.") - return else var/obj/item/item_to_add = usr.get_active_hand() @@ -180,7 +177,6 @@ if( !istype(item_to_add, /obj/item/device/radio/headset) ) to_chat(usr, "\red This object won't fit.") - return var/obj/item/device/radio/headset/headset_to_add = item_to_add @@ -190,7 +186,6 @@ src.ears = headset_to_add to_chat(usr, "You fit the headset onto [src].") - clearlist(available_channels) for(var/ch in headset_to_add.channels) switch(ch) @@ -574,7 +569,6 @@ if(held_item) to_chat(src, "\red You are already holding the [held_item]") - return 1 for(var/obj/item/I in view(1,src)) @@ -591,7 +585,6 @@ return held_item to_chat(src, "\red There is nothing of interest to take.") - return 0 /mob/living/simple_animal/parrot/proc/steal_from_mob() @@ -604,7 +597,6 @@ if(held_item) to_chat(src, "\red You are already holding the [held_item]") - return 1 var/obj/item/stolen_item = null @@ -624,7 +616,6 @@ return held_item to_chat(src, "\red There is nothing of interest to take.") - return 0 /mob/living/simple_animal/parrot/verb/drop_held_item_player() @@ -649,7 +640,6 @@ if(!held_item) to_chat(usr, "\red You have nothing to drop!") - return 0 if(!drop_gently) @@ -658,13 +648,11 @@ G.loc = src.loc G.prime() to_chat(src, "You let go of the [held_item]!") - held_item = null return 1 to_chat(src, "You drop the [held_item].") - held_item.loc = src.loc held_item = null return 1 @@ -685,7 +673,6 @@ icon_state = "parrot_sit" return to_chat(src, "\red There is no perch nearby to sit on.") - return /* diff --git a/code/modules/mob/living/simple_animal/powers.dm b/code/modules/mob/living/simple_animal/powers.dm index 9df6a9c8110..934c93bb3ad 100644 --- a/code/modules/mob/living/simple_animal/powers.dm +++ b/code/modules/mob/living/simple_animal/powers.dm @@ -9,16 +9,12 @@ if (layer != TURF_LAYER+0.2) layer = TURF_LAYER+0.2 to_chat(src, text("\green You are now hiding.")) - for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) to_chat(O, text("[] scurries to the ground!", src)) - else layer = MOB_LAYER to_chat(src, text("\green You have stopped hiding.")) - for(var/mob/O in oviewers(src, null)) if ((O.client && !( O.blinded ))) to_chat(O, text("[] slowly peaks up from the ground...", src)) - diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index c9b801734e8..0e01aa51894 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -49,7 +49,6 @@ M.show_message("\red \b [src] has been attacked with the [O] by [user]. ") else to_chat(usr, "\red This weapon is ineffective, it does no damage.") - for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index a92410d069f..c9be5919f43 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -386,7 +386,6 @@ /mob/living/simple_animal/attack_slime(mob/living/carbon/slime/M as mob) if (!ticker) to_chat(M, "You cannot attack people before the game has started.") - return if(M.Victim) return // can't attack while eating! @@ -425,15 +424,12 @@ return else to_chat(user, "\blue [MED] won't help at all.") - return else to_chat(user, "\blue [src] is at full health.") - return else to_chat(user, "\blue [src] is dead, medical items won't bring it back to life.") - return else if(can_collar && !collar && istype(O, /obj/item/clothing/accessory/petcollar)) var/obj/item/clothing/accessory/petcollar/C = O @@ -443,7 +439,6 @@ collar.equipped(src) regenerate_icons() to_chat(usr, "You put \the [C] around \the [src]'s neck.") - if(C.tagname) name = C.tagname real_name = C.tagname @@ -661,7 +656,6 @@ if(collar) if(collar.flags & NODROP) to_chat(usr, "\The [collar] is stuck too hard to [src] for you to remove!") - return collar.dropped(src) collar.forceMove(src.loc) @@ -669,7 +663,6 @@ regenerate_icons() else to_chat(usr, "There is nothing to remove from its [remove_from].") - return show_inv(usr) else if(href_list["add_inv"]) @@ -691,7 +684,6 @@ collar.equipped(src) regenerate_icons() to_chat(usr, "You put \the [C] around \the [src]'s neck.") - if(C.tagname) name = C.tagname real_name = C.tagname diff --git a/code/modules/mob/living/simple_animal/tribbles.dm b/code/modules/mob/living/simple_animal/tribbles.dm index c78645ce45d..23def05f072 100644 --- a/code/modules/mob/living/simple_animal/tribbles.dm +++ b/code/modules/mob/living/simple_animal/tribbles.dm @@ -54,10 +54,8 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, /mob/living/simple_animal/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob, params) if(istype(O, /obj/item/weapon/scalpel)) to_chat(user, "You try to neuter the tribble, but it's moving too much and you fail!") - else if(istype(O, /obj/item/weapon/cautery)) to_chat(user, "You try to un-neuter the tribble, but it's moving too much and you fail!") - ..() @@ -100,7 +98,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, ..() to_chat(user, "You nuzzle the tribble and it trills softly.") - /obj/item/toy/tribble/dropped(mob/user as mob) //now you can't item form them to get rid of them all so easily ..() new /mob/living/simple_animal/tribble(user.loc) @@ -111,7 +108,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, T.gestation = src.gestation to_chat(user, "The tribble gets up and wanders around.") - qdel(src) /obj/item/toy/tribble/attackby(var/obj/item/weapon/O as obj, var/mob/user as mob) //neutering and un-neutering @@ -119,14 +115,12 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, if(istype(O, /obj/item/weapon/scalpel) && src.gestation != null) gestation = null to_chat(user, "You neuter the tribble so that it can no longer re-produce.") - else if (istype(O, /obj/item/weapon/cautery) && src.gestation == null) gestation = 0 to_chat(user, "You fuse some recently cut tubes together, it should be able to reproduce again.") - //|| Tribble Cage - Lovingly lifted from the lamarr-cage || /obj/structure/tribble_cage name = "Lab Cage" @@ -202,11 +196,9 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles, return else to_chat(usr, text("\blue You kick the lab cage.")) - for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) to_chat(O, text("\red [] kicks the lab cage.", usr)) - src.health -= 2 healthcheck() return diff --git a/code/modules/mob/living/simple_animal/vox.dm b/code/modules/mob/living/simple_animal/vox.dm index 78fff8e8c86..3b34ddaf143 100644 --- a/code/modules/mob/living/simple_animal/vox.dm +++ b/code/modules/mob/living/simple_animal/vox.dm @@ -47,7 +47,6 @@ M.show_message("\red \b The [O] bounces harmlessly off of [src]. ") else to_chat(usr, "\red This weapon is ineffective, it does no damage.") - for(var/mob/M in viewers(src, null)) if ((M.client && !( M.blinded ))) M.show_message("\red [user] gently taps [src] with the [O]. ") @@ -62,12 +61,10 @@ return to_chat(src, "\red You launch a razor-sharp quill at [target]!") - for(var/mob/O in oviewers()) if ((O.client && !( O.blinded ))) to_chat(O, "\red [src] launches a razor-sharp quill at [target]!") - var/obj/item/weapon/arrow/quill/Q = new(loc) Q.fingerprintslast = src.ckey Q.throw_at(target,10,30) @@ -75,7 +72,6 @@ spawn(100) to_chat(src, "\red You feel a fresh quill slide into place.") - quills++ /mob/living/simple_animal/vox/armalis/verb/message_mob() @@ -98,17 +94,14 @@ if(istype(M, /mob/dead/observer) || M.stat == DEAD) to_chat(src, "Not even the armalis can speak to the dead.") - return to_chat(M, "\blue Like lead slabs crashing into the ocean, alien thoughts drop into your mind: [text]") - if(istype(M,/mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(H.species.name == "Vox") return to_chat(H, "\red Your nose begins to bleed...") - H.drip(1) /mob/living/simple_animal/vox/armalis/verb/shriek() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 739c70e2446..92b05eda277 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -48,7 +48,6 @@ for(var/datum/gas/trace_gas in environment.trace_gases) to_chat(usr, "\blue [trace_gas.type]: [trace_gas.moles] \n") - usr.show_message(t, 1) /mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2) @@ -73,10 +72,8 @@ // Added voice muffling for Issue 41. if(stat == UNCONSCIOUS || (sleeping > 0 && stat != 2)) to_chat(src, "... You can almost hear someone talking ...") - else to_chat(src, msg) - return // Show a message to all mobs in sight of this one @@ -176,7 +173,6 @@ if(C.rig_restrict_helmet) to_chat(src, "\red You must fasten the helmet to a hardsuit first. (Target the head and use on a hardsuit)")// Stop eva helms equipping. - else equip_to_slot_if_possible(C, slot) else @@ -213,7 +209,6 @@ if(!disable_warning) to_chat(src, "\red You are unable to equip that.")//Only print if del_on_fail is false - return 0 equip_to_slot(W, slot, redraw_mob) //This proc should not ever fail. @@ -356,7 +351,6 @@ var/list/slot_equipment_priority = list( \ if(!H.w_uniform) if(!disable_warning) to_chat(H, "\red You need a jumpsuit before you can attach this [name].") - return 0 if( !(slot_flags & SLOT_BELT) ) return 0 @@ -417,7 +411,6 @@ var/list/slot_equipment_priority = list( \ if(!H.w_uniform) if(!disable_warning) to_chat(H, "\red You need a jumpsuit before you can attach this [name].") - return 0 if( !(slot_flags & SLOT_ID) ) return 0 @@ -433,7 +426,6 @@ var/list/slot_equipment_priority = list( \ if(!H.w_uniform) if(!disable_warning) to_chat(H, "\red You need a jumpsuit before you can attach this [name].") - return 0 if(slot_flags & SLOT_DENYPOCKET) return @@ -445,7 +437,6 @@ var/list/slot_equipment_priority = list( \ if(!H.w_uniform) if(!disable_warning) to_chat(H, "\red You need a jumpsuit before you can attach this [name].") - return 0 if(slot_flags & SLOT_DENYPOCKET) return 0 @@ -456,17 +447,14 @@ var/list/slot_equipment_priority = list( \ if(!H.wear_suit) if(!disable_warning) to_chat(H, "\red You need a suit before you can attach this [name].") - return 0 if(!H.wear_suit.allowed) if(!disable_warning) to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.") - return 0 if(src.w_class > 4) if(!disable_warning) to_chat(usr, "The [name] is too big to attach.") - return 0 if( istype(src, /obj/item/device/pda) || istype(src, /obj/item/weapon/pen) || is_type_in_list(src, H.wear_suit.allowed) ) if(H.s_store) @@ -534,7 +522,6 @@ var/list/slot_equipment_priority = list( \ if((is_blind(src) || usr.stat) && !isobserver(src)) to_chat(src, "Something is there but you can't see it.") - return 1 face_atom(A) @@ -642,7 +629,6 @@ var/list/slot_equipment_priority = list( \ else to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.") - /mob/verb/add_memory(msg as message) set name = "Add Note" set category = "IC" @@ -655,7 +641,6 @@ var/list/slot_equipment_priority = list( \ else to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.") - /mob/proc/store_memory(msg as message, popup, sane = 1) msg = copytext(msg, 1, MAX_MESSAGE_LEN) @@ -674,7 +659,6 @@ var/list/slot_equipment_priority = list( \ set src in usr if(usr != src) to_chat(usr, "No.") - var/msg = input(usr,"Set the flavor text in your 'examine' verb. Can also be used for OOC notes about your character.","Flavor Text",html_decode(flavor_text)) as message|null if(msg != null) @@ -703,19 +687,16 @@ var/list/slot_equipment_priority = list( \ if (!abandon_allowed) to_chat(usr, "Respawning is disabled.") - return if (stat != DEAD || !ticker) to_chat(usr, "You must be dead to use this!") - return log_game("[key_name(usr)] has respawned.") to_chat(usr, "Make sure to play a different character, and please roleplay correctly!") - if(!client) log_game("[key_name(usr)] respawn failed due to disconnect.") return @@ -744,7 +725,6 @@ var/list/slot_equipment_priority = list( \ is_admin = 1 else if(stat != DEAD || istype(src, /mob/new_player)) to_chat(usr, "\blue You must be observing to use this!") - return if(is_admin && stat == DEAD) @@ -960,7 +940,6 @@ var/list/slot_equipment_priority = list( \ if(!is_active()) return 0 to_chat(src, message) - return 1 /mob/proc/is_muzzled() @@ -1209,12 +1188,10 @@ mob/proc/yank_out_object() if(usr.stat == 1) to_chat(usr, "You are unconcious and cannot do that!") - return if(usr.restrained()) to_chat(usr, "You are restrained and cannot do that!") - return var/mob/S = src @@ -1229,21 +1206,17 @@ mob/proc/yank_out_object() if(!valid_objects.len) if(self) to_chat(src, "You have nothing stuck in your body that is large enough to remove.") - else to_chat(U, "[src] has nothing stuck in their wounds that is large enough to remove.") - return var/obj/item/weapon/selection = input("What do you want to yank out?", "Embedded objects") in valid_objects if(self) to_chat(src, "You attempt to get a good grip on [selection] in your body.") - else to_chat(U, "You attempt to get a good grip on [selection] in [S]'s body.") - if(!do_after(U, 80, target = S)) return if(!selection || !S || !U) @@ -1298,12 +1271,10 @@ mob/proc/yank_out_object() if(jobban_isbanned(usr, "NPC")) to_chat(usr, "You are banned from playing as NPC's.") - return if(!ticker || ticker.current_state < 3) to_chat(src, "You can't respawn as an NPC before the game starts!") - return if((usr in respawnable_list) && (stat==2 || istype(usr,/mob/dead/observer))) @@ -1328,7 +1299,6 @@ mob/proc/yank_out_object() respawnable_list += usr else to_chat(usr, "You are not dead or you have given up your right to be respawned!") - return @@ -1338,7 +1308,6 @@ mob/proc/yank_out_object() var/timedifference_text timedifference_text = time2text(mouse_respawn_time * 600 - timedifference,"mm:ss") to_chat(src, "You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.") - return //find a viable mouse candidate @@ -1354,12 +1323,10 @@ mob/proc/yank_out_object() else to_chat(src, "Unable to find any unwelded vents to spawn mice at.") - if(host) host.ckey = src.ckey to_chat(host, "You are now a mouse. Try to avoid interaction with players, and do not give hints away that you are more than a simple rodent.") - /mob/proc/assess_threat() //For sec bot threat assessment return diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index 72e3286525f..fcbcd410a89 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -263,7 +263,6 @@ else if(state < GRAB_NECK) if(isslime(affecting)) to_chat(assailant, "You squeeze [affecting], but nothing interesting happens.") - return assailant.visible_message("[assailant] has reinforced \his grip on [affecting] (now neck)!") @@ -320,7 +319,6 @@ if(I_HELP) /*if(force_down) to_chat(assailant, "You no longer pin [affecting] to the ground.") - force_down = 0 return*///This is a very basic demonstration of a new feature based on attacking someone with the grab, based on intent. //This specific example would allow you to stop pinning people to the floor without moving away from them. @@ -348,21 +346,17 @@ /*if(last_hit_zone == "eyes") if(state < GRAB_NECK) to_chat(assailant, "You require a better grab to do this.") - return if((affected.head && affected.head.flags & HEADCOVERSEYES) || \ (affected.wear_mask && affected.wear_mask.flags & MASKCOVERSEYES) || \ (affected.glasses && affected.glasses.flags & GLASSESCOVERSEYES)) to_chat(assailant, "You're going to need to remove the eye covering first.") - return if(!affected.internal_organs_by_name["eyes"]) to_chat(assailant, "You cannot locate any eyes on [affecting]!") - return assailant.visible_message("[assailant] presses \his fingers into [affecting]'s eyes!") to_chat(affecting, "You feel immense pain as digits are being pressed into your eyes!") - assailant.attack_log += text("\[[time_stamp()]\] Pressed fingers into the eyes of [affecting.name] ([affecting.ckey])") affecting.attack_log += text("\[[time_stamp()]\] Had fingers pressed into their eyes by [assailant.name] ([assailant.ckey])") msg_admin_attack("[key_name(assailant)] has pressed his fingers into [key_name(affecting)]'s eyes.") @@ -372,13 +366,11 @@ if(M.stat != 2) to_chat(M, "\red You go blind!")*///This is a demonstration of adding a new damaging type based on intent as well as hitzone. - //This specific example would allow you to squish people's eyes with a GRAB_NECK. if(I_DISARM) //This checks that the user is on disarm intent. /* if(state < GRAB_AGGRESSIVE) to_chat(assailant, "You require a better grab to do this.") - return if(!force_down) assailant.visible_message("[user] is forcing [affecting] to the ground!") @@ -391,7 +383,6 @@ return else to_chat(assailant, "You are already pinning [affecting] to the ground.") - return*///This is an example of something being done with an agressive grab + disarm intent. return diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 9abffc4284c..1f2e0e7b456 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -474,7 +474,6 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) if(usr.sleeping) to_chat(usr, "\red You are already sleeping") - return else if(alert(src,"You sure you want to sleep for a while?","Sleep","Yes","No") == "Yes") @@ -487,7 +486,6 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) resting = !resting to_chat(src, "\blue You are now [resting ? "resting" : "getting up"]") - /proc/is_blind(A) if(iscarbon(A)) var/mob/living/carbon/C = A @@ -558,16 +556,13 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) lname = "[lname] " to_chat(M, "[lname][follow][message]") - /proc/notify_ghosts(var/message, var/ghost_sound = null) //Easy notification of ghosts. for(var/mob/dead/observer/O in player_list) if(O.client) to_chat(O, "[message]") - if(ghost_sound) to_chat(O, sound(ghost_sound)) - /mob/proc/switch_to_camera(var/obj/machinery/camera/C) if (!C.can_use() || stat || (get_dist(C, src) > 1 || machine != src || blinded || !canmove)) return 0 @@ -649,7 +644,6 @@ var/list/intents = list(I_HELP,I_DISARM,I_GRAB,I_HARM) break //That's a suitable name! to_chat(src, "Sorry, that [role]-name wasn't appropriate, please try another. It's possibly too long/short, has bad characters or is already taken.") - if(!newname) //we'll stick with the oldname then return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 71ab4ba944f..68913c6ad25 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -51,13 +51,11 @@ var/module = R.get_selected_module() if(!module) to_chat(usr, "\red You have no module selected.") - return R.cycle_modules() R.uneq_numbered(module) else to_chat(usr, "\red This mob type cannot throw items.") - return @@ -66,19 +64,16 @@ var/mob/living/carbon/C = usr if(!C.get_active_hand()) to_chat(usr, "\red You have nothing to drop in your hand.") - return drop_item() else if(isrobot(usr)) var/mob/living/silicon/robot/R = usr if(!R.get_selected_module()) to_chat(usr, "\red You have no module selected.") - return R.deselect_module(R.get_selected_module()) else to_chat(usr, "\red This mob type cannot drop items.") - return //This gets called when you press the delete button. @@ -87,7 +82,6 @@ if(!usr.pulling) to_chat(usr, "\blue You are not pulling anything.") - return usr.stop_pulling() @@ -234,14 +228,12 @@ if(M.pulling == mob) if(!M.restrained() && M.stat == 0 && M.canmove && mob.Adjacent(M)) to_chat(src, "\blue You're restrained! You can't move!") - return 0 else M.stop_pulling() if(mob.pinned.len) to_chat(src, "\blue You're pinned to a wall by [mob.pinned[1]]!") - return 0 var/turf/T = mob.loc @@ -401,7 +393,6 @@ var/turf/simulated/floor/stepTurf = get_step(L, direct) if(stepTurf.flags & NOJAUNT) to_chat(L, "Holy energies block your path.") - L.notransform = 1 spawn(2) L.notransform = 0 @@ -451,7 +442,6 @@ to_chat(src, "You push off of [dense_object_backup] to propel yourself.") - return 1 return 0 diff --git a/code/modules/mob/mob_transformation_simple.dm b/code/modules/mob/mob_transformation_simple.dm index d60c4d7d9a0..856879acf38 100644 --- a/code/modules/mob/mob_transformation_simple.dm +++ b/code/modules/mob/mob_transformation_simple.dm @@ -6,7 +6,6 @@ if(istype(src,/mob/new_player)) to_chat(usr, "\red cannot convert players who have not entered yet.") - return if(!new_type) @@ -17,12 +16,10 @@ if( !ispath(new_type) ) to_chat(usr, "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder.") - return if( new_type == /mob/new_player ) to_chat(usr, "\red cannot convert into a new_player mob type.") - return var/mob/M @@ -33,7 +30,6 @@ if(!M || !ismob(M)) to_chat(usr, "Type path is not a mob (new_type = [new_type]) in change_mob_type(). Contact a coder.") - qdel(M) return diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm index 44db9388315..f6e2441e876 100644 --- a/code/modules/mob/new_player/login.dm +++ b/code/modules/mob/new_player/login.dm @@ -3,7 +3,6 @@ if(join_motd) to_chat(src, "
[join_motd]
") - if(!mind) mind = new /datum/mind(key) mind.active = 1 diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index d539b051208..ffb6f6c13b8 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -121,12 +121,10 @@ to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo - observer.started_as_observer = 1 close_spawn_windows() var/obj/O = locate("landmark*Observer-Start") to_chat(src, "\blue Now teleporting.") - observer.loc = O.loc observer.timeofdeath = world.time // Set the time of death so that the respawn timer works correctly. client.prefs.update_preview_icon(1) @@ -147,14 +145,12 @@ if(href_list["late_join"]) if(!ticker || ticker.current_state != GAME_STATE_PLAYING) to_chat(usr, "\red The round is either not ready, or has already finished...") - return if(client.prefs.species in whitelisted_species) if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species].")) - return 0 LateChoices() @@ -166,13 +162,11 @@ if(!enter_allowed) to_chat(usr, "\blue There is an administrative lock on entering the game!") - return if(client.prefs.species in whitelisted_species) if(!is_alien_whitelisted(src, client.prefs.species) && config.usealienwhitelist) to_chat(src, alert("You are currently not whitelisted to play [client.prefs.species].")) - return 0 AttemptLateSpawn(href_list["SelectedJob"],client.prefs.spawnpoint) @@ -214,7 +208,6 @@ if( (id_max - id_min) > 100 ) //Basic exploit prevention to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.") - return for(var/optionid = id_min; optionid <= id_max; optionid++) @@ -234,7 +227,6 @@ if( (id_max - id_min) > 100 ) //Basic exploit prevention to_chat(usr, "The option ID difference is too big. Please contact administration or the database admin.") - return for(var/optionid = id_min; optionid <= id_max; optionid++) @@ -267,15 +259,12 @@ return 0 if(!ticker || ticker.current_state != GAME_STATE_PLAYING) to_chat(usr, "\red The round is either not ready, or has already finished...") - return 0 if(!enter_allowed) to_chat(usr, "\blue There is an administrative lock on entering the game!") - return 0 if(!IsJobAvailable(rank)) to_chat(src, alert("[rank] is not available. Please try another.")) - return 0 job_master.AssignRole(src, rank, 1) @@ -315,7 +304,6 @@ join_message = S.msg else to_chat(character, "Your chosen spawnpoint ([S.display_name]) is unavailable for your chosen job. Spawning you at the Arrivals shuttle instead.") - character.loc = pick(latejoin) join_message = "has arrived on the station" else @@ -431,7 +419,6 @@ to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS cant last forever yo - if(mind) mind.active = 0 //we wish to transfer the key manually if(mind.assigned_role == "Clown") //give them a clownname if they are a clown diff --git a/code/modules/mob/new_player/poll.dm b/code/modules/mob/new_player/poll.dm index 11aa3b9a084..4ce44be1fd8 100644 --- a/code/modules/mob/new_player/poll.dm +++ b/code/modules/mob/new_player/poll.dm @@ -60,7 +60,6 @@ if(!found) to_chat(usr, "\red Poll question details not found.") - return switch(polltype) @@ -318,7 +317,6 @@ if(!validpoll) to_chat(usr, "\red Poll is not valid.") - return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]") @@ -332,7 +330,6 @@ if(!validoption) to_chat(usr, "\red Poll option is not valid.") - return var/alreadyvoted = 0 @@ -347,12 +344,10 @@ if(!multichoice && alreadyvoted) to_chat(usr, "\red You already voted in this poll.") - return if(multichoice && (alreadyvoted >= multiplechoiceoptions)) to_chat(usr, "\red You already have more than [multiplechoiceoptions] logged votes on this poll. Enough is enough. Contact the database admin if this is an error.") - return var/adminrank = "Player" @@ -364,7 +359,6 @@ insert_query.Execute() to_chat(usr, "\blue Vote successful.") - usr << browse(null,"window=playerpoll") @@ -390,7 +384,6 @@ if(!validpoll) to_chat(usr, "\red Poll is not valid.") - return var/alreadyvoted = 0 @@ -404,7 +397,6 @@ if(alreadyvoted) to_chat(usr, "\red You already sent your feedback for this poll.") - return var/adminrank = "Player" @@ -419,14 +411,12 @@ if(!text_pass) to_chat(usr, "The text you entered was blank, contained illegal characters or was too long. Please correct the text and submit again.") - return var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO [format_table_name("poll_textreply")] (id ,datetime ,pollid ,ckey ,ip ,replytext ,adminrank) VALUES (null, Now(), [pollid], '[usr.ckey]', '[usr.client.address]', '[replytext]', '[adminrank]')") insert_query.Execute() to_chat(usr, "\blue Feedback logging successful.") - usr << browse(null,"window=playerpoll") @@ -452,7 +442,6 @@ if(!validpoll) to_chat(usr, "\red Poll is not valid.") - return var/DBQuery/select_query2 = dbcon.NewQuery("SELECT id FROM [format_table_name("poll_option")] WHERE id = [optionid] AND pollid = [pollid]") @@ -466,7 +455,6 @@ if(!validoption) to_chat(usr, "\red Poll option is not valid.") - return var/alreadyvoted = 0 @@ -480,7 +468,6 @@ if(alreadyvoted) to_chat(usr, "\red You already voted in this poll.") - return var/adminrank = "Player" @@ -492,5 +479,4 @@ insert_query.Execute() to_chat(usr, "\blue Vote successful.") - usr << browse(null,"window=playerpoll") \ No newline at end of file diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 5cb41408c45..e5b12ed022b 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -43,12 +43,10 @@ if(!src.client.holder) if(!config.dsay_allowed) to_chat(src, "Deadchat is globally muted.") - return if(client && !(client.prefs.toggles & CHAT_DEAD)) to_chat(usr, "You have deadchat muted.") - return say_dead_direct("[pick("complains","moans","whines","laments","blubbers")], \"[message]\"", src) diff --git a/code/modules/mob/spirit/mask/mask.dm b/code/modules/mob/spirit/mask/mask.dm index 2777905e9d4..8ae366ef16a 100644 --- a/code/modules/mob/spirit/mask/mask.dm +++ b/code/modules/mob/spirit/mask/mask.dm @@ -21,7 +21,6 @@ to_chat(src, "You start following [cultist.get_display_name()].") - /mob/spirit/mask/verb/urge_cultist() set category = "Mask" set name = "Urge cultist" @@ -33,7 +32,6 @@ var/newUrge = stripped_input(usr, "", "Set Urge", "") cultist.set_urge(newUrge) to_chat(src, "You urge [cultist.owner.name] to [newUrge].") - cult_log("controlled by [key_name_admin(src)] has urged [key_name_admin(cultist.owner)] to [newUrge].") /mob/spirit/mask/verb/set_cult_name() @@ -48,7 +46,6 @@ return cultist.set_cult_name(newName) to_chat(src, "You grant [cultist.owner.name] the secret name of [newName].") - if (cultist.owner) cult_log("[key_name_admin(src)] has set [key_name_admin(cultist.owner)] to \'[newName]\'") @@ -62,7 +59,6 @@ for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints) viewpoint.set_urge(newUrge) to_chat(src, "You urge the entire cult to [newUrge].") - cult_log("[key_name_admin(src)] has urged the entire cult to [newUrge]") @@ -95,7 +91,6 @@ to_chat(src, "You have set your name to [name].") - /mob/spirit/mask/proc/pick_cultist() var/list/cultists = list() for(var/obj/cult_viewpoint/viewpoint in cult_viewpoints) @@ -139,12 +134,10 @@ for(var/datum/mind/H in ticker.mode.cult) if (H.current) to_chat(H.current, "[usr.name]: [input]") - for(var/mob/spirit/spirit in spirits) to_chat(spirit, "[usr.name]: [input]") - /obj/effect/proc_holder/spell/aoe_turf/shatter_lights name = "Spread Shadows" desc = "This spell breaks lights near the mask." @@ -202,7 +195,6 @@ var/imbue_value = talismans[talisman] if (!talisman) to_chat(usr, "You choose not to create a talisman.") - revert_cast(usr) return @@ -215,7 +207,6 @@ var/target_rune = input("Pick a teleport target", "Teleport Rune", null, null) as null|anything in engwords if (!target_rune) to_chat(usr, "You choose not to create a talisman.") - revert_cast(usr) return summon_type = list(/obj/item/weapon/paper/talisman) diff --git a/code/modules/mob/spirit/movement.dm b/code/modules/mob/spirit/movement.dm index 65b2a8c1bbe..65a992c1932 100644 --- a/code/modules/mob/spirit/movement.dm +++ b/code/modules/mob/spirit/movement.dm @@ -38,11 +38,9 @@ mob/spirit/proc/Spirit_Move(direct) if (!currentView) to_chat(U, "As a spirit, you may only track cultists.") - U.follow_target = target to_chat(U, "Now following [currentView.get_cult_name()].") - spawn (0) while (U.follow_target == target) if (U.follow_target == null) @@ -61,4 +59,3 @@ mob/spirit/verb/toggle_acceleration() acceleration = !acceleration to_chat(usr, "Acceleration has been toggled [acceleration ? "on" : "off"].") - diff --git a/code/modules/mob/spirit/spirit.dm b/code/modules/mob/spirit/spirit.dm index 116191ef851..a9b10f8224f 100644 --- a/code/modules/mob/spirit/spirit.dm +++ b/code/modules/mob/spirit/spirit.dm @@ -58,14 +58,11 @@ mob/spirit/Topic(href, href_list) ..() to_chat(usr, "Spirit Href = [href]") - for (var/tempref in href_list) to_chat(usr, "Spirit href list [tempref] = [href_list[tempref]]") - if (href_list["track"]) to_chat(usr, "Got to tracking.") - var/mob/target = locate(href_list["track"]) in mob_list var/mob/spirit/A = locate(href_list["track2"]) in spirits if(A && target) diff --git a/code/modules/mob/spirit/viewpoint.dm b/code/modules/mob/spirit/viewpoint.dm index 240672b21a7..90814317124 100644 --- a/code/modules/mob/spirit/viewpoint.dm +++ b/code/modules/mob/spirit/viewpoint.dm @@ -37,12 +37,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() set src in usr if (src.urge) to_chat(owner, "\red \b You feel the urge to [src.urge]") - else to_chat(owner, "\b You feel no supernatural compulsions.") - /obj/cult_viewpoint/verb/reach_out() set category = "Cult" set desc = "Reach out for your gods presence." @@ -52,13 +50,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() for(var/mob/spirit/mask/currentMask in spirits) if (currentMask.is_active()) to_chat(owner, "\red \b You feel the reassuring presence of your god.") - to_chat(currentMask, "[get_display_name()] has reached out to you.") - return to_chat(owner, "\b You feel a chilling absence.") - handle_missing_mask() @@ -70,15 +65,12 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() switch(favor) if(FAVOR_PLEASED) to_chat(owner, "\red \b You bask in your gods favor.") - if(FAVOR_INDIFFERENT) to_chat(owner, "\red \b You feel nothing.") - if(FAVOR_DISPLEASED) to_chat(owner, "\red \b You cringe at your gods displeasure.") - /obj/cult_viewpoint/verb/pray_to_mask() set category = "Cult" set desc = "Pray to your god" @@ -92,12 +84,10 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() cult_log("[key_name(usr,0)](Pray):[input]") to_chat(owner, "You pray to Nar'Sie: [input]") - for(var/mob/spirit/spirit in spirits) to_chat(spirit, "[get_display_name()] prays : [input]") - // PROCS /obj/cult_viewpoint/proc/set_favor(var/newFavor) favor = newFavor @@ -133,13 +123,11 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() if (newName) cult_name = newName to_chat(owner, "\red \b You have been blessed with the secret name of '[newName]'.") - else cult_name = null to_chat(owner, "\red \b Your god has taken your secret name.") - /obj/cult_viewpoint/proc/get_display_name() if(istype(src,/obj/effect/rune)) return name @@ -174,7 +162,6 @@ var/obj/cult_viewpoint/list/cult_viewpoints = list() return else to_chat(owner, "\b You cannot become a mask of Nar'Sie because a Mask already exists.") - mask_has_been_found() return diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 6ecf69a81b1..5e3641803ff 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -30,7 +30,6 @@ if(client) to_chat(src, sound(null, repeat = 0, wait = 0, volume = 85, channel = 1))// stop the jams for AIs - var/mob/living/silicon/ai/O = new (loc,,,1)//No MMI but safety is in effect. O.invisibility = 0 O.aiRestorePowerRoutine = 0 @@ -56,7 +55,6 @@ loc_landmark = tripai if (!loc_landmark) to_chat(O, "Oh god sorry we can't find an unoccupied AI spawn location, so we're spawning you on top of someone.") - for(var/obj/effect/landmark/start/sloc in landmarks_list) if (sloc.name == "AI") loc_landmark = sloc @@ -110,10 +108,8 @@ qdel(src) to_chat(new_spirit, "You are a Mask of Nar'sie now. You are a tiny fragment of the unknowable entity that is the god.") - to_chat(new_spirit, "Your job is to help your acolytes complete their goals. Be spooky. Do evil.") - new_spirit.set_name() // let spirits identify cultists @@ -214,7 +210,6 @@ new_xeno.key = key to_chat(new_xeno, "You are now an alien.") - new_xeno.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -251,7 +246,6 @@ new_slime.key = key to_chat(new_slime, "You are now a slime. Skreee!") - new_slime.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -275,7 +269,6 @@ new_corgi.key = key to_chat(new_corgi, "You are now a Corgi. Yap Yap!") - new_corgi.update_pipe_vision() spawn(0)//To prevent the proc from returning null. qdel(src) @@ -307,7 +300,6 @@ to_chat(new_mob, "You suddenly feel more... animalistic.") - new_mob.update_pipe_vision() spawn() qdel(src) @@ -323,7 +315,6 @@ new_mob.key = key new_mob.a_intent = I_HARM to_chat(new_mob, "You feel more... animalistic") - new_mob.update_pipe_vision() qdel(src) diff --git a/code/modules/mob/typing_indicator.dm b/code/modules/mob/typing_indicator.dm index bd232accab6..49d9a7aad48 100644 --- a/code/modules/mob/typing_indicator.dm +++ b/code/modules/mob/typing_indicator.dm @@ -85,7 +85,6 @@ var/global/image/typing_indicator prefs.save_preferences(src) to_chat(src, "You will [(prefs.toggles & SHOW_TYPING) ? "no longer" : "now"] display a typing indicator.") - // Clear out any existing typing indicator. if(prefs.toggles & SHOW_TYPING) if(istype(mob)) mob.set_typing_indicator(0) diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index d4fdb1e368c..848530c3c1d 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -7,7 +7,6 @@ var/turf/T = get_turf(nano_host()) if (!T || !(T.z in config.player_levels)) to_chat(usr, "Unable to establish a connection: You're too far away from the station!") - return 0 if(href_list["track"]) if(isAI(usr)) diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm index e8ae6b8b748..df00504cf1f 100644 --- a/code/modules/nano/modules/law_manager.dm +++ b/code/modules/nano/modules/law_manager.dm @@ -135,17 +135,14 @@ if(href_list["notify_laws"]) to_chat(owner, "Law Notice") - owner.laws.show_laws(owner) if(isAI(owner)) var/mob/living/silicon/ai/AI = owner for(var/mob/living/silicon/robot/R in AI.connected_robots) to_chat(R, "Law Notice") - R.laws.show_laws(R) if(usr != owner) to_chat(usr, "Laws displayed.") - return 1 return 0 diff --git a/code/modules/nano/nanomapgen.dm b/code/modules/nano/nanomapgen.dm index 1518da77b78..62ad6649e20 100644 --- a/code/modules/nano/nanomapgen.dm +++ b/code/modules/nano/nanomapgen.dm @@ -34,20 +34,17 @@ if (currentZ < 0 || currentZ > world.maxz) to_chat(usr, "NanoMapGen: ERROR: currentZ ([currentZ]) must be between 1 and [world.maxz]") - sleep(3) return NANOMAP_TERMINALERR if (startX > endX) to_chat(usr, "NanoMapGen: ERROR: startX ([startX]) cannot be greater than endX ([endX])") - sleep(3) return NANOMAP_TERMINALERR if (startY > endX) to_chat(usr, "NanoMapGen: ERROR: startY ([startY]) cannot be greater than endY ([endY])") - sleep(3) return NANOMAP_TERMINALERR @@ -60,7 +57,6 @@ log_to_dd("NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") to_chat(usr, "NanoMapGen: GENERATE MAP ([startX],[startY],[currentZ]) to ([endX],[endY],[currentZ])") - var/count = 0; for(var/WorldX = startX, WorldX <= endX, WorldX++) for(var/WorldY = startY, WorldY <= endY, WorldY++) @@ -88,7 +84,6 @@ to_chat(usr, "NanoMapGen: Done. File [mapFilename] uploaded to your cache.") - if (Tile.Width() != NANOMAP_MAX_ICON_DIMENSION || Tile.Height() != NANOMAP_MAX_ICON_DIMENSION) return NANOMAP_BADOUTPUT diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index 890c904d118..7675d3b2c81 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -458,7 +458,6 @@ nanoui is used to open and update nano browser uis // to_chat(user, list2json_usecache(send_data))// used for debugging //NANO DEBUG HOOK - user << output(list2params(list(list2json_usecache(send_data))),"[window_id].browser:receiveUpdateData") /** diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 85ff99ace23..5e6a1cbcb32 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -67,7 +67,6 @@ if(msg) to_chat(user, "[msg]") - /obj/item/weapon/katana/energy/New() ..() spark_system = new /datum/effect/system/spark_spread() diff --git a/code/modules/ninja/martial_art.dm b/code/modules/ninja/martial_art.dm index 441aa02109f..0903425f89d 100644 --- a/code/modules/ninja/martial_art.dm +++ b/code/modules/ninja/martial_art.dm @@ -23,7 +23,6 @@ "[user] sticks the [src]'s needle \his arm and presses the button.") to_chat(user, "The nanomachines in the [src] flow through your bloodstream.") - var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null) N.teach(user) @@ -33,7 +32,6 @@ return 0 else to_chat(user, "The [src] has been used already!") - return 1 // Ninja martial art datum @@ -48,7 +46,6 @@ ..() H.middleClickOverride = new /datum/middleClickOverride/ninja_martial_art() to_chat(H, "You have been taugh the ways of the Creeping Widow.
\) - Your stikes on harm intent will deal more damage.
Using middle mouse button on a nearby person while on harm intent will send them flying backwards.
\ Your grabs will instantly be aggressive while you are using this style.
Using middle mouse button while on harm intent and behind a person will put them in a silencing choke hold.
\ Using middle mouse button on a nearby person while on disarm intent will wrench their wrist, causing them to drop what they are holding." @@ -68,7 +65,6 @@ spawn(50) has_focus = 1 return 1 to_chat(A, "You are not focused enough to use that move yet!") - return 0 return A.pointed(D) @@ -77,12 +73,10 @@ A.face_atom(D) if(A.dir != D.dir) // If the user's direction is not the same as the target's after A.face_atom(D) you are not behind them, and cannot use this ability. to_chat(A, "You cannot grab [D] from that angle!") - return 0 if(has_choke_hold) // Are we already choking someone? to_chat(A, "You are have a target in your grip!") - return 0 has_choke_hold = 1 @@ -112,9 +106,7 @@ sleep(5) to_chat(A, "You feel [D] go limp in your grip.") - to_chat(D, "You feel your consciousness slip away as [A] strangles you!") - D.AdjustParalysis(20) has_choke_hold = 0 @@ -140,7 +132,6 @@ spawn(50) has_focus = 1 return 1 to_chat(A, "You are not focused enough to use that move yet!") - return 0 return A.pointed(D) diff --git a/code/modules/ninja/suit/SpiderOS.dm b/code/modules/ninja/suit/SpiderOS.dm index 7d5d8e3216d..871e8215bbd 100644 --- a/code/modules/ninja/suit/SpiderOS.dm +++ b/code/modules/ninja/suit/SpiderOS.dm @@ -12,7 +12,6 @@ to_chat(affecting, "The interface is locked!") - /obj/item/clothing/suit/space/space_ninja/proc/display_spideros() if(!affecting) return//If no mob is wearing the suit. I almost forgot about this variable. var/mob/living/carbon/human/U = affecting @@ -196,7 +195,6 @@ if(!affecting||U.stat||!s_initialized)//Check to make sure the guy is wearing the suit after clicking and it's on. to_chat(U, "Your suit must be worn and active to use this function.") - U << browse(null, "window=spideros")//Closes the window. return @@ -220,7 +218,6 @@ return if(isnull(P)||P.toff)//So it doesn't freak out if the object no-longer exists. to_chat(display_to, "Error: unable to deliver message.") - display_spideros() return @@ -230,15 +227,12 @@ if("Inject") if( (href_list["tag"]=="radium"? (reagents.get_reagent_amount("radium"))<=(a_boost*a_transfer) : !reagents.get_reagent_amount(href_list["tag"])) )//Special case for radium. If there are only a_boost*a_transfer radium units left. to_chat(display_to, "Error: the suit cannot perform this function. Out of [href_list["name"]].") - else reagents.reaction(U, 2) reagents.trans_id_to(U, href_list["tag"], href_list["tag"]=="nutriment"?5:a_transfer)//Nutriment is a special case since it's very potent. Shouldn't influence actual refill amounts or anything. to_chat(display_to, "Injecting...") - to_chat(U, "You feel a tiny prick and a sudden rush of substance in to your veins.") - if("Trigger Ability") var/ability_name = href_list["name"]+href_list["cost"]//Adds the name and cost to create the full proc name. var/proc_arguments//What arguments to later pass to the proc, if any. @@ -258,7 +252,6 @@ safety = 0 if(!safety) to_chat(U, "[href_list["name"]] suddenly triggered!") - call(src,ability_name)(proc_arguments) if("Eject Disk") @@ -274,11 +267,9 @@ else to_chat(U, "ERROR: Could not eject disk.") - if("Copy to Disk") var/datum/tech/current_data = locate(href_list["target"]) to_chat(U, "[current_data.name] successfully [(!t_disk.stored) ? "copied" : "overwritten"] to disk.") - t_disk.stored = current_data diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index f676132c335..936f947758d 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -31,23 +31,18 @@ Contents: if(!suitActive) if(!istype(user.wear_suit, /obj/item/clothing/suit/space/space_ninja)) to_chat(user, "ERROR: Unable to locate user.\nABORTING...") - return 0 if(!istype(user.head, /obj/item/clothing/head/helmet/space/space_ninja)) to_chat(user, "ERROR: Unable to locate hood.\nABORTING...") - return 0 if(!istype(user.gloves, /obj/item/clothing/gloves/space_ninja)) to_chat(user, "ERROR: Unable to locate gloves.\nABORTING...") - return 0 if(!istype(user.shoes, /obj/item/clothing/shoes/space_ninja)) to_chat(user, "ERROR: Unable to locate foot gear.\nABORTING...") - return 0 if(!istype(user.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)) to_chat(user, "ERROR: Unable to locate mask.\nABORTING...") - return 0 suitHood = user.head diff --git a/code/modules/ninja/suit/suit_attackby.dm b/code/modules/ninja/suit/suit_attackby.dm index fb834cdb469..620c2261782 100644 --- a/code/modules/ninja/suit/suit_attackby.dm +++ b/code/modules/ninja/suit/suit_attackby.dm @@ -6,7 +6,6 @@ var/obj/item/weapon/stock_parts/cell/CELL if(CELL.maxcharge > cell.maxcharge && suitGloves) to_chat(U, "Higher maximum capacity detected.\nUpgrading...") - if (n_gloves && n_gloves.candrain && do_after(U,s_delay, target = U)) U.drop_item() CELL.loc = src @@ -19,9 +18,7 @@ old_cell.updateicon() cell = CELL to_chat(U, "Upgrade complete. Maximum capacity: [round(cell.maxcharge/100)]%") - else to_chat(U, "Procedure interrupted. Protocol terminated.") - return ..() \ No newline at end of file diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index a93c8680975..f1abfbe725a 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -9,7 +9,6 @@ if(usr.mind.special_role == "Ninja") if(suitBusy) to_chat(usr, "ERROR: Suit systems busy, cannot initiate [suitActive ? "de-activation" : "activation"] protocals at this time.") - return suitBusy = 1 @@ -17,33 +16,26 @@ if(suitActive && (alert("Confirm suit systems shutdown? This cannot be halted once it has started.", "Confirm Shutdown", "Yes", "No") == "Yes")) to_chat(usr, "Now de-initializing...") - sleep(15) to_chat(usr, "Logging off, [usr.real_name]. Shutting down SpiderOS.") - sleep(10) to_chat(usr, "Primary system status: OFFLINE.\nBackup system status: OFFLINE.") - sleep(5) to_chat(usr, "VOID-shift device status: OFFLINE.\nCLOAK-tech device status: OFFLINE.") - //TODO: Shut down any active abilities sleep(10) to_chat(usr, "Disconnecting neural-net interface... Success.") - usr.hud_used.instantiate() usr.regenerate_icons() sleep(5) to_chat(usr, "Disengaging neural-net interface... Success.") - sleep(10) to_chat(usr, "Unsecuring external locking mechanism...\nNeural-net abolished.\nOperation status: FINISHED.") - //TODO: Grant verbs toggle_suit_lock(usr) usr.regenerate_icons() @@ -53,45 +45,35 @@ else if(!suitActive) // Activate the suit. to_chat(usr, "Now initializing...") - sleep(15) to_chat(usr, "Now establishing neural-net interface...") - if(usr.mind.special_role != "Ninja") - to_chat(usr, "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") - + to_chat(usr, "FĆAL �Rr�R: ŧer nt recgnized, c-cntr-r䣧-ç äcked.") return sleep(10) to_chat(usr, "Neural-net established. Now monitoring brainwave pattern. \nBrainwave pattern GREEN, proceeding.") - sleep(10) to_chat(usr, "Securing external locking mechanism...") - if(!toggle_suit_lock(usr)) return sleep(5) to_chat(usr, "Suit secured, extending neural-net interface...") - usr.hud_used.human_hud('icons/mob/screen1_NinjaHUD.dmi',"#ffffff",255) usr.regenerate_icons() sleep(10) to_chat(usr, "VOID-shift device status: ONLINE.\nCLOAK-tech device status:ONLINE") - sleep(5) to_chat(usr, "Primary system status: ONLINE.\nBackup system status: ONLINE.") - if(suitCell) to_chat(usr, "Current energy capacity: [suitCell.charge]/[suitCell.maxcharge].") - sleep(10) to_chat(usr, "All systems operational. Welcome to SpiderOS, [usr.real_name].") - //TODO: Grant ninja verbs here. suitBusy = 0 suitActive = 1 @@ -99,8 +81,6 @@ else suitBusy = 0 to_chat(usr, "NOTICE: Suit de-activation protocals aborted.") - else - to_chat(usr, "FĆAL �Rr�R: µ§er n¤t rec¤gnized, c-c¤ntr-r¤£§-£§ £¤cked.") - + to_chat(usr, "FĆAL �Rr�R: ŧer nt recgnized, c-cntr-r䣧-ç äcked.") return \ No newline at end of file diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm index 9599878593e..643c5b1fbb7 100644 --- a/code/modules/paperwork/carbonpaper.dm +++ b/code/modules/paperwork/carbonpaper.dm @@ -42,11 +42,9 @@ copy.fields = c.fields copy.updateinfolinks() to_chat(usr, "You tear off the carbon-copy!") - c.copied = 1 copy.iscopy = 1 copy.update_icon() c.update_icon() else to_chat(usr, "There are no more carbon copies attached to this paper!") - diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index ce52a5e6b8c..fbb26b650a8 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -50,7 +50,6 @@ if(istype(W, /obj/item/weapon/paper)) toppaper = W to_chat(user, "You clip the [W] onto \the [src].") - update_icon() else if(istype(toppaper) && istype(W, /obj/item/weapon/pen)) @@ -105,7 +104,6 @@ haspen = W to_chat(usr, "You slot the pen into \the [src].") - else if(href_list["write"]) var/obj/item/weapon/P = locate(href_list["write"]) @@ -149,7 +147,6 @@ toppaper = P to_chat(usr, "You move [P.name] to the top.") - //Update everything attack_self(usr) update_icon() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 576c7e1ace7..23a0f3eec7e 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -45,11 +45,9 @@ var/list/alldepartments = list() if(!emagged) emagged = 1 to_chat(user, "The transmitters realign to an unknown source!") - else to_chat(user, "You swipe the card through [src], but nothing happens.") - /obj/machinery/photocopier/faxmachine/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/data[0] if(scan) @@ -103,7 +101,6 @@ var/list/alldepartments = list() copyitem.loc = usr.loc usr.put_in_hands(copyitem) to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null else var/obj/item/I = usr.get_active_hand() @@ -112,7 +109,6 @@ var/list/alldepartments = list() copyitem = I I.loc = src to_chat(usr, "You insert \the [I] into \the [src].") - flick(insert_anim, src) if(href_list["scan"]) @@ -270,4 +266,3 @@ var/list/alldepartments = list() for(var/client/C in admins) if(R_EVENT & C.holder.rights) to_chat(C, msg) - diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index f09eefd3e79..cd52d4424e3 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -36,7 +36,6 @@ /obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob, params) if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/weapon/paper_bundle) || istype(P, /obj/item/documents)) to_chat(user, "You put [P] in [src].") - user.drop_item() P.loc = src icon_state = "[initial(icon_state)]-open" @@ -47,16 +46,13 @@ playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - else to_chat(user, "You can't put [P] in [src]!") - /obj/structure/filingcabinet/attack_hand(mob/user as mob) if(contents.len <= 0) to_chat(user, "\The [src] is empty.") - return user.set_machine(src) @@ -82,11 +78,9 @@ if(prob(25)) step_rand(I) to_chat(user, "You pull \a [I] out of [src] at random.") - return to_chat(user, "You find nothing in [src].") - /obj/structure/filingcabinet/Topic(href, href_list) if(href_list["retrieve"]) usr << browse("", "window=filingcabinet") // Close the menu diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 7ff2875a6e5..12f9e13a4e9 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -33,7 +33,6 @@ user.drop_item() W.loc = src to_chat(user, "You put the [W] into \the [src].") - update_icon() else if(istype(W, /obj/item/weapon/pen)) var/n_name = input(usr, "What would you like to label the folder?", "Folder Labelling", null) as text|null diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm index a8fca4f0831..f988cf117cc 100644 --- a/code/modules/paperwork/frames.dm +++ b/code/modules/paperwork/frames.dm @@ -71,7 +71,6 @@ update_icon() else to_chat(user, "There is nothing to remove from \the [src].") - else if(istype(I, /obj/item/weapon/crowbar)) playsound(src, 'sound/items/Crowbar.ogg', 100, 1) user.visible_message("[user] breaks down \the [src].", "You break down \the [src].") @@ -91,7 +90,6 @@ update_icon() else to_chat(user, "\The [src] already contains \a [displayed].") - else return ..() @@ -106,17 +104,14 @@ for(var/obj/O in user.loc.contents) //Let's see if it already has a poster on it or too much stuff if(istype(O, /obj/structure/sign)) to_chat(user, "\The [T] is far too cluttered to place \a [src]!") - return stuff_on_wall++ if(stuff_on_wall >= 4) to_chat(user, "\The [T] is far too cluttered to place \a [src]!") - return to_chat(user, "You start place \the [src] on \the [T].") - var/px = 0 var/py = 0 var/newdir = getRelativeDirection(user, T) @@ -132,7 +127,6 @@ px = -32 else to_chat(user, "You cannot reach \the [T] from here!") - return user.unEquip(src) @@ -233,11 +227,9 @@ if(istype(I, /obj/item/weapon/grenade) || istype(I, /obj/item/weapon/c4)) if(explosive) to_chat(user, "There is already a device attached behind \the [src], remove it first.") - return 1 if(!tilted) to_chat(user, "\The [src] needs to be already tilted before being rigged with \the [I].") - return 1 user.visible_message("[user] is fiddling around behind \the [src].", "You begin to secure \the [I] behind \the [src].") if(do_after(user, 150, target = src)) diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index bc03f335be8..8dbfbd9c1b4 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -16,27 +16,21 @@ if(!labels_left) to_chat(user, "No labels left.") - return if(!label || !length(label)) to_chat(user, "No text set.") - return if(length(A.name) + length(label) > 64) to_chat(user, "Label too big.") - return if(ishuman(A)) to_chat(user, "You can't label humans.") - return if(issilicon(A)) to_chat(user, "You can't label cyborgs.") - return if(istype(A, /obj/item/weapon/reagent_containers/glass)) to_chat(user, "The label can't stick to the [A.name]. (Try using a pen)") - return user.visible_message("[user] labels [A] as [label].", \ @@ -48,16 +42,12 @@ icon_state = "labeler[mode]" if(mode) to_chat(user, "You turn on \the [src].") - //Now let them chose the text. var/str = copytext(reject_bad_text(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) to_chat(user, "Invalid text.") - return label = str to_chat(user, "You set the text to '[str]'.") - else to_chat(user, "You turn off \the [src].") - diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index fb4d7816dd9..bf847a06c0a 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -58,7 +58,6 @@ else to_chat(user, "You have to go closer if you want to read it.") - /obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1) var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper) assets.send(user) @@ -83,7 +82,6 @@ if((CLUMSY in usr.mutations) && prob(50)) to_chat(usr, "You cut yourself on the paper.") - return var/n_name = sanitize(copytext(input(usr, "What would you like to label the paper?", "Paper Labelling", name) as text, 1, MAX_MESSAGE_LEN)) if((loc == usr && usr.stat == 0)) @@ -128,7 +126,6 @@ var/mob/living/carbon/human/H = M if(H == user) to_chat(user, "You wipe off your face with [src].") - H.lip_style = null H.update_body() else @@ -316,7 +313,6 @@ else to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") - /obj/item/weapon/paper/Topic(href, href_list) ..() if(!usr || (usr.stat || usr.restrained())) @@ -346,7 +342,6 @@ for(var/bad in paper_blacklist) if(findtext(t,bad)) to_chat(usr, "\blue You think to yourself, \"Hm.. this is only paper...\"") - log_admin("PAPER: [key_name(usr)] tried to use forbidden word in [src]: [bad].") message_admins("PAPER: [key_name_admin(usr)] tried to use forbidden word in [src]: [bad].") return @@ -383,7 +378,6 @@ var/obj/item/weapon/paper/carbon/C = P if (!C.iscopy && !C.copied) to_chat(user, "Take off the carbon copy first.") - add_fingerprint(user) return var/obj/item/weapon/paper_bundle/B = new(src.loc) @@ -420,7 +414,6 @@ if(h_user.client) h_user.client.screen -= src h_user.put_in_hands(B) to_chat(user, "You clip the [P.name] to [(src.name == "paper") ? "the paper" : src.name].") - src.loc = B P.loc = B B.amount++ @@ -442,14 +435,12 @@ if(istype(P, /obj/item/weapon/stamp/clown)) if(!clown) to_chat(user, "You are totally unable to use the stamp. HONK!") - return stamp(P) to_chat(user, "You stamp the paper with your rubber stamp.") - else if(istype(P, /obj/item/weapon/lighter)) burnpaper(P, user) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index e43c47f01c3..a99efb09294 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -25,7 +25,6 @@ var/obj/item/weapon/paper/carbon/C = P if (!C.iscopy && !C.copied) to_chat(user, "Take off the carbon copy first.") - add_fingerprint(user) return @@ -33,7 +32,6 @@ if(screen == 2) screen = 1 to_chat(user, "You add [(P.name == "paper") ? "the paper" : P.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") - user.unEquip(P) P.loc = src if(istype(user,/mob/living/carbon/human)) @@ -45,7 +43,6 @@ if(screen == 2) screen = 1 to_chat(user, "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") - user.unEquip(W) W.loc = src else if(istype(W, /obj/item/weapon/lighter)) @@ -59,7 +56,6 @@ if(screen == 2) screen = 1 to_chat(user, "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].") - qdel(W) else if(istype(W, /obj/item/stack/tape_roll)) @@ -100,14 +96,12 @@ else to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") - /obj/item/weapon/paper_bundle/examine(mob/user) if(..(user, 1)) src.show_content(user) else to_chat(user, "It is too far away.") - /obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob) var/dat var/obj/item/weapon/W = src[page] @@ -169,7 +163,6 @@ var/obj/item/weapon/W = src[page] usr.put_in_hands(W) to_chat(usr, "You remove the [W.name] from the bundle.") - if(amount == 1) var/obj/item/weapon/paper/P = src[1] usr.unEquip(src) @@ -184,7 +177,6 @@ update_icon() else to_chat(usr, "You need to hold it in your hands to change pages.") - if (istype(src.loc, /mob)) src.attack_self(src.loc) updateUsrDialog() @@ -209,7 +201,6 @@ set src in usr to_chat(usr, "You loosen the bundle.") - for(var/obj/O in src) O.loc = usr.loc O.layer = initial(O.layer) diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index b5528b41375..cd3afbd400d 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -55,7 +55,6 @@ temp = H.organs_by_name["l_hand"] if(temp && !temp.is_usable()) to_chat(H, "You try to move your [temp.name], but cannot!") - return if(amount >= 1) amount-- @@ -77,11 +76,9 @@ P.loc = user.loc user.put_in_hands(P) to_chat(user, "You take [P] out of the [src].") - else to_chat(user, "[src] is empty!") - add_fingerprint(user) return @@ -93,7 +90,6 @@ user.drop_item() i.loc = src to_chat(user, "You put [i] in [src].") - papers.Add(i) amount++ @@ -102,12 +98,10 @@ if(..(user, 1)) if(amount) to_chat(usr, "There " + (amount > 1 ? "are [amount] papers" : "is one paper") + " in the bin.") - else to_chat(usr, "There are no papers in the bin.") - /obj/item/weapon/paper_bin/update_icon() if(amount < 1) icon_state = "paper_bin0" @@ -134,10 +128,8 @@ P.loc = user.loc user.put_in_hands(P) to_chat(user, "You take [P] out of the [src].") - else to_chat(user, "[src] is empty!") - add_fingerprint(user) return diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index afea1699041..46d080adb6f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -26,7 +26,6 @@ /obj/item/weapon/pen/suicide_act(mob/user) to_chat(viewers(user), "[user] starts scribbling numbers over \himself with the [src.name]! It looks like \he's trying to commit sudoku.") - return (BRUTELOSS) /obj/item/weapon/pen/blue @@ -112,9 +111,7 @@ if(!force) if(M.can_inject(user, 1)) to_chat(user, "You stab [M] with the pen.") - // to_chat(M, "You feel a tiny prick!") - . = 1 add_logs(M, user, "stabbed", object="[name]") @@ -165,7 +162,6 @@ throwforce = initial(throwforce) playsound(user, 'sound/weapons/saberoff.ogg', 5, 1) to_chat(user, "[src] can now be concealed.") - else on = 1 force = 18 @@ -177,7 +173,6 @@ throwforce = 35 playsound(user, 'sound/weapons/saberon.ogg', 5, 1) to_chat(user, "[src] is now active.") - update_icon() /obj/item/weapon/pen/edagger/update_icon() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index d7b67f42045..d6b4b6ad213 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -64,7 +64,6 @@ sleep(15) else to_chat(usr, "\The [copyitem] can't be copied by \the [src].") - break use_power(active_power_usage) @@ -74,12 +73,10 @@ copyitem.loc = usr.loc usr.put_in_hands(copyitem) to_chat(usr, "You take \the [copyitem] out of \the [src].") - copyitem = null updateUsrDialog() else if(check_ass()) to_chat(ass, "You feel a slight pressure on your ass.") - updateUsrDialog() else if(href_list["min"]) if(copies > 1) @@ -121,29 +118,24 @@ copyitem = O O.loc = src to_chat(user, "You insert \the [O] into \the [src].") - flick(insert_anim, src) updateUsrDialog() else to_chat(user, "There is already something in \the [src].") - else if(istype(O, /obj/item/device/toner)) if(toner <= 10) //allow replacing when low toner is affecting the print darkness user.drop_item() to_chat(user, "You insert the toner cartridge into \the [src].") - var/obj/item/device/toner/T = O toner += T.toner_amount qdel(O) updateUsrDialog() else to_chat(user, "This cartridge is not yet ready for replacement! Use up the rest of the toner.") - else if(istype(O, /obj/item/weapon/wrench)) playsound(loc, 'sound/items/Ratchet.ogg', 50, 1) anchored = !anchored to_chat(user, "You [anchored ? "wrench" : "unwrench"] \the [src].") - else if(istype(O, /obj/item/weapon/grab)) //For ass-copying. var/obj/item/weapon/grab/G = O if(ismob(G.affecting) && G.affecting != ass) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index 679d466dfd7..b63dcc2750c 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -69,14 +69,12 @@ else to_chat(user, "\red You must hold \the [P] steady to burn \the [src].") - /obj/item/weapon/photo/examine(mob/user) if(..(user, 1) || isobserver(user)) show(user) else to_chat(user, "It is too far away.") - /obj/item/weapon/photo/proc/show(mob/user as mob) usr << browse_rsc(img, "tmp_photo.png") usr << browse("[name]" \ @@ -179,7 +177,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s size = nsize to_chat(usr, "Camera will now take [size]x[size] photos.") - /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob) return @@ -190,17 +187,14 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s else src.icon_state = icon_off to_chat(user, "You switch the camera [on ? "on" : "off"].") - return /obj/item/device/camera/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/device/camera_film)) if(pictures_left) to_chat(user, "[src] still has some film in it!") - return to_chat(user, "You insert [I] into [src].") - user.drop_item() qdel(I) pictures_left = pictures_max @@ -311,7 +305,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s pictures_left-- desc = "A polaroid camera. It has [pictures_left] photos left." to_chat(user, "[pictures_left] photos left.") - icon_state = icon_off on = 0 if(user.mind && !(user.mind.assigned_role == "Chaplain")) @@ -435,10 +428,8 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s /obj/item/device/camera/digital/captureimage(atom/target, mob/user, flag) if(saved_pictures.len >= max_storage) to_chat(user, "Maximum photo storage capacity reached.") - return to_chat(user, "Picture saved.") - var/x_c = target.x - (size-1)/2 var/y_c = target.y + (size-1)/2 var/z_c = target.z @@ -464,11 +455,9 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s if(saved_pictures.len == 0) to_chat(usr, "No images saved.") - return if(pictures_left == 0) to_chat(usr, "There is no film left to print.") - return var/datum/picture/P = null @@ -484,7 +473,6 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s if(saved_pictures.len == 0) to_chat(usr, "No images saved") - return var/datum/picture/P = null P = input("Select image to delete:",P) as null|anything in saved_pictures @@ -530,12 +518,10 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s camera.c_tag = user.name to_chat(user, "You switch the camera [on ? "on" : "off"].") - /obj/item/device/videocam/examine(mob/user) if(..(user, 1)) to_chat(user, "This video camera can send live feeds to the entertainment network. It's [camera ? "" : "in"]active.") - /obj/item/device/videocam/hear_talk(mob/M as mob, msg) if (camera && on) if(get_dist(src, M) <= canhear_range) @@ -560,4 +546,3 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') to_chat(user, pick(creepyasssounds)) - diff --git a/code/modules/paperwork/silicon_photography.dm b/code/modules/paperwork/silicon_photography.dm index 825124568c1..83740eac7ee 100644 --- a/code/modules/paperwork/silicon_photography.dm +++ b/code/modules/paperwork/silicon_photography.dm @@ -32,12 +32,10 @@ to_chat(C.connected_ai, "Image recorded and saved by [name]") to_chat(usr, "Image recorded and saved to remote database")//feedback to the Cyborg player that the picture was taken - else injectaialbum(P) to_chat(usr, "Image recorded") - /obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam) if(!cam) cam = getsource() @@ -46,7 +44,6 @@ var/find if(cam.aipictures.len == 0) to_chat(usr, "No images saved") - return for(var/datum/picture/t in cam.aipictures) nametemp += t.fields["name"] @@ -67,7 +64,6 @@ P.show(usr) to_chat(usr, P.desc) - // TG uses a special garbage collector.. qdel(P) qdel(P) //so 10 thousand pictures items are not left in memory should an AI take them and then view them all. @@ -80,7 +76,6 @@ cam.aipictures -= selection to_chat(usr, "Image deleted") - /obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user) var/mob/living/silicon/ai = user return ai.TurfAdjacent(T) @@ -95,17 +90,14 @@ src.in_camera_mode = 0 to_chat(usr, "Camera Mode deactivated") - /obj/item/device/camera/siliconcam/proc/camera_mode_on() src.in_camera_mode = 1 to_chat(usr, "Camera Mode activated") - /obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, datum/picture/P) injectaialbum(P) to_chat(usr, "Image recorded") - /obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, datum/picture/P) injectmasteralbum(P) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index c491ae5559c..96c5eedff2d 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -297,18 +297,15 @@ var/global/list/obj/item/device/pda/PDAs = list() notifying_programs.Cut() overlays.Cut() to_chat(usr, "You press the reset button on \the [src].") - else to_chat(usr, "You cannot do this while restrained.") - /obj/item/device/pda/proc/remove_id() if (id) if (ismob(loc)) var/mob/M = loc M.put_in_hands(id) to_chat(usr, "You remove the ID from the [name].") - else id.forceMove(get_turf(src)) id = null @@ -326,12 +323,10 @@ var/global/list/obj/item/device/pda/PDAs = list() remove_id() else to_chat(usr, "This PDA does not have an ID in it.") - else to_chat(usr, "You cannot do this while restrained.") - /obj/item/device/pda/verb/verb_remove_pen() set category = "Object" set name = "Remove pen" @@ -348,17 +343,14 @@ var/global/list/obj/item/device/pda/PDAs = list() if(M.get_active_hand() == null) M.put_in_hands(O) to_chat(usr, "You remove \the [O] from \the [src].") - return O.forceMove(get_turf(src)) else to_chat(usr, "This PDA does not have a pen in it.") - else to_chat(usr, "You cannot do this while restrained.") - /obj/item/device/pda/proc/id_check(mob/user as mob, choice as num)//To check for IDs; 1 for in-pda use, 2 for out of pda use. if(choice == 1) if (id) @@ -388,7 +380,6 @@ var/global/list/obj/item/device/pda/PDAs = list() cartridge.update_programs(src) update_shortcuts() to_chat(user, "You insert [cartridge] into [src].") - if(cartridge.radio) cartridge.radio.hostpda = src @@ -396,7 +387,6 @@ var/global/list/obj/item/device/pda/PDAs = list() var/obj/item/weapon/card/id/idcard = C if(!idcard.registered_name) to_chat(user, "\The [src] rejects the ID.") - return if(!owner) owner = idcard.registered_name @@ -404,31 +394,26 @@ var/global/list/obj/item/device/pda/PDAs = list() ownrank = idcard.rank name = "PDA-[owner] ([ownjob])" to_chat(user, "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) && (C in user.contents)) || (istype(loc, /turf) && in_range(src, user) && (C in user.contents)) ) if( can_use(user) )//If they can still act. id_check(user, 2) to_chat(user, "You put the ID into \the [src]'s slot.") - else if(istype(C, /obj/item/device/paicard) && !src.pai) user.drop_item() C.forceMove(src) pai = C to_chat(user, "You slot \the [C] into [src].") - else if(istype(C, /obj/item/weapon/pen)) var/obj/item/weapon/pen/O = locate() in src if(O) to_chat(user, "There is already a pen in \the [src].") - else user.drop_item() C.forceMove(src) to_chat(user, "You slide \the [C] into \the [src].") - /obj/item/device/pda/attack(mob/living/C as mob, mob/living/user as mob) if (istype(C, /mob/living/carbon) && scanmode) scanmode.scan_mob(C, user) @@ -491,7 +476,6 @@ var/global/list/obj/item/device/pda/PDAs = list() if (t) if(hidden_uplink && hidden_uplink.check_trigger(usr, lowertext(t), lowertext(lock_code))) to_chat(usr, "The PDA softly beeps.") - close(usr) else t = sanitize(copytext(t, 1, 20)) diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm index d012905ccd8..b8b95276c06 100644 --- a/code/modules/pda/ai.dm +++ b/code/modules/pda/ai.dm @@ -23,7 +23,6 @@ var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) if(!M) to_chat(usr, "Cannot use messenger!") - var/list/plist = M.available_pdas() if (plist) var/c = input(usr, "Please select a PDA") as null|anything in sortList(plist) @@ -42,7 +41,6 @@ var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger) if(!M) to_chat(usr, "Cannot use messenger!") - var/HTML = "AI PDA Message Log" for(var/index in M.tnote) if(index["sent"]) @@ -64,7 +62,6 @@ to_chat(usr, "PDA sender/receiver toggled [(M.toff ? "Off" : "On")]!") - /obj/item/device/pda/ai/verb/cmd_toggle_pda_silent() set category = "AI IM" set name = "Toggle Ringer" @@ -76,7 +73,6 @@ M.notify_silent = !M.notify_silent to_chat(usr, "PDA ringer toggled [(M.notify_silent ? "Off" : "On")]!") - /obj/item/device/pda/ai/can_use() var/mob/living/silicon/ai/AI = usr if(!istype(AI)) diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm index 70690af26ae..45b2e79aec3 100644 --- a/code/modules/pda/app.dm +++ b/code/modules/pda/app.dm @@ -25,7 +25,6 @@ if(L) to_chat(L, "\icon[pda] [message]") - nanomanager.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message if(!notify_silent) diff --git a/code/modules/pda/chatroom.dm b/code/modules/pda/chatroom.dm index b965076971a..d5758b161f4 100644 --- a/code/modules/pda/chatroom.dm +++ b/code/modules/pda/chatroom.dm @@ -141,7 +141,6 @@ var/list/chatrooms = list(new /datum/chatroom("General Discussion")) if(!.) to_chat(usr, "ERROR: Messaging server is not responding.") - /datum/data/pda/app/chatroom/Topic(href, list/href_list) if(!pda.can_use()) return diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm index fb64add2b86..c5f6375f82f 100644 --- a/code/modules/pda/messenger.dm +++ b/code/modules/pda/messenger.dm @@ -107,7 +107,6 @@ if(!P) to_chat(usr, "PDA not found.") - var/datum/data/pda/messenger_plugin/plugin = locate(href_list["plugin"]) if(plugin && (plugin in pda.cartridge.messenger_plugins)) plugin.messenger = src @@ -168,7 +167,6 @@ if(useMS && useTC) // only send the message if it's stable if(useTC != 2) // Does our recipient have a broadcaster on their level? to_chat(U, "ERROR: Cannot reach recipient.") - return useMS.send_pda_message("[P.owner]","[pda.owner]","[t]") tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "\ref[P]"))) @@ -185,7 +183,6 @@ else to_chat(U, "ERROR: Messaging server is not responding.") - /datum/data/pda/app/messenger/proc/available_pdas() var/list/names = list() var/list/plist = list() @@ -193,7 +190,6 @@ if (toff) to_chat(usr, "Turn on your receiver in order to send messages.") - return for(var/A in PDAs) diff --git a/code/modules/pda/radio.dm b/code/modules/pda/radio.dm index 1f8b1d06c69..c64ea02ce7c 100644 --- a/code/modules/pda/radio.dm +++ b/code/modules/pda/radio.dm @@ -32,7 +32,6 @@ /obj/item/radio/integrated/proc/post_signal(var/freq, var/key, var/value, var/key2, var/value2, var/key3, var/value3,var/key4, var/value4, s_filter) // to_chat(world, "Post: [freq]: [key]=[value], [key2]=[value2]") - var/datum/radio_frequency/frequency = radio_controller.return_frequency(freq) if(!frequency) diff --git a/code/modules/pda/utilities.dm b/code/modules/pda/utilities.dm index 47c963d633a..0f4fcd79741 100644 --- a/code/modules/pda/utilities.dm +++ b/code/modules/pda/utilities.dm @@ -69,10 +69,8 @@ var/mob/living/carbon/human/H = C if (!istype(H.dna, /datum/dna)) to_chat(user, "No fingerprints found on [H]") - else to_chat(user, "[H]'s Fingerprints: [md5(H.dna.uni_identity)]") - scan_blood(C, user) /datum/data/pda/utility/scanmode/dna/scan_atom(atom/A as mob|obj|turf|area, mob/user as mob) @@ -81,17 +79,14 @@ /datum/data/pda/utility/scanmode/dna/proc/scan_blood(atom/A, mob/user) if (!A.blood_DNA) to_chat(user, "No blood found on [A]") - if(A.blood_DNA) qdel(A.blood_DNA) else to_chat(user, "Blood found on [A]. Analysing...") - spawn(15) for(var/blood in A.blood_DNA) to_chat(user, "Blood type: [A.blood_DNA[blood]]\nDNA: [blood]") - /datum/data/pda/utility/scanmode/halogen base_name = "Halogen Counter" icon = "exclamation-circle" @@ -114,17 +109,13 @@ 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.") - for(var/re in A.reagents.reagent_list) to_chat(user, "\t [re]") - else to_chat(user, "No active chemical agents found in [A].") - else to_chat(user, "No significant chemical agents found in [A].") - /datum/data/pda/utility/scanmode/gas base_name = "Gas Scanner" icon = "tachometer" @@ -205,7 +196,5 @@ // Inform the user to_chat(user, "Paper scanned and OCRed to notekeeper.")//concept of scanning paper copyright brainoblivion 2009 - else to_chat(user, "Error scanning [A].") - diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index e3ff5b6a9c4..edefabf2aff 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -214,33 +214,25 @@ if(..(user, 1)) if(stat & BROKEN) to_chat(user, "Looks broken.") - return if(opened) if(has_electronics && terminal) to_chat(user, "The cover is [opened==2?"removed":"open"] and the power cell is [ cell ? "installed" : "missing"].") - else if (!has_electronics && terminal) to_chat(user, "There are some wires but no any electronics.") - else if (has_electronics && !terminal) to_chat(user, "Electronics installed but not wired.") - else /* if (!has_electronics && !terminal) */ to_chat(user, "There is no electronics nor connected wires.") - else if (stat & MAINT) to_chat(user, "The cover is closed. Something wrong with it: it doesn't work.") - else if (malfhack) to_chat(user, "The cover is broken. It may be hard to force it open.") - else to_chat(user, "The cover is closed.") - // update the APC icon to show the three base states // also add overlays for indicator lights /obj/machinery/power/apc/update_icon() @@ -425,12 +417,10 @@ if (has_electronics==1) if (terminal) to_chat(user, "Disconnect wires first.") - return playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1) to_chat(user, "You are trying to remove the power control board...")//lpeters - fixed grammar issues - if(do_after(user, 50, target = src)) if (has_electronics==1) has_electronics = 0 @@ -451,7 +441,6 @@ else if (istype(W, /obj/item/weapon/crowbar) && !((stat & BROKEN) || malfhack) ) if(coverlocked && !(stat & MAINT)) to_chat(user, "The cover is locked and cannot be opened.") - return else opened = 1 @@ -459,12 +448,10 @@ else if (istype(W, /obj/item/weapon/stock_parts/cell) && opened) // trying to put a cell inside if(cell) to_chat(user, "There is a power cell already installed.") - return else if (stat & MAINT) to_chat(user, "There is no connector for your power cell.") - return user.drop_item() W.loc = src @@ -479,7 +466,6 @@ if (cell) to_chat(user, "Close the APC first.")//Less hints more mystery! - return else if (has_electronics==1 && terminal) @@ -487,61 +473,47 @@ stat &= ~MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You screw the circuit electronics into place.") - else if (has_electronics==2) has_electronics = 1 stat |= MAINT playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You unfasten the electronics.") - else /* has_electronics==0 */ to_chat(user, "There is nothing to secure.") - return update_icon() else if(emagged) to_chat(user, "The interface is broken.") - else wiresexposed = !wiresexposed to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"]") - update_icon() else if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda)) // trying to unlock the interface with an ID card if(emagged) to_chat(user, "The interface is broken.") - else if(opened) to_chat(user, "You must close the cover to swipe an ID card.") - else if(wiresexposed) to_chat(user, "You must close the panel") - else if(stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens.") - else if(src.allowed(usr) && !isWireCut(APC_WIRE_IDSCAN)) locked = !locked to_chat(user, "You [ locked ? "lock" : "unlock"] the APC interface.") - update_icon() else to_chat(user, "Access denied.") - else if (istype(W, /obj/item/stack/cable_coil) && !terminal && opened && has_electronics!=2) if (src.loc:intact) to_chat(user, "You must remove the floor plating in front of the APC first.") - return var/obj/item/stack/cable_coil/C = W if(C.amount < 10) to_chat(user, "You need more wires.") - return to_chat(user, "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.amount >= 10 && !terminal && opened && has_electronics != 2) @@ -561,10 +533,8 @@ else if (istype(W, /obj/item/weapon/wirecutters) && terminal && opened && has_electronics!=2) if (src.loc:intact) to_chat(user, "You must remove the floor plating in front of the APC first.") - return to_chat(user, "You begin to cut the cables...") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50, target = src)) if(terminal && opened && has_electronics!=2) @@ -575,27 +545,22 @@ return new /obj/item/stack/cable_coil(loc,10) to_chat(user, "You cut the cables and dismantle the power terminal.") - qdel(terminal) // qdel else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && !((stat & BROKEN) || malfhack)) to_chat(user, "You trying 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==0) has_electronics = 1 to_chat(user, "You place the power control board inside the frame.") - qdel(W) // qdel else if (istype(W, /obj/item/weapon/apc_electronics) && opened && has_electronics==0 && ((stat & BROKEN) || malfhack)) to_chat(user, "You cannot put the board inside, the frame is damaged.") - return else if (istype(W, /obj/item/weapon/weldingtool) && opened && has_electronics==0 && !terminal) var/obj/item/weapon/weldingtool/WT = W if (WT.get_fuel() < 3) to_chat(user, "You need more welding fuel to complete this task.") - return user.visible_message("[user.name] welds [src].", \ "You start welding the APC frame...", \ @@ -629,10 +594,8 @@ else if (istype(W, /obj/item/mounted/frame/apc_frame) && opened && ((stat & BROKEN) || malfhack)) if (has_electronics) to_chat(user, "You cannot repair this APC until you remove the electronics still inside.") - return to_chat(user, "You begin to replace the damaged APC frame...") - if(do_after(user, 50, target = src)) user.visible_message(\ "[user.name] has replaced the damaged APC frame with new one.",\ @@ -673,19 +636,15 @@ if (!(emagged || malfhack)) // trying to unlock with an emag card if(opened) to_chat(user, "You must close the cover to swipe an ID card.") - else if(wiresexposed) to_chat(user, "You must close the panel first") - else if(stat & (BROKEN|MAINT)) to_chat(user, "Nothing happens.") - else flick("apc-spark", src) emagged = 1 locked = 0 to_chat(user, "You emag the APC interface.") - update_icon() // attack with hand - remove cell (if cover open) or interact with the APC @@ -704,7 +663,6 @@ s.set_up(3, 1, src) s.start() to_chat(H, "The APC power currents surge erratically, damaging your chassis!") - H.adjustFireLoss(10,0) else if(src.cell && src.cell.charge > 0) if(H.nutrition < 450) @@ -716,7 +674,6 @@ src.cell.charge = 0 to_chat(user, "You slot your fingers into the APC interface and siphon off some of the stored charge for your own use.") - if(src.cell.charge < 0) src.cell.charge = 0 if(H.nutrition > 500) @@ -724,10 +681,8 @@ src.charging = 1 else to_chat(user, "You are already fully charged.") - else to_chat(user, "There is no charge to draw from that APC.") - return if(usr == user && opened && (!issilicon(user))) @@ -742,7 +697,6 @@ src.cell = null user.visible_message("[user.name] removes the power cell from [src.name]!", "You remove the power cell.") // to_chat(user, "You remove the power cell.") - charging = 0 src.update_icon() return @@ -883,14 +837,12 @@ // if (area.name == "AI Chamber") // spawn(10) // to_chat(world, " [area.name] [area.power_equip]") - else area.power_light = 0 area.power_equip = 0 area.power_environ = 0 // if (area.name == "AI Chamber") // to_chat(world, "[area.power_equip]") - area.power_change() /obj/machinery/power/apc/proc/isWireCut(var/wireIndex) @@ -915,7 +867,6 @@ ) if(!loud) to_chat(user, "\The [src] has AI control disabled!") - user << browse(null, "window=apc") user.unset_machine() return 0 @@ -928,11 +879,9 @@ if(H.getBrainLoss() >= 60) for(var/mob/M in viewers(src, null)) to_chat(M, "[H] stares cluelessly at [src] and drools.") - return 0 else if(prob(H.getBrainLoss())) to_chat(user, "You momentarily forget how to use [src].") - return 0 return 1 @@ -1024,10 +973,8 @@ if(get_malf_status(malfai)==1) if (malfai.malfhacking) to_chat(malfai, "You are already hacking an APC.") - return 0 to_chat(malfai, "Beginning override of APC systems. This takes some time, and you cannot perform other actions during the process.") - malfai.malfhack = src malfai.malfhacking = 1 sleep(600) @@ -1044,7 +991,6 @@ else src.malfai = usr to_chat(malfai, "Hack complete. The APC is now under your exclusive control.") - update_icon() else if (href_list["occupyapc"]) @@ -1059,7 +1005,6 @@ if(istype(usr, /mob/living/silicon)) if(emagged || aidisabled || (stat & (BROKEN|MAINT))) to_chat(usr, "The APC does not respond to the command.") - else locked = !locked update_icon() @@ -1082,11 +1027,9 @@ return if(istype(malf.loc, /obj/machinery/power/apc)) // Already in an APC to_chat(malf, "You must evacuate your current apc first.") - return if(!malf.can_shunt) to_chat(malf, "You cannot shunt.") - return if(!(src.z in config.station_levels)) return @@ -1127,7 +1070,6 @@ else to_chat(src.occupier, "Primary core damaged, unable to return core processes.") - if(forced) src.occupier.loc = src.loc src.occupier.death() @@ -1143,7 +1085,6 @@ src.locked = 1 if (src.cell.charge > 0) // to_chat(world, "blew APC in [src.loc.loc]") - src.cell.charge = 0 cell.corrupt() src.malfhack = 1 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 7597b31a57e..9253c19a5aa 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -121,12 +121,10 @@ By design, d1 is the smallest direction and d2 is the highest ///// Z-Level Stuff /* if(src.d1 == 12 || src.d2 == 12) to_chat(user, "You must cut this cable from above.") - return */ ///// Z-Level Stuff /* if(breaker_box) to_chat(user, "\red This cable is connected to nearby breaker box. Use breaker box to interact with it.") - return */ if (shock(user, 50)) @@ -160,7 +158,6 @@ By design, d1 is the smallest direction and d2 is the highest var/obj/item/stack/cable_coil/coil = W if (coil.get_amount() < 1) to_chat(user, "Not enough cable") - return coil.cable_join(src, user) @@ -169,11 +166,9 @@ By design, d1 is the smallest direction and d2 is the highest if(powernet && (powernet.avail > 0)) // is it powered? to_chat(user, "[powernet.avail]W in power network.") - else to_chat(user, "The cable is not powered.") - shock(user, 5, 0.2) else @@ -520,11 +515,9 @@ obj/structure/cable/proc/cableColor(var/colorC) user.visible_message("\The [user] repairs some burn damage on \the [M]'s [S.name] with \the [src].") else if(S.open != 2) to_chat(user, "The damage is far too severe to patch over externally.") - return 1 else if(S.open != 2) to_chat(user, "Nothing to fix!") - else return ..() @@ -554,15 +547,12 @@ obj/structure/cable/proc/cableColor(var/colorC) if(get_amount() == 1) to_chat(user, "A short piece of power cable.") - else if(get_amount() == 2) to_chat(user, "A piece of power cable.") - else to_chat(user, "A coil of power cable. There are [get_amount()] lengths of cable in the coil.") - /obj/item/stack/cable_coil/verb/make_restraint() set name = "Make Cable Restraints" set category = "Object" @@ -572,16 +562,13 @@ obj/structure/cable/proc/cableColor(var/colorC) if(!istype(usr.loc,/turf)) return if(src.amount <= 14) to_chat(usr, "You need at least 15 lengths to make restraints!") - return var/obj/item/weapon/restraints/handcuffs/cable/B = new /obj/item/weapon/restraints/handcuffs/cable(usr.loc) B.color = color to_chat(usr, "You wind some cable together to make some restraints.") - src.use(15) else to_chat(usr, "You cannot do that.") - ..() // Items usable on a cable coil : @@ -593,19 +580,16 @@ obj/structure/cable/proc/cableColor(var/colorC) src.amount-- new/obj/item/stack/cable_coil(user.loc, 1,color) to_chat(user, "You cut a piece off the cable coil.") - src.update_icon() return else if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/C = W if(C.amount >= MAXCOIL) to_chat(user, "The coil is too long, you cannot add any more cable to it.") - return if( (C.amount + src.amount <= MAXCOIL) ) to_chat(user, "You join the cable coils together.") - C.give(src.amount) // give it cable src.use(src.amount) // make sure this one cleans up right return @@ -613,7 +597,6 @@ obj/structure/cable/proc/cableColor(var/colorC) else var/amt = MAXCOIL - C.amount to_chat(user, "You transfer [amt] length\s of cable from one coil to the other.") - C.give(amt) src.use(amt) return @@ -664,17 +647,14 @@ obj/structure/cable/proc/cableColor(var/colorC) if(!T.can_have_cabling()) to_chat(user, "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!") - return if(get_dist(T,user) > 1) // Too far to_chat(user, "You can't lay cable at a place that far away!") - return else @@ -688,7 +668,6 @@ obj/structure/cable/proc/cableColor(var/colorC) 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!") - return var/obj/structure/cable/C = get_new_cable(T) @@ -731,7 +710,6 @@ obj/structure/cable/proc/cableColor(var/colorC) 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.") - return @@ -745,7 +723,6 @@ obj/structure/cable/proc/cableColor(var/colorC) if(C.d1 == dirn || C.d2 == dirn) if(U.intact) // can't place a cable if the floor is complete to_chat(user, "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 @@ -756,7 +733,6 @@ obj/structure/cable/proc/cableColor(var/colorC) 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) to_chat(user, "There's already a cable at that position.") - return var/obj/structure/cable/NC = new(U) @@ -803,7 +779,6 @@ obj/structure/cable/proc/cableColor(var/colorC) continue if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no cable matches either direction to_chat(user, "There's already a cable at that position.") - return diff --git a/code/modules/power/cable_heavyduty.dm b/code/modules/power/cable_heavyduty.dm index 5f99ee3b59f..87a25032eb7 100644 --- a/code/modules/power/cable_heavyduty.dm +++ b/code/modules/power/cable_heavyduty.dm @@ -17,11 +17,9 @@ if(istype(W, /obj/item/weapon/wirecutters)) to_chat(usr, "\blue These cables are too tough to be cut with those [W.name].") - return else if(istype(W, /obj/item/stack/cable_coil)) to_chat(usr, "\blue You will need heavier cables to connect to these.") - return else ..() diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 6a480a89d06..7dda66629d7 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -59,14 +59,11 @@ if(..(user, 1)) if(maxcharge <= 2500) to_chat(user, "[desc]\nThe manufacturer's label states this cell has a power rating of [maxcharge], and that you should not swallow it.\nThe charge meter reads [round(src.percent() )]%.") - else to_chat(user, "This power cell has an exciting chrome finish, as it is an uber-capacity cell type! It has a power rating of [maxcharge]!\nThe charge meter reads [round(src.percent() )]%.") - if(crit_fail) to_chat(user, "\red This power cell seems to be faulty.") - /obj/item/weapon/stock_parts/cell/attack_self(mob/user as mob) src.add_fingerprint(user) return @@ -78,7 +75,6 @@ to_chat(user, "You inject the solution into the power cell.") - if(S.reagents.has_reagent("plasma", 5)) rigged = 1 diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index a3e7c0d75c8..81af0089e6f 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -122,7 +122,6 @@ if(istype(W, /obj/item/weapon/wrench)) anchored = !anchored to_chat(user, "\blue You [anchored ? "secure" : "unsecure"] the bolts holding [src] to the floor.") - use_power = anchored reconnect() else diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index 52a66625d30..46a6fe20320 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -74,7 +74,6 @@ // to_chat(world, "POWER: [lastgen] W generated at [efficiency*100]% efficiency and sinks sizes [cold_air_heat_capacity], [hot_air_heat_capacity]") - input1.parent.update = 1 input2.parent.update = 1 diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 76b19dda201..04ffbc5c0a4 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -183,7 +183,6 @@ var/const/GRAV_NEEDS_WRENCH = 3 if(GRAV_NEEDS_SCREWDRIVER) if(istype(I, /obj/item/weapon/screwdriver)) to_chat(user, "You secure the screws of the framework.") - playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) broken_state++ if(GRAV_NEEDS_WELDING) @@ -191,7 +190,6 @@ var/const/GRAV_NEEDS_WRENCH = 3 var/obj/item/weapon/weldingtool/WT = I if(WT.remove_fuel(1, user)) to_chat(user, "You mend the damaged framework.") - playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) broken_state++ if(GRAV_NEEDS_PLASTEEL) @@ -200,16 +198,13 @@ var/const/GRAV_NEEDS_WRENCH = 3 if(PS.amount >= 10) PS.use(10) to_chat(user, "You add the plating to the framework.") - playsound(src.loc, 'sound/machines/click.ogg', 75, 1) broken_state++ else to_chat(user, "You need 10 sheets of plasteel.") - if(GRAV_NEEDS_WRENCH) if(istype(I, /obj/item/weapon/wrench)) to_chat(user, "You secure the plating to the framework.") - playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) set_fix() else diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index ade62f2144e..3890b433eaf 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -31,21 +31,17 @@ switch(src.stage) if(1) to_chat(usr, "It's an empty frame.") - if(2) to_chat(usr, "It's wired.") - if(3) to_chat(usr, "The casing is closed.") - /obj/machinery/light_construct/attackby(obj/item/weapon/W as obj, mob/living/user as mob, params) src.add_fingerprint(user) if (istype(W, /obj/item/weapon/wrench)) if (src.stage == 1) playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) to_chat(usr, "You begin deconstructing [src].") - if (!do_after(usr, 30, target = src)) return new /obj/item/stack/sheet/metal( get_turf(src.loc), sheets_refunded ) @@ -55,12 +51,10 @@ qdel(src) if (src.stage == 2) to_chat(usr, "You have to remove the wires first.") - return if (src.stage == 3) to_chat(usr, "You have to unscrew the case first.") - return if(istype(W, /obj/item/weapon/wirecutters)) @@ -276,19 +270,15 @@ switch(status) if(LIGHT_OK) to_chat(user, "[desc] It is turned [on? "on" : "off"].") - if(LIGHT_EMPTY) to_chat(user, "[desc] The [fitting] has been removed.") - if(LIGHT_BURNED) to_chat(user, "[desc] The [fitting] is burnt out.") - if(LIGHT_BROKEN) to_chat(user, "[desc] The [fitting] has been smashed.") - // attack with item - insert light (if right type), otherwise try to break the light /obj/machinery/light/attackby(obj/item/W, mob/living/user, params) @@ -305,7 +295,6 @@ if(istype(W, /obj/item/weapon/light)) if(status != LIGHT_EMPTY) to_chat(user, "There is a [fitting] already inserted.") - return else src.add_fingerprint(user) @@ -313,7 +302,6 @@ if(istype(L, light_type)) status = L.status to_chat(user, "You insert the [L.name].") - switchcount = L.switchcount rigged = L.rigged brightness_range = L.brightness_range @@ -333,7 +321,6 @@ explode() else to_chat(user, "This type of light requires a [fitting].") - return // attempt to break the light @@ -345,7 +332,6 @@ if(prob(1+W.force * 5)) to_chat(user, "You hit the light, and it smashes!") - for(var/mob/M in viewers(src)) if(M == user) continue @@ -384,7 +370,6 @@ return to_chat(user, "You stick \the [W] into the light socket!") - if(has_power() && (W.flags & CONDUCT)) var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread s.set_up(3, 1, src) @@ -423,7 +408,6 @@ /obj/machinery/light/attack_alien(mob/living/carbon/alien/humanoid/user)//So larva don't go breaking light bulbs. if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) to_chat(user, "\green That object is useless to you.") - return else if (status == LIGHT_OK||status == LIGHT_BURNED) user.do_attack_animation(src) @@ -435,7 +419,6 @@ if(M.melee_damage_upper == 0) return if(status == LIGHT_EMPTY||status == LIGHT_BROKEN) to_chat(M, "\red That object is useless to you.") - return else if (status == LIGHT_OK||status == LIGHT_BURNED) M.do_attack_animation(src) @@ -451,7 +434,6 @@ if(status == LIGHT_EMPTY) to_chat(user, "There is no [fitting] in this light.") - return // make it burn hands if not wearing fire-insulated gloves @@ -470,14 +452,11 @@ if(prot > 0 || (RESIST_HEAT in user.mutations)) to_chat(user, "You remove the light [fitting]") - else if(TK in user.mutations) to_chat(user, "You telekinetically remove the light [fitting].") - else to_chat(user, "You try to remove the light [fitting], but you burn your hand on it!") - var/obj/item/organ/external/affecting = H.get_organ("[user.hand ? "l" : "r" ]_hand") if(affecting.take_damage( 0, 5 )) // 5 burn damage H.UpdateDamageIcon() @@ -487,7 +466,6 @@ to_chat(user, "You remove the light [fitting].") - // create a light tube/bulb item and put it in the user's hand var/obj/item/weapon/light/L = new light_type() L.status = status @@ -513,11 +491,9 @@ /obj/machinery/light/attack_tk(mob/user) if(status == LIGHT_EMPTY) to_chat(user, "There is no [fitting] in this light.") - return to_chat(user, "You telekinetically remove the light [fitting].") - // create a light tube/bulb item and put it in the user's hand var/obj/item/weapon/light/L = new light_type() L.status = status @@ -697,7 +673,6 @@ to_chat(user, "You inject the solution into the [src].") - if(S.reagents.has_reagent("plasma", 5)) log_admin("LOG: [user.name] ([user.ckey]) injected a light with plasma, rigging it to explode.") diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 062978045ec..bc1599674a2 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -52,11 +52,9 @@ return if(active) to_chat(usr, "The generator is on.") - else to_chat(usr, "The generator is off.") - /obj/machinery/power/port_gen/emp_act(severity) var/duration = 6000 //ten minutes switch(severity) @@ -154,16 +152,12 @@ /obj/machinery/power/port_gen/pacman/examine(mob/user) ..(user) to_chat(user, "\The [src] appears to be producing [power_gen*power_output] W.") - to_chat(user, "There [sheets == 1 ? "is" : "are"] [sheets] sheet\s left in the hopper.") - if(IsBroken()) to_chat(user, "\The [src] seems to have broken down.") - if(overheating) to_chat(user, "\The [src] is overheating!") - /obj/machinery/power/port_gen/pacman/HasFuel() var/needed_sheets = power_output / time_per_sheet if(sheets >= needed_sheets - sheet_left) @@ -278,10 +272,8 @@ var/amount = min((max_sheets - sheets), addstack.amount) if(amount < 1) to_chat(user, "The [src.name] is full!") - return to_chat(user, "You add [amount] sheet\s to the [src.name].") - sheets += amount addstack.use(amount) nanomanager.update_uis(src) @@ -292,12 +284,10 @@ if(!anchored) connect_to_network() to_chat(user, "You secure the generator to the floor.") - else disconnect_from_network() to_chat(user, "You unsecure the generator from the floor.") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) anchored = !anchored @@ -306,10 +296,8 @@ playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) if(panel_open) to_chat(user, "You open the access panel.") - else to_chat(user, "You close the access panel.") - else if(istype(O, /obj/item/weapon/storage/part_replacer) && panel_open) exchange_parts(user, O) return diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index 72c9f0e4eb5..5dd8f2e36ea 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -45,7 +45,6 @@ var/global/list/rad_collectors = list() return else to_chat(user, "\red The controls are locked!") - return ..() @@ -53,18 +52,15 @@ var/global/list/rad_collectors = list() /obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/multitool)) to_chat(user, "The [W.name] detects that [last_power]W were recently produced.") - return 1 else if(istype(W, /obj/item/device/analyzer) && P) atmosanalyzer_scan(P.air_contents, user) else if(istype(W, /obj/item/weapon/tank/plasma)) if(!src.anchored) to_chat(user, "\red The [src] needs to be secured to the floor first.") - return 1 if(src.P) to_chat(user, "\red There's already a plasma tank loaded.") - return 1 user.drop_item() src.P = W @@ -77,7 +73,6 @@ var/global/list/rad_collectors = list() else if(istype(W, /obj/item/weapon/wrench)) if(P) to_chat(user, "\blue Remove the plasma tank first.") - return 1 playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1) src.anchored = !src.anchored @@ -93,14 +88,11 @@ var/global/list/rad_collectors = list() if(active) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") - else src.locked = 0 //just in case it somehow gets locked to_chat(user, "\red The controls can only be locked when the [src] is active") - else to_chat(user, "\red Access denied!") - return 1 else ..() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index e69bd179ed9..4f0d72e1511 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -66,7 +66,6 @@ if (src.anchored || usr:stat) to_chat(usr, "It is fastened to the floor!") - return 0 src.dir = turn(src.dir, 90) return 1 @@ -129,20 +128,17 @@ if(state == 2) if(!powernet) to_chat(user, "The emitter isn't connected to a wire.") - return 1 if(!src.locked) if(src.active==1) src.active = 0 to_chat(user, "You turn off the [src].") - message_admins("Emitter turned off by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1) log_game("Emitter turned off by [key_name(user)] in [x], [y], [z]") investigate_log("turned off by [key_name(usr)]","singulo") else src.active = 1 to_chat(user, "You turn on the [src].") - src.shot_number = 0 src.fire_delay = maximum_fire_delay message_admins("Emitter turned on by [key_name_admin(user)] in ([x], [y], [z] - JMP)",0,1) @@ -151,10 +147,8 @@ update_icon() else to_chat(user, "\red The controls are locked!") - else to_chat(user, "\red The [src] needs to be firmly secured to the floor first.") - return 1 @@ -230,7 +224,6 @@ if(istype(W, /obj/item/weapon/wrench)) if(active) to_chat(user, "Turn off the [src] first.") - return switch(state) if(0) @@ -249,19 +242,16 @@ src.anchored = 0 if(2) to_chat(user, "\red The [src.name] needs to be unwelded from the floor.") - return if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W if(active) to_chat(user, "Turn off the [src] first.") - return switch(state) if(0) to_chat(user, "\red The [src.name] needs to be wrenched to the floor.") - if(1) if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -272,11 +262,9 @@ if(!src || !WT.isOn()) return state = 2 to_chat(user, "You weld the [src] to the floor.") - connect_to_network() else to_chat(user, "\red You need more welding fuel to complete this task.") - if(2) if (WT.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1) @@ -287,30 +275,24 @@ if(!src || !WT.isOn()) return state = 1 to_chat(user, "You cut the [src] free from the floor.") - disconnect_from_network() else to_chat(user, "\red You need more welding fuel to complete this task.") - return if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda)) if(emagged) to_chat(user, "\red The lock seems to be broken") - return if(src.allowed(user)) if(active) src.locked = !src.locked to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]") - else src.locked = 0 //just in case it somehow gets locked to_chat(user, "\red The controls can only be locked when the [src] is online") - else to_chat(user, "\red Access denied.") - return if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W)) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 320f2d8dc6c..5bf41aac044 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -80,7 +80,6 @@ field_generator power level display if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on if(src.active >= 1) to_chat(user, "You are unable to turn off the [src.name] once it is online!") - return 1 else user.visible_message("[user.name] turns on the [src.name].", \ @@ -92,14 +91,12 @@ field_generator power level display src.add_fingerprint(user) else to_chat(user, "The [src] needs to be firmly secured to the floor first!") - return /obj/machinery/field/generator/attackby(obj/item/W, mob/user, params) if(active) to_chat(user, "The [src] needs to be off!") - return else if(istype(W, /obj/item/weapon/wrench)) switch(state) @@ -120,14 +117,12 @@ field_generator power level display src.anchored = 0 if(2) to_chat(user, "The [src.name] needs to be unwelded from the floor!") - return else if(istype(W, /obj/item/weapon/weldingtool)) var/obj/item/weapon/weldingtool/WT = W switch(state) if(0) to_chat(user, "The [src.name] needs to be wrenched to the floor!") - return if(1) if (WT.remove_fuel(0,user)) @@ -139,7 +134,6 @@ field_generator power level display if(!src || !WT.isOn()) return state = 2 to_chat(user, "You weld the field generator to the floor.") - else return if(2) @@ -152,7 +146,6 @@ field_generator power level display if(!src || !WT.isOn()) return state = 1 to_chat(user, "You cut \the [src] free from the floor.") - else return else diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 48c980f39fe..1c43e1a829d 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -25,10 +25,8 @@ /obj/singularity/narsie/large/New() ..() to_chat(world, "NAR-SIE HAS RISEN") - to_chat(world, pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg'))) - var/area/A = get_area(src) if(A) notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.") @@ -41,7 +39,6 @@ /obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob) if(!(src in view())) to_chat(user, "Your soul is too far away.") - return makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1) new /obj/effect/effect/sleep_smoke(user.loc) @@ -80,7 +77,6 @@ if(M.stat == CONSCIOUS) if(!iscultist(M)) to_chat(M, "You feel your sanity crumble away in an instant as you gaze upon [src.name]...") - M.apply_effect(3, STUN) @@ -128,15 +124,12 @@ /obj/singularity/narsie/proc/acquire(var/mob/food) to_chat(target, "NAR-SIE HAS LOST INTEREST IN YOU") - target = food if(ishuman(target)) to_chat(target, "NAR-SIE HUNGERS FOR YOUR SOUL") - else to_chat(target, "NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL") - //Wizard narsie /obj/singularity/narsie/wizard grav_pull = 0 diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 3f9b639dc46..cff8c2ee9fa 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -97,7 +97,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return if (src.anchored) to_chat(usr, "It is fastened to the floor!") - return 0 src.dir = turn(src.dir, 270) return 1 @@ -111,7 +110,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return if (src.anchored) to_chat(usr, "It is fastened to the floor!") - return 0 src.dir = turn(src.dir, 90) return 1 @@ -238,7 +236,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin temp_state++ else to_chat(user, "You need one length of cable to wire the [src.name]!") - return if(2) if(iswirecutter(O))//TODO:Shock user if its on? @@ -293,7 +290,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return if (src.anchored) to_chat(usr, "It is fastened to the floor!") - return 0 src.dir = turn(src.dir, 270) return 1 @@ -307,7 +303,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin return if (src.anchored) to_chat(usr, "It is fastened to the floor!") - return 0 src.dir = turn(src.dir, 90) return 1 diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index a5e7d111c69..8101269762e 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -87,7 +87,6 @@ if(!interface_control) to_chat(usr, "ERROR: Request timed out. Check wire contacts.") - return if( href_list["close"] ) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index df8cceb0fdf..ba516cd2181 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -391,7 +391,6 @@ 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!") - return M.apply_effect(3, STUN) diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 3d998c45545..d55394f83bd 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -131,11 +131,9 @@ terminal = term terminal.master = src to_chat(user, "Terminal found.") - break if(!terminal) to_chat(user, "No power source found.") - return stat &= ~BROKEN update_icon() @@ -153,24 +151,20 @@ if(terminal) //is there already a terminal ? to_chat(user, "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!") - 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!") - return var/obj/item/stack/cable_coil/C = I if(C.amount < 10) to_chat(user, "You need more wires.") - return //build the terminal and link it to the network @@ -183,11 +177,9 @@ var/turf/T = get_turf(terminal) if (T.intact) //is the floor plating removed ? to_chat(user, "You must first expose the power terminal!") - return to_chat(user, "You begin to dismantle the power terminal...") - playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1) if(do_after(user, 50, target = src)) @@ -311,7 +303,6 @@ /obj/machinery/power/smes/proc/make_terminal(const/mob/user) if (user.loc == loc) to_chat(user, "You must not be on the same tile as the [src].") - return 1 //Direction the terminal will face to @@ -324,15 +315,12 @@ var/turf/tempLoc = get_step(src, reverse_direction(tempDir)) if (istype(tempLoc, /turf/space)) to_chat(user, "You can't build a terminal on space.") - return 1 else if (istype(tempLoc)) if(tempLoc.intact) to_chat(user, "You must remove the floor plating first.") - return 1 to_chat(user, "You start adding cable to the [src].") - if(do_after(user, 50, target = src)) var/turf/T = get_turf(user) var/obj/structure/cable/N = T.get_cable_node() //get the connecting node cable, if there's one diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index d998d93556b..44f78fa4e38 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -248,7 +248,6 @@ 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.") - return return 1 @@ -420,7 +419,6 @@ if(do_after(user, 20, target = src)) if (src.stat & BROKEN) to_chat(user, "The broken glass falls out.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) new /obj/item/weapon/shard( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) @@ -433,7 +431,6 @@ qdel(src) else to_chat(user, "You disconnect the monitor.") - var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc ) var/obj/item/weapon/circuitboard/solar_control/M = new /obj/item/weapon/circuitboard/solar_control( A ) for (var/obj/C in src) diff --git a/code/modules/power/supermatter/sm_shard.dm b/code/modules/power/supermatter/sm_shard.dm index 10adc4c9814..e95b51cf828 100644 --- a/code/modules/power/supermatter/sm_shard.dm +++ b/code/modules/power/supermatter/sm_shard.dm @@ -45,7 +45,6 @@ if(ismob(AM)) var/mob/M = AM to_chat(M, "\red You step on \the [src]!") - playsound(src.loc, 'sound/effects/glass_step_sm.ogg', 70, 1) // not sure how to handle metal shards with sounds if(ishuman(M)) var/mob/living/carbon/human/H = M @@ -68,7 +67,6 @@ /obj/item/weapon/shard/supermatter/attack_hand(var/mob/user) if(!istype(user,/mob/living/carbon/human/nucleation)) to_chat(user, pick( "\red You think twice before touching that without protection.",) - "\red You don't want to touch that without some protection.", "\red You probably should get something else to pick that up.", "\red You aren't sure that's a good idea.", diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index fa663b37ca6..dcce2bb23ae 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -226,9 +226,7 @@ for(var/mob/M in mob_list) to_chat(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...") - qdel(src) return(gain) diff --git a/code/modules/power/switch.dm b/code/modules/power/switch.dm index 07a6ddf558e..cba253be5f0 100644 --- a/code/modules/power/switch.dm +++ b/code/modules/power/switch.dm @@ -25,21 +25,17 @@ ..(user) if(on) to_chat(user, "The switch is in the on position") - else to_chat(user, "The switch is in the off position") - /obj/structure/powerswitch/attack_ai(mob/user) to_chat(user, "\red You're an AI. This is a manual switch. It's not going to work.") - return /obj/structure/powerswitch/attack_hand(mob/user) if(busy) to_chat(user, "\red This switch is already being toggled.") - return ..() diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 305e2c0fc9a..dd20b4fde12 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -59,7 +59,6 @@ var/list/blacklisted_tesla_types = list(/obj/machinery/atmospherics, to_chat(user, "The amount of orbiting mini-balls is [orbiting_balls.len].") - /obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount) for(var/i = 0, i < move_amount, i++) var/move_dir = pick(alldirs) diff --git a/code/modules/power/treadmill.dm b/code/modules/power/treadmill.dm index 88c7aae1995..8ae75a982a4 100644 --- a/code/modules/power/treadmill.dm +++ b/code/modules/power/treadmill.dm @@ -170,7 +170,6 @@ ..() to_chat(user, "The display reads:
[line1]
[line2]
") - /obj/machinery/treadmill_monitor/update_icon() overlays.Cut() if(stat & NOPOWER || !total_joules || !on) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 0ab93b6d825..7df58795f43 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -121,11 +121,9 @@ locate_machinery() if(turbine) to_chat(user, "Turbine connected.") - stat &= ~BROKEN else to_chat(user, "Turbine not connected.") - stat |= BROKEN return @@ -282,11 +280,9 @@ locate_machinery() if(compressor) to_chat(user, "Compressor connected.") - stat &= ~BROKEN else to_chat(user, "Compressor not connected.") - stat |= BROKEN return diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 24c0fa2bbda..645c6e786de 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -154,29 +154,22 @@ //maxx maxy and current z so that if you fuck up, you only fuck up one entire z level instead of the entire universe if(!startInput || !endInput) to_chat(src, "Missing Input") - return var/list/startCoords = splittext(startInput, ";") var/list/endCoords = splittext(endInput, ";") if(!startCoords || !endCoords) to_chat(src, "Invalid Coords") - to_chat(src, "Start Input: [startInput]") - to_chat(src, "End Input: [endInput]") - return var/turf/Start = locate(text2num(startCoords[1]),text2num(startCoords[2]),text2num(startCoords[3])) var/turf/End = locate(text2num(endCoords[1]),text2num(endCoords[2]),text2num(endCoords[3])) if(!Start || !End) to_chat(src, "Invalid Turfs") - to_chat(src, "Start Coords: [startCoords[1]] - [startCoords[2]] - [startCoords[3]]") - to_chat(src, "End Coords: [endCoords[1]] - [endCoords[2]] - [endCoords[3]]") - return var/list/clusters = list("None"=CLUSTER_CHECK_NONE,"All"=CLUSTER_CHECK_ALL,"Sames"=CLUSTER_CHECK_SAMES,"Differents"=CLUSTER_CHECK_DIFFERENTS, \ @@ -190,7 +183,6 @@ if(moduleClusters != "None") if(!clusters[moduleClusters]) to_chat(src, "Invalid Cluster Flags") - return theCluster = clusters[moduleClusters] else @@ -202,12 +194,8 @@ to_chat(src, "Defining Region") - N.defineRegion(Start, End) to_chat(src, "Region Defined") - to_chat(src, "Generating Region") - N.generate() to_chat(src, "Generated Region") - diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 2bb8334967d..0022a4e1f80 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -49,11 +49,9 @@ else to_chat(user, "\blue You can only inscribe a metal bullet.")//because inscribing beanbags is silly - else to_chat(user, "\blue There is no bullet in the casing to inscribe anything into.") - /obj/item/ammo_casing/proc/newshot() //For energy weapons, shotgun shells and wands (!). if (!BB) BB = new projectile_type(src) @@ -125,7 +123,6 @@ if(num_loaded) if(!silent) to_chat(user, "You load [num_loaded] shell\s into \the [src]!") - A.update_icon() update_icon() @@ -134,7 +131,6 @@ if(A) user.put_in_hands(A) to_chat(user, "You remove a round from \the [src]!") - update_icon() /obj/item/ammo_box/update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index bd288a8e405..7a3718d1642 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -69,7 +69,6 @@ proc/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "*click*") - playsound(user, 'sound/weapons/emptyclick.ogg', 40, 1) return @@ -100,7 +99,6 @@ var/mob/living/M = user if ((CLUMSY in M.mutations) && prob(50)) to_chat(M, "[src] blows up in your face.") - M.take_organ_damage(0,20) M.drop_item() qdel(src) @@ -108,27 +106,22 @@ if (!user.IsAdvancedToolUser() || istype(user, /mob/living/simple_animal/diona)) to_chat(user, "You don't have the dexterity to do this!") - return if(istype(user, /mob/living)) var/mob/living/M = user if (HULK in M.mutations) to_chat(M, "Your meaty finger is much too large for the trigger guard!") - return if(ishuman(user)) var/mob/living/carbon/human/H = user if(H.get_species() == "Golem") to_chat(user, "Your metal fingers don't fit in the trigger guard!") - return if(H.get_species() == "Shadowling") to_chat(user, "The muzzle flash would cause damage to your form!") - return if(H.martial_art && H.martial_art.name == "The Sleeping Carp") //great dishonor to famiry to_chat(user, "Use of ranged weaponry would bring dishonor to the clan.") - return add_fingerprint(user) @@ -139,7 +132,6 @@ if (!ready_to_fire()) if (world.time % 3) //to prevent spam to_chat(user, "[src] is not ready to fire again!") - return if(heavy_weapon) @@ -308,7 +300,6 @@ user.death() else to_chat(user, "Ow...") - user.apply_effect(110,STAMINA,0) del(in_chamber) mouthshoot = 0 @@ -339,11 +330,9 @@ if(!F) if(user.l_hand != src && user.r_hand != src) to_chat(user, "You'll need [src] in your hands to do that.") - return user.drop_item() to_chat(user, "You click [S] into place on [src].") - if(S.on) set_light(0) F = S @@ -355,11 +344,9 @@ if(F) if(user.l_hand != src && user.r_hand != src) to_chat(user, "You'll need [src] in your hands to do that.") - return for(var/obj/item/device/flashlight/seclite/S in src) to_chat(user, "You unscrew the seclite from [src].") - F = null S.loc = get_turf(user) update_gunlight(user) @@ -380,11 +367,9 @@ var/mob/living/carbon/human/user = usr if(!isturf(user.loc)) to_chat(user, "You cannot turn the light on while in this [user.loc].") - F.on = !F.on to_chat(user, "You toggle the gunlight [F.on ? "on":"off"].") - playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_gunlight(user) return diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm index 07ea0669a2b..eeb775be84a 100644 --- a/code/modules/projectiles/guns/alien.dm +++ b/code/modules/projectiles/guns/alien.dm @@ -35,7 +35,6 @@ ..(user) to_chat(user, "It has [spikes] [spikes == 1 ? "spike" : "spikes"] remaining.") - /obj/item/weapon/gun/launcher/spikethrower/update_icon() icon_state = "spikethrower[spikes]" @@ -47,7 +46,6 @@ var/mob/living/carbon/human/H = user if(H.species && H.species.name != "Vox" && H.species.name != "Vox Armalis") to_chat(user, "\red \The [src] does not respond to you!") - return 0 return 1 @@ -92,7 +90,6 @@ ..() return to_chat(user, "\red \The [src] is far too large for you to pick up.") - return /obj/item/weapon/gun/energy/noisecannon/process_chambered() //Does not have ammo. diff --git a/code/modules/projectiles/guns/energy/advtaser.dm b/code/modules/projectiles/guns/energy/advtaser.dm index fdeba3bd119..8601a388f15 100644 --- a/code/modules/projectiles/guns/energy/advtaser.dm +++ b/code/modules/projectiles/guns/energy/advtaser.dm @@ -22,7 +22,6 @@ charge_cost = 500 fire_sound = 'sound/weapons/taser2.ogg' to_chat(user, "\red [src.name] is now set to Disable.") - projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "advtaserdisable" fire_delay = 0 @@ -31,7 +30,6 @@ charge_cost = 2000 fire_sound = 'sound/weapons/Taser.ogg' to_chat(user, "\red [src.name] is now set to stun.") - projectile_type = "/obj/item/projectile/energy/electrode" modifystate = "advtaserstun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/blueshield.dm b/code/modules/projectiles/guns/energy/blueshield.dm index d136a75e834..914b92e19a6 100644 --- a/code/modules/projectiles/guns/energy/blueshield.dm +++ b/code/modules/projectiles/guns/energy/blueshield.dm @@ -23,7 +23,6 @@ to_chat(user, "You adjust [src.name] to the kill setting.") - else fire_mode = 0 charge_cost = 2000 @@ -35,5 +34,4 @@ to_chat(user, "You adjust [src.name] to the stun setting.") - update_icon() \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/hos.dm b/code/modules/projectiles/guns/energy/hos.dm index 14f9c82e4f8..6bcb9992c4d 100644 --- a/code/modules/projectiles/guns/energy/hos.dm +++ b/code/modules/projectiles/guns/energy/hos.dm @@ -19,7 +19,6 @@ charge_cost = 1000 fire_sound = 'sound/weapons/Laser.ogg' to_chat(user, "\red [src.name] is now set to kill.") - projectile_type = "/obj/item/projectile/beam" modifystate = "hoslaserkill" fire_delay = 0 @@ -28,7 +27,6 @@ charge_cost = 500 fire_sound = 'sound/weapons/taser2.ogg' to_chat(user, "\red [src.name] is now set to disable.") - projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "hoslaserdisable" fire_delay = 0 @@ -37,7 +35,6 @@ charge_cost = 2000 fire_sound = 'sound/weapons/taser.ogg' to_chat(user, "\red [src.name] is now set to stun.") - projectile_type = "/obj/item/projectile/energy/electrode" modifystate = "hoslaserstun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index c1243cf0911..096cd26da3a 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -126,7 +126,6 @@ obj/item/weapon/gun/energy/laser/retro if(istype(M.wear_suit, /obj/item/clothing/suit/bluetag)) return 1 to_chat(M, "\red You need to be wearing your laser tag vest!") - return 0 /obj/item/weapon/gun/energy/laser/redtag @@ -145,5 +144,4 @@ obj/item/weapon/gun/energy/laser/retro if(istype(M.wear_suit, /obj/item/clothing/suit/redtag)) return 1 to_chat(M, "\red You need to be wearing your laser tag vest!") - return 0 \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 1b9b955721d..5bc164c5d76 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -20,7 +20,6 @@ charge_cost = 1000 fire_sound = 'sound/weapons/Laser.ogg' to_chat(user, "\red [src.name] is now set to kill.") - projectile_type = "/obj/item/projectile/beam" modifystate = "energykill" if(1) @@ -28,7 +27,6 @@ charge_cost = 500 fire_sound = 'sound/weapons/Taser2.ogg' to_chat(user, "\red [src.name] is now set to disable.") - projectile_type = "/obj/item/projectile/beam/disabler" modifystate = "energystun" update_icon() @@ -99,19 +97,15 @@ for (var/mob/living/M in range(0,src)) //Only a minor failure, enjoy your radiation if you're in the same tile or carrying it if (src in M.contents) to_chat(M, "\red Your gun feels pleasantly warm for a moment.") - else to_chat(M, "\red You feel a warm sensation.") - M.apply_effect(rand(3,120), IRRADIATE) lightfail = 1 else for (var/mob/living/M in range(rand(1,4),src)) //Big failure, TIME FOR RADIATION BITCHES if (src in M.contents) to_chat(M, "\red Your gun's reactor overloads!") - to_chat(M, "\red You feel a wave of heat wash over you.") - M.apply_effect(300, IRRADIATE) crit_fail = 1 //break the gun so it stops recharging processing_objects.Remove(src) @@ -180,7 +174,6 @@ charge_cost = 500 fire_sound = 'sound/weapons/Laser.ogg' to_chat(user, "\red [src.name] is now set to kill.") - projectile_type = /obj/item/projectile/beam modifystate = "energykill" fire_delay = 0 @@ -189,7 +182,6 @@ charge_cost = 1000 fire_sound = 'sound/weapons/Taser.ogg' to_chat(user, "\red [src.name] is now set to stun.") - projectile_type = /obj/item/projectile/energy/electrode modifystate = "energystun" fire_delay = 15 diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 88d14a67e36..bc7704d709a 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -22,21 +22,18 @@ charge_cost = 50 fire_sound = 'sound/weapons/Taser.ogg' to_chat(user, "\red [src.name] is now set to stun.") - projectile_type = "/obj/item/projectile/energy/electrode" if(0) mode = 1 charge_cost = 100 fire_sound = 'sound/weapons/Laser.ogg' to_chat(user, "\red [src.name] is now set to kill.") - projectile_type = "/obj/item/projectile/beam" if(1) mode = 2 charge_cost = 200 fire_sound = 'sound/weapons/pulse.ogg' to_chat(user, "\red [src.name] is now set to DESTROY.") - projectile_type = "/obj/item/projectile/beam/pulse" return @@ -63,7 +60,6 @@ attack_self(mob/living/user as mob) to_chat(user, "\red [src.name] has three settings, and they are all DESTROY.") - /obj/item/weapon/gun/energy/pulse_rifle/carbine name = "pulse carbine" desc = "A compact variant of the pulse rifle with less firepower but easier storage." diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 2a157bf667c..bb556a4f178 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -51,14 +51,12 @@ mode = 1 charge_cost = 1000 to_chat(user, "\red The [src.name] is now set to increase yield.") - projectile_type = "/obj/item/projectile/energy/florayield" modifystate = "florayield" if(1) mode = 0 charge_cost = 1000 to_chat(user, "\red The [src.name] is now set to induce mutations.") - projectile_type = "/obj/item/projectile/energy/floramut" modifystate = "floramut" update_icon() @@ -120,12 +118,10 @@ obj/item/weapon/gun/energy/staff/focus if(projectile_type == "/obj/item/projectile/forcebolt") charge_cost = 200 to_chat(user, "\red The [src.name] will now strike a small area.") - projectile_type = "/obj/item/projectile/forcebolt/strong" else charge_cost = 100 to_chat(user, "\red The [src.name] will now strike only a single person.") - projectile_type = "/obj/item/projectile/forcebolt" */ @@ -179,11 +175,9 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. set popup_menu = 0 if(usr.stat || !(istype(usr,/mob/living/carbon/human))) to_chat(usr, "You are unable to focus down the scope of the rifle.") - return if(!zoom && usr.get_active_hand() != src) to_chat(usr, "You are too distracted to look down the scope, perhaps if it was in your active hand this might work better") - return if(usr.client.view == world.view) @@ -200,7 +194,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. to_chat(usr, "Zoom mode [zoom?"en":"dis"]abled.") - /obj/item/weapon/gun/energy/kinetic_accelerator name = "proto-kinetic accelerator" desc = "According to Nanotrasen accounting, this is mining equipment. It's been modified for extreme power output to crush rocks, but often serves as a miner's first defense against hostile alien life; it's not very powerful unless used in a low pressure environment." @@ -249,7 +242,6 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. playsound(src.loc, 'sound/weapons/kenetic_reload.ogg', 60, 1) else if(user) to_chat(usr, "You silently charge [src].") - recently_fired = 0 update_icon() @@ -302,19 +294,16 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(power_supply) to_chat(user, "[src] is [round(power_supply.percent())]% charged.") - /obj/item/weapon/gun/energy/plasmacutter/attackby(var/obj/item/A, var/mob/user) if(istype(A, /obj/item/stack/sheet/mineral/plasma)) var/obj/item/stack/sheet/S = A S.use(1) power_supply.give(10000) to_chat(user, "You insert [A] in [src], recharging it.") - else if(istype(A, /obj/item/weapon/ore/plasma)) qdel(A) power_supply.give(5000) to_chat(user, "You insert [A] in [src], recharging it.") - else ..() @@ -388,13 +377,11 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. if(0) mode = 1 to_chat(user, "[name] is now set to orange.") - projectile_type = "/obj/item/projectile/beam/wormhole/orange" modifystate = "wormhole_projector_orange" if(1) mode = 0 to_chat(user, "[name] is now set to blue.") - projectile_type = "/obj/item/projectile/beam/wormhole" modifystate = "wormhole_projector" update_icon() diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 88f92bad688..1e0eb5d08c2 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -43,7 +43,6 @@ if(istype(W, /obj/item/weapon/card/emag) && !emagged) emagged = 1 to_chat(user, "You double the gun's temperature cap! Targets hit by searing beams will burst into flames!") - desc = "A gun that changes the body temperature of its targets. Its temperature cap has been hacked." /obj/item/weapon/gun/energy/temperature/Topic(href, href_list) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index c4e382ffbdc..13f92bcef86 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -34,7 +34,6 @@ 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].") - return else no_den_usage = 0 @@ -64,5 +63,4 @@ /obj/item/weapon/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "The [name] whizzles quietly.") - return \ No newline at end of file diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm index bd922c6a9cf..6be4e0936bf 100644 --- a/code/modules/projectiles/guns/magic/wand.dm +++ b/code/modules/projectiles/guns/magic/wand.dm @@ -29,13 +29,11 @@ ..(user) to_chat(user, "Has [charges] charge\s remaining.") - /obj/item/weapon/gun/magic/wand/attack_self(mob/living/user as mob) if(charges) zap_self(user) else to_chat(user, "The [name] whizzles quietly.") - ..() /obj/item/weapon/gun/magic/wand/attack(atom/target as mob, mob/living/user as mob) @@ -46,7 +44,6 @@ /obj/item/weapon/gun/magic/wand/afterattack(atom/target as mob, mob/living/user as mob) if(!charges && !drained) to_chat(user, "The [name] whizzles quietly.") - icon_state = "[icon_state]-drained" drained = 1 return @@ -55,7 +52,6 @@ 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].") - return else no_den_usage = 0 @@ -78,7 +74,6 @@ var/message ="You irradiate yourself with pure energy! " message += pick("Do not pass go. Do not collect 200 zorkmids.","You feel more confident in your spell casting skills.","You Die...","Do you want your possessions identified?") to_chat(user, message) - user.adjustOxyLoss(500) charges-- ..() @@ -101,7 +96,6 @@ user.heal_overall_damage(user.getBruteLoss(), user.getFireLoss()) user.reagents.clear_reagents() to_chat(user, "You feel great!") - charges-- ..() diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index a01cf749057..d6fb9d9aff0 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -67,25 +67,21 @@ magazine = AM magazine.loc = src to_chat(user, "You load a new magazine into \the [src].") - chamber_round() A.update_icon() update_icon() return 1 else if (magazine) to_chat(user, "There's already a magazine in \the [src].") - if(istype(A, /obj/item/weapon/suppressor)) var/obj/item/weapon/suppressor/S = A if(can_suppress) if(!silenced) if(user.l_hand != src && user.r_hand != src) to_chat(user, "You'll need [src] in your hands to do that.") - return user.drop_item() to_chat(user, "You screw [S] onto [src].") - silenced = A S.oldsound = fire_sound S.initial_w_class = w_class @@ -96,11 +92,9 @@ return else to_chat(user, "[src] already has a suppressor.") - return else to_chat(user, "You can't seem to figure out how to fit [S] on [src].") - return return 0 @@ -112,7 +106,6 @@ ..() return to_chat(user, "You unscrew [silenced] from [src].") - user.put_in_hands(silenced) fire_sound = S.oldsound w_class = S.initial_w_class @@ -128,10 +121,8 @@ magazine.update_icon() magazine = null to_chat(user, "You pull the magazine out of \the [src]!") - else to_chat(user, "There's no magazine in \the [src].") - update_icon() return @@ -139,7 +130,6 @@ ..(user) to_chat(user, "Has [get_ammo()] round\s remaining.") - /obj/item/weapon/gun/projectile/proc/get_ammo(var/countchambered = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 148cac3cd6d..b56344ce039 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -37,13 +37,11 @@ if(istype(AM, text2path(mag_type))) if(magazine) to_chat(user, "You perform a tactical reload on \the [src], replacing the magazine.") - magazine.forceMove(get_turf(src.loc)) magazine.update_icon() magazine = null else to_chat(user, "You insert the magazine into \the [src].") - user.remove_from_mob(AM) magazine = AM magazine.forceMove(src) @@ -62,13 +60,11 @@ burst_size = 1 fire_delay = 0 to_chat(user, "You switch to semi-automatic.") - else burst_size = initial(burst_size) fire_delay = initial(fire_delay) to_chat(user, "You switch to [burst_size] round burst.") - playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() return @@ -149,7 +145,6 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user as mob) cover_open = !cover_open to_chat(user, "You [cover_open ? "open" : "close"] [src]'s cover.") - update_icon() /obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon() @@ -160,7 +155,6 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays if(cover_open) to_chat(user, "[src]'s cover is open! Close it before firing!") - else ..() update_icon() @@ -181,11 +175,9 @@ to_chat(user, "You remove the magazine from [src].") - /obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(var/obj/item/A as obj, mob/user as mob, params) if(!cover_open && istype(A, mag_type)) to_chat(user, "[src]'s cover is closed! You can't insert a new mag!") - return ..() @@ -255,17 +247,14 @@ burst_size = initial(burst_size) fire_delay = initial(fire_delay) to_chat(user, "You switch to [burst_size] round burst.") - if(1) select = 2 to_chat(user, "You switch to grenades.") - if(2) select = 0 burst_size = 1 fire_delay = 0 to_chat(user, "You switch to semi-auto.") - playsound(user, 'sound/weapons/empty.ogg', 100, 1) update_icon() return diff --git a/code/modules/projectiles/guns/projectile/crossbow.dm b/code/modules/projectiles/guns/projectile/crossbow.dm index f4c5ec993f7..3645899ab21 100644 --- a/code/modules/projectiles/guns/projectile/crossbow.dm +++ b/code/modules/projectiles/guns/projectile/crossbow.dm @@ -43,7 +43,6 @@ /obj/item/weapon/arrow/rod/removed(mob/user) if(throwforce == 15) // The rod has been superheated - we don't want it to be useable when removed from the bow. to_chat(user, "[src] shatters into a scattering of overstressed metal shards as it leaves the crossbow.") - var/obj/item/weapon/shard/shrapnel/S = new() S.loc = get_turf(src) qdel(src) @@ -82,7 +81,6 @@ /obj/item/weapon/gun/launcher/crossbow/special_check(user) if(tension <= 0) to_chat(user, "\red \The [src] is not drawn back!") - return 0 return 1 @@ -114,7 +112,6 @@ if(!in_chamber) to_chat(user, "You don't have anything nocked to [src].") - return if(user.restrained()) @@ -136,7 +133,6 @@ if(tension>=max_tension) tension = max_tension to_chat(usr, "[src] clunks as you draw the string to its maximum tension!") - else user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") spawn(25) increase_tension(user) @@ -167,23 +163,19 @@ W.loc = src cell = W to_chat(user, "You jam [cell] into [src] and wire it to the firing coil.") - superheat_rod(user) else to_chat(user, "[src] already has a cell installed.") - else if(istype(W, /obj/item/weapon/screwdriver)) if(cell) var/obj/item/C = cell C.loc = get_turf(user) to_chat(user, "You jimmy [cell] out of [src] with [W].") - cell = null else to_chat(user, "[src] doesn't have a cell installed.") - else ..() @@ -195,7 +187,6 @@ if(!istype(in_chamber,/obj/item/weapon/arrow/rod)) return to_chat(user, "[in_chamber] plinks and crackles as it begins to glow red-hot.") - in_chamber.throwforce = 15 in_chamber.icon_state = "metal-rod-superheated" cell.use(500) @@ -239,7 +230,6 @@ if(tension>=max_tension) tension = max_tension to_chat(usr, "[src] clunks as you draw the string to its maximum tension!") - else user.visible_message("[usr] draws back the string of [src]!","You continue drawing back the string of [src]!") spawn(25) increase_tension(user) @@ -261,20 +251,15 @@ switch(buildstate) if(1) to_chat(user, "It has a loose rod frame in place.") - if(2) to_chat(user, "It has a steel backbone welded in place.") - if(3) to_chat(user, "It has a steel backbone and a cell mount installed.") - if(4) to_chat(user, "It has a steel backbone, plastic lath and a cell mount installed.") - if(5) to_chat(user, "It has a steel cable loosely strung across the lath.") - /obj/item/weapon/crossbowframe/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/stack/rods)) if(buildstate == 0) @@ -282,12 +267,10 @@ if(R.amount >= 3) R.use(3) to_chat(user, "\blue You assemble a backbone of rods around the wooden stock.") - buildstate++ update_icon() else to_chat(user, "\blue You need at least three rods to complete this task.") - return else if(istype(W,/obj/item/weapon/weldingtool)) if(buildstate == 1) @@ -296,7 +279,6 @@ if(!src || !T.isOn()) return playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) to_chat(user, "\blue You weld the rods into place.") - buildstate++ update_icon() return @@ -306,23 +288,19 @@ if(C.amount >= 5) C.use(5) to_chat(user, "\blue You wire a crude cell mount into the top of the crossbow.") - buildstate++ update_icon() else to_chat(user, "\blue You need at least five segments of cable coil to complete this task.") - return else if(buildstate == 4) if(C.amount >= 5) C.use(5) to_chat(user, "\blue You string a steel cable across the crossbow's lath.") - buildstate++ update_icon() else to_chat(user, "\blue You need at least five segments of cable coil to complete this task.") - return else if(istype(W,/obj/item/stack/sheet/mineral/plastic)) if(buildstate == 3) @@ -330,17 +308,14 @@ if(P.amount >= 3) P.use(3) to_chat(user, "\blue You assemble and install a heavy plastic lath onto the crossbow.") - buildstate++ update_icon() else to_chat(user, "\blue You need at least three plastic sheets to complete this task.") - return else if(istype(W,/obj/item/weapon/screwdriver)) if(buildstate == 5) to_chat(user, "\blue You secure the crossbow's various parts.") - new /obj/item/weapon/gun/launcher/crossbow(get_turf(src)) qdel(src) return diff --git a/code/modules/projectiles/guns/projectile/grenade launcher.dm b/code/modules/projectiles/guns/projectile/grenade launcher.dm index f8d4f5161a3..28dc0c3a4b9 100644 --- a/code/modules/projectiles/guns/projectile/grenade launcher.dm +++ b/code/modules/projectiles/guns/projectile/grenade launcher.dm @@ -30,7 +30,6 @@ /obj/item/weapon/gun/launcher/attack(mob/living/M as mob, mob/living/user as mob, def_zone) if (M == user && user.zone_sel.selecting == "mouth") to_chat(user, "\red Shooting yourself with \a [src] is pretty tricky. You can't seem to manage it.") - return ..() @@ -41,7 +40,6 @@ if (!user.IsAdvancedToolUser()) to_chat(user, "\red You don't have the dexterity to do this!") - return 0 add_fingerprint(user) @@ -58,7 +56,6 @@ if (!ready_to_fire()) if (world.time % 3) //to prevent spam to_chat(user, "[src] is not ready to fire again!") - return 0 if(!chamber_round()) //CHECK diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 8b3d522592c..2cb3c849e4b 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -33,7 +33,6 @@ num_loaded++ if(num_loaded) to_chat(user, "You load [num_loaded] shell\s into \the [src]!") - A.update_icon() update_icon() chamber_round() @@ -50,11 +49,9 @@ num_unloaded++ if (num_unloaded) to_chat(user, "You unload [num_unloaded] shell\s from [src]!") - else to_chat(user, "[src] is empty.") - /obj/item/weapon/gun/projectile/revolver/get_ammo(var/countchambered = 0, var/countempties = 1) var/boolets = 0 //mature var names for mature people if (chambered && countchambered) @@ -67,7 +64,6 @@ ..(user) to_chat(user, "[get_ammo(0,0)] of those are live rounds.") - /obj/item/weapon/gun/projectile/revolver/verb/spin_revolver() set name = "Spin cylinder" set desc = "Fun when you're bored out of your skull." @@ -103,7 +99,6 @@ return 1 if(prob(70 - (magazine.ammo_count() * 10))) //minimum probability of 10, maximum of 60 to_chat(M, "[src] blows up in your face!") - M.take_organ_damage(0,20) M.drop_item() qdel(src) @@ -121,7 +116,6 @@ if(src && input && !M.stat && in_range(M,src)) name = input to_chat(M, "You name the gun [input]. Say hello to your new friend.") - return 1 /obj/item/weapon/gun/projectile/revolver/detective/verb/reskin_gun() @@ -141,7 +135,6 @@ if(src && choice && !M.stat && in_range(M,src)) icon_state = options[choice] to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.") - return 1 /obj/item/weapon/gun/projectile/revolver/detective/attackby(var/obj/item/A as obj, mob/user as mob, params) @@ -149,7 +142,6 @@ if(istype(A, /obj/item/weapon/screwdriver) || istype(A, /obj/item/weapon/conversion_kit)) if(magazine.caliber == "38") to_chat(user, "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!") @@ -157,7 +149,6 @@ if(do_after(user, 30, target = src)) if(magazine.ammo_count()) to_chat(user, "You can't modify it!") - return if (istype(A, /obj/item/weapon/conversion_kit)) ghettomodded = 0 @@ -166,10 +157,8 @@ magazine.caliber = "357" desc = "[initial(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.") - else to_chat(user, "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!") @@ -177,7 +166,6 @@ if(do_after(user, 30, target = src)) if(magazine.ammo_count()) to_chat(user, "You can't modify it!") - return ghettomodded = 0 magazine.caliber = "38" @@ -187,7 +175,6 @@ - /obj/item/weapon/gun/projectile/revolver/mateba name = "\improper Unica 6 auto-revolver" desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo." //>10mm hole >.357 diff --git a/code/modules/projectiles/guns/projectile/rocket.dm b/code/modules/projectiles/guns/projectile/rocket.dm index f791a1da1c7..e667d9323ce 100644 --- a/code/modules/projectiles/guns/projectile/rocket.dm +++ b/code/modules/projectiles/guns/projectile/rocket.dm @@ -20,7 +20,6 @@ if(..(user, 2)) to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.") - /obj/item/weapon/gun/rocketlauncher/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/ammo_casing/rocket)) if(rockets.len < max_rockets) @@ -28,13 +27,10 @@ I.loc = src rockets += I to_chat(user, "\blue You put the rocket in [src].") - to_chat(user, "\blue [rockets.len] / [max_rockets] rockets.") - else to_chat(usr, "\red [src] cannot hold more rockets.") - /obj/item/weapon/gun/rocketlauncher/can_fire() return rockets.len @@ -52,4 +48,3 @@ return else to_chat(usr, "\red [src] is empty.") - diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index c300748a98d..90402f0e57c 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -30,7 +30,6 @@ num_loaded++ if(num_loaded) to_chat(user, "You load [num_loaded] shell\s into \the [src]!") - A.update_icon() update_icon() @@ -75,7 +74,6 @@ if (chambered) to_chat(user, "A [chambered.BB ? "live" : "spent"] one is in the chamber.") - /obj/item/weapon/gun/projectile/shotgun/isHandgun() //You cannot, in fact, holster a shotgun. return 0 @@ -120,7 +118,6 @@ /obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(var/obj/item/A as obj, mob/user as mob) if(!bolt_open) to_chat(user, "The bolt is closed!") - return . = ..() @@ -128,7 +125,6 @@ ..(user) to_chat(user, "The bolt is [bolt_open ? "open" : "closed"].") - /obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted name = "enchanted bolt action rifle" desc = "Careful not to lose your head." @@ -196,11 +192,9 @@ num_unloaded++ if (num_unloaded) to_chat(user, "You break open \the [src] and unload [num_unloaded] shell\s.") - else to_chat(user, "[src] is empty.") - /obj/item/weapon/gun/projectile/revolver/doublebarrel/isHandgun() //contrary to popular opinion, double barrels are not, shockingly, handguns return 0 @@ -226,11 +220,9 @@ slot_flags = SLOT_BACK icon_state = "ishotgunsling" to_chat(user, "You tie the lengths of cable to the shotgun, making a sling.") - update_icon() else to_chat(user, "You need at least ten lengths of cable if you want to make a sling.") - return // Sawing guns related procs // @@ -245,7 +237,6 @@ /obj/item/weapon/gun/projectile/proc/sawoff(mob/user as mob) if(sawn_state == SAWN_OFF) to_chat(user, "\The [src] is already shortened.") - return if(sawn_state == SAWN_SAWING) diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm index 01b41bb0c13..0e43d550c85 100644 --- a/code/modules/projectiles/guns/syringe_gun.dm +++ b/code/modules/projectiles/guns/syringe_gun.dm @@ -31,12 +31,10 @@ /obj/item/weapon/gun/syringe/examine(mob/user) ..(user) to_chat(user, "Can hold [max_syringes] syringe\s. Has [syringes.len] syringe\s remaining.") - /obj/item/weapon/gun/syringe/attack_self(mob/living/user as mob) if(!syringes.len) to_chat(user, "[src] is empty.") - return 0 var/obj/item/weapon/reagent_containers/syringe/S = syringes[syringes.len] @@ -47,7 +45,6 @@ syringes.Remove(S) to_chat(user, "You unload [S] from \the [src]!") - return 1 /obj/item/weapon/gun/syringe/attackby(var/obj/item/A as obj, mob/user as mob, var/show_msg = 1, params) @@ -55,13 +52,11 @@ if(syringes.len < max_syringes) user.drop_item() to_chat(user, "You load [A] into \the [src]!") - syringes.Add(A) A.forceMove(src) return 1 else to_chat(usr, "[src] cannot hold more syringes.") - return 0 /obj/item/weapon/gun/syringe/rapidsyringe diff --git a/code/modules/projectiles/medbeam.dm b/code/modules/projectiles/medbeam.dm index ca210f345b0..04f8f4b6862 100644 --- a/code/modules/projectiles/medbeam.dm +++ b/code/modules/projectiles/medbeam.dm @@ -68,7 +68,6 @@ if(get_dist(H,current_target)>max_range || !los_check(H,current_target)) LoseTarget() to_chat(H, "You lose control of the beam!") - return if(current_target) diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index d329a5f7a96..5a028a1084a 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -141,7 +141,6 @@ if(silenced) playsound(loc, hitsound, 5, 1, -1) to_chat(M, "\red You've been shot in the [parse_zone(def_zone)] by the [src.name]!") - else playsound(loc, hitsound, 20, 1, -1) visible_message("\red [A.name] is hit by the [src.name] in the [parse_zone(def_zone)]!")//X has fired Y is now given by the guns so you cant tell who shot you if you could not see the shooter @@ -211,7 +210,6 @@ if(!Angle) Angle=round(Get_Angle(src,current)) // to_chat(world, "[Angle] angle") - //overlays.Cut() //var/icon/I=new(initial(icon),icon_state) //using initial(icon) makes sure that the angle for that is reset as well //I.Turn(Angle) @@ -232,26 +230,22 @@ //Not sure if using whiles for this is good while(pixel_x_offset > 16) // to_chat(world, "Pre-adjust coords (x++): xy [pixel_x] xy offset [pixel_x_offset]") - pixel_x_offset -= 32 pixel_x -= 32 new_x++// x++ while(pixel_x_offset < -16) // to_chat(world, "Pre-adjust coords (x--): xy [pixel_x] xy offset [pixel_x_offset]") - pixel_x_offset += 32 pixel_x += 32 new_x-- while(pixel_y_offset > 16) // to_chat(world, "Pre-adjust coords (y++): py [pixel_y] py offset [pixel_y_offset]") - pixel_y_offset -= 32 pixel_y -= 32 new_y++ while(pixel_y_offset < -16) // to_chat(world, "Pre-adjust coords (y--): py [pixel_y] py offset [pixel_y_offset]") - pixel_y_offset += 32 pixel_y += 32 new_y-- diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 29b1295691f..e86d8e7a739 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -240,18 +240,15 @@ f.hotspot_expose(1000,CELL_VOLUME) if((x == 1 || x == world.maxx || y == 1 || y == world.maxy)) // to_chat(world, "deleting") - //qdel(src) //Delete if it passes the world edge broken = 1 return if(kill_count < 1) // to_chat(world, "deleting") - //qdel(src) broken = 1 kill_count-- // to_chat(world, "[x] [y]") - if(!bumped && !isturf(original)) if(loc == get_turf(original)) if(!(original in permutated)) @@ -267,7 +264,6 @@ first = 0 if(broken) // to_chat(world, "breaking") - break else last = get_turf(src.loc) @@ -279,7 +275,6 @@ return /*cleanup(reference) //Waits .3 seconds then removes the overlay. // to_chat(world, "setting invisibility") - sleep(50) src.invisibility = 101 return*/ diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 7a4c6f937f7..7d8c9abbe8f 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -68,11 +68,9 @@ break if(old_stat != DEAD) to_chat(target, "You feel great!") - else to_chat(target, "You rise with a start, you're alive!!!") - /obj/item/projectile/magic/teleport name = "bolt of teleportation" icon_state = "bluespace" @@ -242,7 +240,6 @@ proc/wabbajack(mob/living/M) to_chat(new_mob, "Your form morphs into that of a [randomize].") - qdel(M) return new_mob @@ -266,9 +263,7 @@ proc/wabbajack(mob/living/M) if(H.mind) H.mind.transfer_to(S) to_chat(S, "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!") - to_chat(S, "Do not harm [firer.name], your creator.") - H = change H.loc = S qdel(src) diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index be32a5a58af..921cc49c60f 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -4,11 +4,9 @@ firerate = !firerate if (firerate == 0) to_chat(loc, "You will now continue firing when your target moves.") - else to_chat(loc, "You will now only fire once, then lower your aim, when your target moves.") - /obj/item/weapon/gun/verb/lower_aim() set name = "Lower Aim" set category = "Object" @@ -87,7 +85,6 @@ Fire(T,usr, reflex = 1) else if(!told_cant_shoot) to_chat(M, "\red They can't be hit from here!") - told_cant_shoot = 1 spawn(30) told_cant_shoot = 0 @@ -105,7 +102,6 @@ proc/GunTrace(X1,Y1,X2,Y2,Z=1,exc_obj,PX1=16,PY1=16,PX2=16,PY2=16) // to_chat(bluh, "Tracin' [X1],[Y1] to [X2],[Y2] on floor [Z].") - var/turf/T var/mob/living/M if(X1==X2) @@ -157,14 +153,12 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. else if(I.target.len >= 5) if(ismob(I.loc)) to_chat(I.loc, "You can only target 5 people at once!") - return else return for(var/mob/living/K in viewers(usr)) to_chat(K, 'sound/weapons/TargetOn.ogg') - if(!targeted_by) targeted_by = list() targeted_by += I I.lock_time = world.time + 20 //Target has 2 second to realize they're targeted and stop (or target the opponent). @@ -194,7 +188,6 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. /*if(m_intent == "run" && T.client.target_can_move == 1 && T.client.target_can_run == 0 && (ishuman(T))) to_chat(src, "\red Your move intent is now set to walk, as your targeter permits it.")//Self explanitory. - set_m_intent("walk")*/ //Processing the aiming. Should be probably in separate object with process() but lasy. @@ -223,7 +216,6 @@ mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) to_chat(M, 'sound/weapons/TargetOff.ogg') - targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) @@ -276,10 +268,8 @@ client/verb/ToggleGunMode() gun_mode = !gun_mode if(gun_mode) to_chat(usr, "You will now take people captive.") - else to_chat(usr, "You will now shoot where you target.") - for(var/obj/item/weapon/gun/G in usr) G.stop_aim() remove_gun_icons() @@ -294,12 +284,10 @@ client/verb/ToggleGunMode() target_can_move = !target_can_move if(target_can_move) to_chat(usr, "Target may now walk.") - //usr.gun_run_icon = new /obj/screen/gun/run(null) //adding icon for running permission screen += usr.gun_run_icon else to_chat(usr, "Target may no longer move.") - target_can_run = 0 qdel(usr.gun_run_icon) //no need for icon for running permission @@ -315,15 +303,12 @@ client/verb/ToggleGunMode() for(var/mob/living/M in G.target) if(target_can_move) to_chat(M, "Your character may now walk at the discretion of their targeter.") - if(!target_can_run && (ishuman(M))) to_chat(M, "\red Your move intent is now set to walk, as your targeter permits it.") - M.set_m_intent("walk") else to_chat(M, "\red Your character will now be shot if they move.") - mob/living/proc/set_m_intent(var/intent) if (intent != "walk" && intent != "run") return 0 @@ -339,11 +324,9 @@ client/verb/AllowTargetRun() target_can_run = !target_can_run if(target_can_run) to_chat(usr, "Target may now run.") - else to_chat(usr, "Target may no longer run.") - //Updating running permission button if(usr.gun_run_icon) usr.gun_run_icon.icon_state = "no_run[target_can_run]" @@ -356,11 +339,9 @@ client/verb/AllowTargetRun() for(var/mob/living/M in G.target) if(target_can_run) to_chat(M, "Your character may now run at the discretion of their targeter.") - else to_chat(M, "\red Your character will now be shot if they run.")*/ - client/verb/AllowTargetClick() set hidden=1 @@ -368,11 +349,9 @@ client/verb/AllowTargetClick() target_can_click = !target_can_click if(target_can_click) to_chat(usr, "Target may now use items.") - else to_chat(usr, "Target may no longer use items.") - if(usr.item_use_icon) usr.item_use_icon.icon_state = "no_item[target_can_click]" usr.item_use_icon.name = "[target_can_click ? "Disallow" : "Allow"] Item Use" @@ -384,7 +363,5 @@ client/verb/AllowTargetClick() for(var/mob/living/M in G.target) if(target_can_click) to_chat(M, "Your character may now use items at the discretion of their targeter.") - else to_chat(M, "\red Your character will now be shot if they use items.") - diff --git a/code/modules/reagents/Chemistry-Holder.dm b/code/modules/reagents/Chemistry-Holder.dm index 809201da056..1b2e9a0b3d4 100644 --- a/code/modules/reagents/Chemistry-Holder.dm +++ b/code/modules/reagents/Chemistry-Holder.dm @@ -304,14 +304,12 @@ var/const/INGEST = 2 if(!C.no_message) to_chat(M, "\blue \icon[my_atom] [C.mix_message]") - if(istype(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, "\blue \icon[my_atom] The [my_atom]'s power is consumed in the reaction.") - ME2.name = "used slime extract" ME2.desc = "This extract has been used up." @@ -555,14 +553,12 @@ var/const/INGEST = 2 for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) // to_chat(world, "proffering a data-carrying reagent ([reagent_id])") - return D.data /datum/reagents/proc/set_data(var/reagent_id, var/new_data) for(var/datum/reagent/D in reagent_list) if(D.id == reagent_id) // to_chat(world, "reagent data set ([reagent_id])") - D.data = new_data /datum/reagents/proc/copy_data(var/datum/reagent/current_reagent) diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index d70399f8d86..59efbc9970b 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -111,7 +111,6 @@ /obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main",var/datum/nanoui/ui = null, var/force_open = 1) if(broken_requirements.len) to_chat(user, "[src] is broken. [broken_requirements[broken_requirements[1]]]") - return @@ -209,28 +208,23 @@ else if(!user.drop_item()) to_chat(user, "\The [B] is stuck to you!") - return qdel(B) broken_requirements -= broken_requirements[1] to_chat(user, "You fix [src].") - return if(src.beaker) to_chat(user, "Something is already loaded into the machine.") - return if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks)) src.beaker = B if(!user.drop_item()) to_chat(user, "\The [B] is stuck to you!") - return B.forceMove(src) to_chat(user, "You set [B] on the machine.") - nanomanager.update_uis(src) // update all UIs attached to src if(!icon_beaker) icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position. @@ -243,14 +237,12 @@ if(istype(B, /obj/item/device/multitool)) if(hackedcheck == 0) to_chat(user, hack_message) - dispensable_reagents += hacked_reagents hackedcheck = 1 return else to_chat(user, unhack_message) - dispensable_reagents -= hacked_reagents hackedcheck = 0 return @@ -353,7 +345,6 @@ if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(panel_open) to_chat(user, "Close the maintenance panel first.") - return ..() else @@ -370,12 +361,10 @@ if(anchored) anchored = 0 to_chat(user, "\The [src] can now be moved.") - else if(!anchored) anchored = 1 to_chat(user, "\The [src] is now secured.") - if(panel_open) if(istype(I, /obj/item/weapon/crowbar)) if(beaker) @@ -441,16 +430,13 @@ if(src.beaker) to_chat(user, "A beaker is already loaded into the machine.") - return if(!user.drop_item()) to_chat(user, "\The [B] is stuck to you!") - return src.beaker = B B.forceMove(src) to_chat(user, "You add the beaker to the machine!") - src.updateUsrDialog() icon_state = "mixer1" @@ -458,17 +444,14 @@ if(src.loaded_pill_bottle) to_chat(user, "A pill bottle is already loaded into the machine.") - return if(!user.drop_item()) to_chat(user, "\The [B] is stuck to you!") - return src.loaded_pill_bottle = B B.forceMove(src) to_chat(user, "You add the pill bottle into the dispenser slot!") - src.updateUsrDialog() return @@ -811,7 +794,6 @@ return 1 else to_chat(user, "You can't use the [src.name] while it's panel is opened!") - return 1 else ..() @@ -902,7 +884,6 @@ else if(!user.drop_item()) to_chat(user, "\The [O] is stuck to you!") - return src.beaker = O O.forceMove(src) @@ -912,7 +893,6 @@ if(holdingitems && holdingitems.len >= limit) to_chat(usr, "The machine cannot hold anymore items.") - return 1 //Fill machine with the plantbag! @@ -924,20 +904,17 @@ holdingitems += G if(holdingitems && holdingitems.len >= limit) //Sanity checking so the blender doesn't overfill to_chat(user, "You empty the plant bag into the All-In-One grinder.") - src.updateUsrDialog() return 0 if (!is_type_in_list(O, blend_items) && !is_type_in_list(O, juice_items)) to_chat(user, "Cannot refine into a reagent.") - return 1 user.unEquip(O) diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm index c4aed49df82..e0540151f7d 100644 --- a/code/modules/reagents/Chemistry-Readme.dm +++ b/code/modules/reagents/Chemistry-Readme.dm @@ -228,12 +228,9 @@ About the Tools: system you'll need to add something like this in its new proc: to_chat(var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum , 100 is the maximum_volume of the new holder datum.) - to_chat(reagents = R, <<< assign the new datum to the objects reagents var) - to_chat(R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.) - This can also be done by calling a convenience proc: atom/proc/create_reagents(var/max_volume) diff --git a/code/modules/reagents/dartgun.dm b/code/modules/reagents/dartgun.dm index e8b9104a163..4fb705dbcf9 100644 --- a/code/modules/reagents/dartgun.dm +++ b/code/modules/reagents/dartgun.dm @@ -61,13 +61,11 @@ if(..(user, 2)) if(beakers.len) to_chat(user, "[R.volume] units of [R.name]") - /obj/item/weapon/gun/dartgun/attackby(obj/item/I as obj, mob/user as mob, params) if(istype(I, /obj/item/weapon/dart_cartridge)) @@ -75,7 +73,6 @@ if(!D.darts) to_chat(user, "[D] is empty.") - return 0 if(cartridge) @@ -83,34 +80,28 @@ src.remove_cartridge() else to_chat(user, "There's already a cartridge in [src].") - return 0 user.drop_item() cartridge = D D.forceMove(src) to_chat(user, "You slot [D] into [src].") - update_icon() return if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(!istype(I, container_type)) to_chat(user, "[I] doesn't seem to fit into [src].") - return if(beakers.len >= max_beakers) to_chat(user, "[src] already has [max_beakers] beakers in it - another one isn't going to fit!") - return var/obj/item/weapon/reagent_containers/glass/beaker/B = I if(!user.drop_item()) to_chat(user, "\The [B] is stuck to you!") - return B.forceMove(src) beakers += B to_chat(user, "You pop the cartridge out of [src].") - var/obj/item/weapon/dart_cartridge/C = cartridge C.forceMove(get_turf(src)) C.update_icon() @@ -156,11 +146,9 @@ var/obj/item/weapon/reagent_containers/syringe/S = get_mixed_syringe() if(!S) to_chat(user, "There are no darts in [src]!") - return if(!S.reagents) to_chat(user, "There are no reagents available!") - return cartridge.darts-- src.update_icon() @@ -204,7 +192,6 @@ D.reagents.trans_to(M, 15) to_chat(M, "You feel a slight prick.") - qdel(D) break if(D) @@ -285,7 +272,6 @@ if(beakers[index]) var/obj/item/weapon/reagent_containers/glass/beaker/B = beakers[index] to_chat(usr, "You remove [B] from [src].") - mixing -= B beakers -= B B.forceMove(get_turf(src)) @@ -301,7 +287,6 @@ to_chat(usr, "[src] is empty.") - /obj/item/weapon/gun/dartgun/vox name = "alien dart gun" desc = "A small gas-powered dartgun, fitted for nonhuman hands." diff --git a/code/modules/reagents/grenade_launcher.dm b/code/modules/reagents/grenade_launcher.dm index a2a74dc9635..9b9484ba60e 100644 --- a/code/modules/reagents/grenade_launcher.dm +++ b/code/modules/reagents/grenade_launcher.dm @@ -21,7 +21,6 @@ if(..(user, 2)) to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") - /obj/item/weapon/gun/grenadelauncher/attackby(obj/item/I as obj, mob/user as mob, params) if((istype(I, ammo_type))) @@ -30,13 +29,10 @@ I.loc = src grenades += I to_chat(user, "\blue You put the [ammo_name] in the [name].") - to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") - else to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.") - /obj/item/weapon/gun/grenadelauncher/afterattack(obj/target, mob/user , flag) if (istype(target, /obj/item/weapon/storage/backpack )) @@ -53,12 +49,10 @@ else to_chat(usr, "\red The [name] is empty.") - /obj/item/weapon/gun/grenadelauncher/proc/fire_grenade(atom/target, mob/user) for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] fired a [ammo_name]!", user), 1) to_chat(user, "\red You fire the [name]!") - var/obj/item/weapon/grenade/chem_grenade/F = grenades[1] //Now with less copypasta! grenades -= F F.loc = user.loc @@ -100,19 +94,15 @@ I.loc = src grenades += I to_chat(user, "\blue You put the [ammo_name] in the [name].") - to_chat(user, "\blue [grenades.len] / [max_grenades] [ammo_name]s.") - icon_state = "piecannon1" else to_chat(usr, "\red The grenade launcher cannot hold more [ammo_name]s.") - /obj/item/weapon/gun/grenadelauncher/piecannon/fire_grenade(atom/target, mob/user) for(var/mob/O in viewers(world.view, user)) O.show_message(text("\red [] fired a [ammo_name]!", user), 1) to_chat(user, "\red You fire the [name]!") - var/obj/item/weapon/reagent_containers/food/snacks/pie/P = grenades[1] //Now with less copypasta! grenades -= P P.loc = user.loc diff --git a/code/modules/reagents/newchem/Blob-Reagents.dm b/code/modules/reagents/newchem/Blob-Reagents.dm index 58b5b392609..f4fcdf9a2b1 100644 --- a/code/modules/reagents/newchem/Blob-Reagents.dm +++ b/code/modules/reagents/newchem/Blob-Reagents.dm @@ -151,4 +151,3 @@ totalmessage += message_living totalmessage += "!" to_chat(M, "[totalmessage]") - diff --git a/code/modules/reagents/newchem/chem_heater.dm b/code/modules/reagents/newchem/chem_heater.dm index 52f2fdffd0f..b3c6c6a5e8c 100644 --- a/code/modules/reagents/newchem/chem_heater.dm +++ b/code/modules/reagents/newchem/chem_heater.dm @@ -75,14 +75,12 @@ if(istype(I, /obj/item/weapon/reagent_containers/glass)) if(beaker) to_chat(user, "A beaker is already loaded into the machine.") - return if(user.drop_item()) beaker = I I.forceMove(src) to_chat(user, "You add the beaker to the machine!") - icon_state = "mixer1b" nanomanager.update_uis(src) diff --git a/code/modules/reagents/newchem/disease.dm b/code/modules/reagents/newchem/disease.dm index 07f60778364..18fbc812a28 100644 --- a/code/modules/reagents/newchem/disease.dm +++ b/code/modules/reagents/newchem/disease.dm @@ -65,7 +65,6 @@ holder.del_reagent("spore") //apparently this never metabolizes and stays in forever unless you have 45 units of atrazine in you or some stupid thing like that. if(prob(1)) to_chat(M, "Your mouth tastes funny.") - if(prob(1) && prob(25)) if(iscarbon(M)) var/mob/living/carbon/C = M diff --git a/code/modules/reagents/newchem/drinks.dm b/code/modules/reagents/newchem/drinks.dm index 136ae63936e..323bb24e832 100644 --- a/code/modules/reagents/newchem/drinks.dm +++ b/code/modules/reagents/newchem/drinks.dm @@ -28,7 +28,6 @@ M.say("[sonic_message]") else to_chat(M, "[sonic_message ]") - ..() return @@ -133,7 +132,6 @@ datum/reagent/ethanol/synthanol/reaction_mob(var/mob/M, var/method=TOUCH, var/vo if(method == INGEST) to_chat(M, pick("That was awful!", "Yuck!")) - /datum/reagent/ethanol/synthanol/robottears name = "Robot Tears" id = "robottears" diff --git a/code/modules/reagents/newchem/drugs.dm b/code/modules/reagents/newchem/drugs.dm index 0d06bbd0e34..6d8a7d4117f 100644 --- a/code/modules/reagents/newchem/drugs.dm +++ b/code/modules/reagents/newchem/drugs.dm @@ -18,7 +18,6 @@ var/smoke_message = pick("You feel relaxed.", "You feel calmed.", "You feel less stressed.", "You feel more placid.", "You feel more undivided.") if(prob(5)) to_chat(M, "[smoke_message]") - if(prob(50)) M.AdjustParalysis(-1) M.AdjustStunned(-1) @@ -51,16 +50,13 @@ M.emote(pick("twitch", "twitch_s", "grumble", "laugh")) if(prob(8)) to_chat(M, "You feel great!") - M.reagents.add_reagent("methamphetamine", rand(1,2)) M.emote(pick("laugh", "giggle")) if(prob(6)) to_chat(M, "You feel warm.") - M.bodytemperature += rand(1,10) if(prob(4)) to_chat(M, "You feel kinda awful!") - M.adjustToxLoss(1) M.jitteriness += 30 M.emote(pick("groan", "moan")) @@ -109,12 +105,10 @@ M.emote(pick("smile", "grin", "yawn", "laugh", "drool")) if(prob(10)) to_chat(M, "You feel pretty chill.") - M.bodytemperature-- M.emote("smile") if(prob(5)) to_chat(M, "You feel too chill!") - M.emote(pick("yawn", "drool")) M.Stun(1) M.adjustToxLoss(1) @@ -122,7 +116,6 @@ M.bodytemperature -= 20 if(prob(2)) to_chat(M, "Your skin feels all rough and dry.") - M.adjustBruteLoss(2) ..() return @@ -239,7 +232,6 @@ 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]") - M.AdjustParalysis(-5) M.AdjustStunned(-5) M.AdjustWeakened(-5) @@ -301,10 +293,8 @@ var/high_message = pick("really buff", "on top of the world","like you're made of steel", "energized", "invigorated", "full of energy") if(prob(8)) to_chat(M, "[high_message]!") - if(prob(5)) to_chat(M, "You cannot breathe!") - M.adjustOxyLoss(15) M.Stun(1) M.losebreath++ @@ -326,7 +316,6 @@ M.emote(pick("laugh","giggle","smile")) if(prob(5)) to_chat(M, "[pick("You feel hungry.","Your stomach rumbles.","You feel cold.","You feel warm.")]") - if(prob(4)) M.confused = max(M.confused, 10) if(volume >= 50 && prob(25)) @@ -401,12 +390,10 @@ M.adjustToxLoss(1) if(2) to_chat(M, "[M] can't seem to control their legs!") - M.Weaken(8) M.adjustToxLoss(1) if(3) to_chat(M, "[M]'s hands flip out and flail everywhere!") - M.drop_l_hand() M.drop_r_hand() M.adjustToxLoss(1) @@ -446,7 +433,6 @@ high_message = "0100011101001111010101000101010001000001010001110100111101000110010000010101001101010100!" if(prob(5)) to_chat(M, "[high_message]") - M.AdjustParalysis(-2) M.AdjustStunned(-2) M.AdjustWeakened(-2) @@ -495,7 +481,6 @@ high_message = "01010100010100100100000101001110010100110100001101000101010011100100010001000101010011100100001101000101." if(prob(5)) to_chat(M, "[high_message]") - ..() return @@ -507,7 +492,6 @@ M.apply_effect(STUTTER, 5) if(prob(10)) to_chat(M, "You experience a violent electrical discharge!") - playsound(get_turf(M), 'sound/effects/eleczap.ogg', 75, 1) //Lightning effect for electrical discharge visualization var/icon/I=new('icons/obj/zap.dmi',"lightningend") diff --git a/code/modules/reagents/newchem/food.dm b/code/modules/reagents/newchem/food.dm index c87d6c209ee..ed65daca83a 100644 --- a/code/modules/reagents/newchem/food.dm +++ b/code/modules/reagents/newchem/food.dm @@ -13,7 +13,6 @@ datum/reagent/questionmark/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) M.Weaken(2) to_chat(M, "Ugh! Eating that was a terrible idea!") - datum/reagent/egg name = "Egg" id = "egg" @@ -203,15 +202,12 @@ datum/reagent/fungus/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) var/ranchance = rand(1,10) if(ranchance == 1) to_chat(M, "You feel very sick.") - M.reagents.add_reagent("toxin", rand(1,5)) else if(ranchance <= 5) to_chat(M, "That tasted absolutely FOUL.") - else to_chat(M, "Yuck!") - /datum/reagent/chicken_soup name = "Chicken soup" id = "chicken_soup" @@ -240,14 +236,12 @@ datum/reagent/msg/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) to_chat(M, "That tasted amazing!") - /datum/reagent/msg/on_mob_life(var/mob/living/M as mob) if(prob(5)) if(prob(10)) M.adjustToxLoss(rand(2.4)) if(prob(7)) to_chat(M, "A horrible migraine overpowers you.") - M.Stun(rand(2,5)) ..() return @@ -295,7 +289,6 @@ datum/reagent/cheese/reaction_turf(var/turf/T, var/volume) /datum/reagent/fake_cheese/overdose_process(var/mob/living/M as mob) if(prob(8)) to_chat(M, "You feel something squirming in your stomach. Your thoughts turn to cheese and you begin to sweat.") - M.adjustToxLoss(rand(1,2)) ..() @@ -403,12 +396,10 @@ datum/reagent/ectoplasm/reaction_mob(var/mob/M, var/method=TOUCH, var/volume) var/spooky_eat = pick("Ugh, why did you eat that? Your mouth feels haunted. Haunted with bad flavors.", "Ugh, why did you eat that? It has the texture of ham aspic. From the 1950s. Left out in the sun.", "Ugh, why did you eat that? It tastes like a ghost fart.", "Ugh, why did you eat that? It tastes like flavor died.") to_chat(M, "[spooky_eat]") - /datum/reagent/ectoplasm/on_mob_life(var/mob/living/M as mob) var/spooky_message = pick("You notice something moving out of the corner of your eye, but nothing is there...", "Your eyes twitch, you feel like something you can't see is here...", "You've got the heebie-jeebies.", "You feel uneasy.", "You shudder as if cold...", "You feel something gliding across your back...") if(prob(8)) to_chat(M, "[spooky_message]") - ..() return @@ -457,14 +448,11 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume) /datum/reagent/hydrogenated_soybeanoil/overdose_process(var/mob/living/M as mob) if(prob(33)) to_chat(M, "You feel horribly weak.") - if(prob(10)) to_chat(M, "You cannot breathe!") - M.adjustOxyLoss(5) if(prob(5)) to_chat(M, "You feel a sharp pain in your chest!") - M.adjustOxyLoss(25) M.Stun(5) M.Paralyse(10) @@ -543,7 +531,6 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume) M.reagents.add_reagent(pick("blood", "corn_syrup", "synthflesh", "hydrogenated_soybeanoil", "porktonium", "toxic_slurry"), 0.8) else if(prob(6)) to_chat(M, "[pick("You feel ill.","Your stomach churns.","You feel queasy.","You feel sick.")]") - M.emote(pick("groan","moan")) ..() return @@ -571,25 +558,21 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol if(H.wear_mask) to_chat(H, "The pepperoni bounces off your mask!") - return if(H.head) to_chat(H, "Your mask protects you from the errant pepperoni!") - return if(prob(50)) M.adjustBruteLoss(1) playsound(M, 'sound/effects/woodhit.ogg', 50, 1) to_chat(M, "A slice of pepperoni slaps you!") - else M.emote("burp") to_chat(M, "My goodness, that was tasty!") - /datum/chemical_reaction/pepperoni name = "Pepperoni" id = "pepperoni" @@ -609,16 +592,13 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol /datum/reagent/cholesterol/on_mob_life(var/mob/living/M as mob) if(volume >= 25 && prob(volume*0.15)) to_chat(M, "Your chest feels [pick("weird","uncomfortable","nasty","gross","odd","unusual","warm")]!") - M.adjustToxLoss(rand(1,2)) else if(volume >= 45 && prob(volume*0.08)) to_chat(M, "Your chest [pick("hurts","stings","aches","burns")]!") - M.adjustToxLoss(rand(2,4)) M.Stun(1) else if(volume >= 150 && prob(volume*0.01)) to_chat(M, "Your chest is burning with pain!") - M.Stun(1) M.Weaken(1) if(ishuman(M)) diff --git a/code/modules/reagents/newchem/medicine.dm b/code/modules/reagents/newchem/medicine.dm index f61f5e850b7..c678a891fd8 100644 --- a/code/modules/reagents/newchem/medicine.dm +++ b/code/modules/reagents/newchem/medicine.dm @@ -18,12 +18,10 @@ datum/reagent/silver_sulfadiazine/reaction_mob(var/mob/living/M as mob, var/meth M.adjustFireLoss(-volume) if(show_message) to_chat(M, "The silver sulfadiazine soothes your burns.") - if(method == INGEST) M.adjustToxLoss(0.5*volume) if(show_message) to_chat(M, "You feel sick...") - ..() return @@ -47,13 +45,11 @@ datum/reagent/styptic_powder/reaction_mob(var/mob/living/M as mob, var/method=TO M.adjustBruteLoss(-volume) if(show_message) to_chat(M, "The styptic powder stings like hell as it closes some of your wounds!") - M.emote("scream") if(method == INGEST) M.adjustToxLoss(0.5*volume) if(show_message) to_chat(M, "You feel gross!") - ..() return @@ -94,7 +90,6 @@ datum/reagent/synthflesh/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vo M.adjustFireLoss(-1.5*volume) if(show_message) to_chat(M, "The synthetic flesh integrates itself into your wounds, healing you.") - ..() return @@ -637,9 +632,7 @@ datum/reagent/strange_reagent/reaction_mob(var/mob/living/M as mob, var/method=T var/mob/dead/observer/ghost = M.get_ghost() if(ghost) to_chat(ghost, "Your are attempting to be revived with Strange Reagent. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)") - to_chat(ghost, sound('sound/effects/genetics.ogg')) - M.visible_message("[M] doesn't appear to respond, perhaps try again later?") if(!M.suiciding && !ghost && !(NOCLONE in M.mutations)) M.visible_message("[M] seems to rise from the dead!") diff --git a/code/modules/reagents/newchem/newchem_procs.dm b/code/modules/reagents/newchem/newchem_procs.dm index 83aca86397d..8d10a449a18 100644 --- a/code/modules/reagents/newchem/newchem_procs.dm +++ b/code/modules/reagents/newchem/newchem_procs.dm @@ -78,7 +78,6 @@ R.addiction_act_stage5(M) if(prob(20) && (world.timeofday > (R.last_addiction_dose + ADDICTION_TIME))) //Each addiction lasts 8 minutes before it can end to_chat(M, "You no longer feel reliant on [R.name]!") - addiction_list.Remove(R) update_total() @@ -135,7 +134,6 @@ if(prob(4)) to_chat(M, "You feel a dull headache.") - /datum/reagent/proc/addiction_act_stage3(var/mob/living/M as mob) if(prob(8)) M.emote("twitch_s") @@ -144,33 +142,27 @@ if(prob(4)) to_chat(M, "You begin craving [name]!") - /datum/reagent/proc/addiction_act_stage4(var/mob/living/M as mob) if(prob(8)) M.emote("twitch") if(prob(4)) to_chat(M, "You have the strong urge for some [name]!") - if(prob(4)) to_chat(M, "You REALLY crave some [name]!") - /datum/reagent/proc/addiction_act_stage5(var/mob/living/M as mob) if(prob(8)) M.emote("twitch") if(prob(6)) to_chat(M, "Your stomach lurches painfully!") - M.visible_message("[M] gags and retches!") M.Stun(rand(2,4)) M.Weaken(rand(2,4)) if(prob(5)) to_chat(M, "You feel like you can't live without [name]!") - if(prob(5)) to_chat(M, "You would DIE for some [name] right now!") - /datum/reagent/proc/reagent_deleted() return diff --git a/code/modules/reagents/newchem/other.dm b/code/modules/reagents/newchem/other.dm index 63c45c77776..7cd45d056d3 100644 --- a/code/modules/reagents/newchem/other.dm +++ b/code/modules/reagents/newchem/other.dm @@ -266,7 +266,6 @@ datum/reagent/super_hairgrownium/on_mob_life(var/mob/living/M as mob) var/obj/item/clothing/mask/fakemoustache = new /obj/item/clothing/mask/fakemoustache H.equip_to_slot(fakemoustache, slot_wear_mask) to_chat(H, "Hair bursts forth from your every follicle!") - ..() return @@ -294,7 +293,6 @@ datum/reagent/fartonium/on_mob_life(var/mob/living/M as mob) if(holder.has_reagent("simethicone")) if(prob(25)) to_chat(M, "[pick("Oh god, something doesn't feel right!", "IT HURTS!", "FUCK!", "Something is seriously wrong!", "THE PAIN!", "You feel like you're gonna die!")]") - M.adjustBruteLoss(1) if(prob(10)) M.custom_emote(1,"strains, but nothing happens.") diff --git a/code/modules/reagents/newchem/pyro.dm b/code/modules/reagents/newchem/pyro.dm index 2b8c8e388a0..31623753852 100644 --- a/code/modules/reagents/newchem/pyro.dm +++ b/code/modules/reagents/newchem/pyro.dm @@ -363,7 +363,6 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT))) ear_safety++ to_chat(M, "BANG") - if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) @@ -371,16 +370,13 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) to_chat(M, "Your ears start to ring badly!") - if(prob(M.ear_damage - 10 + 5)) to_chat(M, "You can't hear anything!") - M.disabilities |= DEAF else if (M.ear_damage >= 5) to_chat(M, "Your ears start to ring!") - /datum/chemical_reaction/sonic_powder/on_reaction(var/datum/reagents/holder, var/created_volume) if(holder.has_reagent("stabilizing_agent")) return @@ -396,7 +392,6 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit if((H.r_ear && (H.r_ear.flags & EARBANGPROTECT)) || (H.l_ear && (H.l_ear.flags & EARBANGPROTECT)) || (H.head && (H.head.flags & HEADBANGPROTECT))) ear_safety++ to_chat(C, "BANG") - if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) @@ -404,15 +399,12 @@ datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit M.ear_deaf = max(M.ear_deaf,15) if (M.ear_damage >= 15) to_chat(M, "Your ears start to ring badly!") - if(prob(M.ear_damage - 10 + 5)) to_chat(M, "You can't hear anything!") - M.disabilities |= DEAF else if (M.ear_damage >= 5) to_chat(M, "Your ears start to ring!") - holder.remove_reagent("sonic_powder", created_volume) /datum/reagent/phlogiston diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index b82e4c266ab..b602e282b1f 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -35,7 +35,6 @@ M.reagents.add_reagent("histamine",10) else to_chat(M, "You feel a burning sensation in your throat...") - M.emote("drool") /datum/reagent/histamine/on_mob_life(var/mob/living/M as mob) @@ -44,7 +43,6 @@ M.emote(pick("twitch", "grumble", "sneeze", "cough")) if(prob(10)) to_chat(M, "Your eyes itch.") - M.emote(pick("blink", "sneeze")) M.eye_blurry += 3 if(prob(10)) @@ -53,7 +51,6 @@ M.emote("grumble") if(prob(5)) to_chat(M, "You're getting a rash!") - M.adjustBruteLoss(2) ..() return @@ -61,7 +58,6 @@ /datum/reagent/histamine/overdose_process(var/mob/living/M as mob) if(prob(2)) to_chat(M, "You feel mucus running down the back of your throat.") - M.adjustToxLoss(1) M.jitteriness += 4 M.emote("sneeze", "cough") @@ -72,7 +68,6 @@ M.adjustOxyLoss(5) else if(prob(7)) to_chat(M, "Your chest hurts!") - M.emote(pick("cough","gasp")) M.adjustOxyLoss(3) ..() @@ -202,12 +197,10 @@ M.emote("drool") if(prob(10)) to_chat(M, "You cannot breathe!") - M.losebreath += 1 M.emote("gasp") if(prob(8)) to_chat(M, "You feel horrendously weak!") - M.Stun(2) M.adjustToxLoss(2) ..() @@ -245,7 +238,6 @@ M.emote(pick("twitch", "laugh", "sneeze", "cry")) if(prob(20)) to_chat(M, "Something tickles!") - M.emote(pick("laugh", "giggle")) if(prob(15)) M.visible_message("[M] scratches at an itch.") @@ -254,13 +246,11 @@ M.emote("grumble") if(prob(10)) to_chat(M, "So itchy!") - M.adjustBruteLoss(2) if(prob(6)) M.reagents.add_reagent("histamine", rand(1,3)) if(prob(2)) to_chat(M, "AHHHHHH!") - M.adjustBruteLoss(5) M.Weaken(5) M.jitteriness += 6 @@ -303,7 +293,6 @@ if(volume < 5) to_chat(M, "The blueish acidic substance stings you, but isn't concentrated enough to harm you!") - if(volume >=5 && volume <=10) if(!H.unacidable) M.take_organ_damage(0,max(volume-5,2)*4) @@ -318,10 +307,8 @@ qdel(H.wear_mask) H.update_inv_wear_mask() to_chat(H, "\red Your mask melts away but protects you from the acid!") - else to_chat(H, "\red Your mask protects you from the acid!") - return if(H.head) @@ -329,10 +316,8 @@ qdel(H.head) H.update_inv_head() to_chat(H, "\red Your helmet melts away but protects you from the acid") - else to_chat(H, "\red Your helmet protects you from the acid!") - return if(!H.unacidable) @@ -349,7 +334,6 @@ I.desc = "Looks like this was \an [O] some time ago." for(var/mob/M in viewers(5, O)) to_chat(M, "\red \the [O] melts.") - qdel(O) /datum/chemical_reaction/facid @@ -375,16 +359,13 @@ M.adjustToxLoss(rand(5,25)) if(prob(33)) to_chat(M, "You feel horribly weak.") - M.Stun(2) if(prob(10)) to_chat(M, "You cannot breathe!") - M.adjustOxyLoss(10) M.losebreath++ if(prob(10)) to_chat(M, "Your chest is burning with pain!") - M.adjustOxyLoss(10) M.losebreath++ M.Stun(3) @@ -429,7 +410,6 @@ if(6 to 10) if(prob(8)) to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].") - M.Stun(1) else if(prob(8)) M.emote(pick("drool", "tremble")) @@ -441,10 +421,8 @@ M.losebreath++ if(prob(9)) to_chat(M, "You can't [pick("move", "feel your legs", "feel your face", "feel anything")]!") - if(prob(7)) to_chat(M, "You can't breathe!") - M.losebreath += 3 ..() return @@ -580,11 +558,9 @@ switch(rand(1,3)) if(1) to_chat(M, "You feel hungry...") - if(2) M.adjustToxLoss(1) to_chat(M, "Your stomach grumbles painfully!") - else if(prob(60)) var/fat_to_burn = max(round(M.nutrition/100,1), 5) @@ -629,7 +605,6 @@ M.eye_blurry += 5 if(prob(8)) to_chat(M, "You feel [pick("weak", "horribly weak", "numb", "like you can barely move", "tingly")].") - M.Stun(1) else if(prob(8)) M.emote(pick("drool","pale", "gasp")) @@ -640,7 +615,6 @@ M.emote(pick("drool", "faint", "pale", "gasp", "collapse")) else if(prob(8)) to_chat(M, "You can't [pick("breathe", "move", "feel your legs", "feel your face", "feel anything")]!") - M.losebreath++ ..() return @@ -702,7 +676,6 @@ M.jitteriness = 1000 if(prob(5)) to_chat(M, "You can't breathe!") - M.emote(pick("gasp", "choke", "cough")) M.losebreath++ if(61 to INFINITY) @@ -850,7 +823,6 @@ M.adjustToxLoss(rand(2.4)) if(prob(7)) to_chat(M, "A horrible migraine overpowers you.") - M.Stun(rand(2,5)) if(prob(7)) M.fakevomit(1) @@ -898,7 +870,6 @@ if(iscarbon(M)) if(method == TOUCH || method==INGEST) to_chat(M, "OH SHIT ANTS!!!!") - M.emote("scream") M.adjustBruteLoss(4) diff --git a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm index 0a36f59d428..09776677502 100644 --- a/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm +++ b/code/modules/reagents/oldchem/chemical_reaction/chemical_reaction_slime.dm @@ -221,7 +221,6 @@ to_chat(M, "\blue You feel a chill!") - slimefireproof name = "Slime Fireproof" id = "m_fireproof" diff --git a/code/modules/reagents/oldchem/reagents/_reagent_base.dm b/code/modules/reagents/oldchem/reagents/_reagent_base.dm index 11dc147ace6..9221c42f0c8 100644 --- a/code/modules/reagents/oldchem/reagents/_reagent_base.dm +++ b/code/modules/reagents/oldchem/reagents/_reagent_base.dm @@ -40,13 +40,11 @@ if(can_become_addicted) if(prob(self.addiction_chance) && !is_type_in_list(self, M.reagents.addiction_list)) to_chat(M, "You suddenly feel invigorated and guilty...") - var/datum/reagent/new_reagent = new self.type() new_reagent.last_addiction_dose = world.timeofday M.reagents.addiction_list.Add(new_reagent) else if(is_type_in_list(self, M.reagents.addiction_list)) to_chat(M, "You feel slightly better, but for how long?") - for(var/A in M.reagents.addiction_list) var/datum/reagent/AD = A if(AD && istype(AD, self)) diff --git a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm index 1a24670b2a7..2d85730193f 100644 --- a/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm +++ b/code/modules/reagents/oldchem/reagents/drink/reagents_alcohol.dm @@ -75,16 +75,13 @@ var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() to_chat(usr, "The solution melts away the ink on the paper.") - if(istype(O,/obj/item/weapon/book)) if(volume >= 5) var/obj/item/weapon/book/affectedbook = O affectedbook.dat = null to_chat(usr, "The solution melts away the ink on the book.") - else to_chat(usr, "It wasn't enough...") - return /datum/reagent/ethanol/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with ethanol isn't quite as good as fuel. diff --git a/code/modules/reagents/oldchem/reagents/reagents_food.dm b/code/modules/reagents/oldchem/reagents/reagents_food.dm index b15bb4ab26d..05a3fad7808 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_food.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_food.dm @@ -451,7 +451,6 @@ /datum/reagent/sugar/overdose_start(var/mob/living/M as mob) to_chat(M, "You pass out from hyperglycemic shock!") - M.emote("collapse") ..() diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm index 1a1b1e6ea76..9fc7592d346 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm @@ -65,7 +65,6 @@ /datum/reagent/slimejelly/on_mob_life(var/mob/living/M as mob) if(prob(10)) to_chat(M, "\red Your insides are burning!") - M.adjustToxLoss(rand(20,60)*REM) else if(prob(40)) M.adjustBruteLoss(-5*REM) @@ -85,13 +84,9 @@ var/mob/living/carbon/human/human = M if(human.species.name != "Shadow") to_chat(M, "\red Your flesh rapidly mutates!") - to_chat(M, "You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.") - to_chat(M, "\red Your body reacts violently to light. \green However, it naturally heals in darkness.") - to_chat(M, "Aside from your new traits, you are mentally unchanged and retain your prior obligations.") - human.set_species("Shadow") ..() return @@ -270,12 +265,10 @@ if(H.wear_mask) to_chat(H, "\red Your mask protects you from the acid!") - return if(H.head) to_chat(H, "\red Your helmet protects you from the acid!") - return if(!M.unacidable) @@ -297,7 +290,6 @@ if(volume < 10) to_chat(M, "The greenish acidic substance stings you, but isn't concentrated enough to harm you!") - if(volume >=10 && volume <=25) if(!H.unacidable) M.take_organ_damage(0,min(max(volume-10,2)*2,20)) @@ -322,7 +314,6 @@ I.desc = "Looks like this was \an [O] some time ago." for(var/mob/M in viewers(5, O)) to_chat(M, "\red \the [O] melts.") - qdel(O) @@ -441,11 +432,9 @@ safe_thing = victim.glasses if ( eyes_covered && mouth_covered ) to_chat(victim, "\red Your [safe_thing] protects you from the pepperspray!") - return else if ( mouth_covered ) // Reduced effects if partially protected to_chat(victim, "\red Your [safe_thing] protect you from most of the pepperspray!") - if(prob(5)) victim.emote("scream") victim.eye_blurry = max(M.eye_blurry, 3) @@ -457,7 +446,6 @@ return else if ( eyes_covered ) // Eye cover is better than mouth cover to_chat(victim, "\red Your [safe_thing] protects your eyes from the pepperspray!") - victim.eye_blurry = max(M.eye_blurry, 3) victim.damageoverlaytemp = 30 return @@ -465,7 +453,6 @@ if(prob(5)) victim.emote("scream") to_chat(victim, "\red You're sprayed directly in the eyes with pepperspray!") - victim.eye_blurry = max(M.eye_blurry, 5) victim.eye_blind = max(M.eye_blind, 2) victim.confused = max(M.confused, 6) diff --git a/code/modules/reagents/oldchem/reagents/reagents_water.dm b/code/modules/reagents/oldchem/reagents/reagents_water.dm index 99c4b2f6499..df9e0b29b64 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_water.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_water.dm @@ -256,7 +256,6 @@ if(method == INGEST) to_chat(M, "Oh god, why did you drink that?") - /datum/reagent/fishwater/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom if(prob(30)) // Nasty, you drank this stuff? 30% chance of the fakevomit (non-stunning version) @@ -309,16 +308,13 @@ switch(data) if(1 to 4) to_chat(M, "Something sizzles in your veins!") - M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) if(5 to 12) to_chat(M, "You feel an intense burning inside of you!") - M.adjustFireLoss(1) M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) if(13 to INFINITY) to_chat(M, "You suddenly ignite in a holy fire!") - for(var/mob/O in viewers(M, null)) O.show_message(text("[] suddenly bursts into flames!", M), 1) M.fire_stacks = min(5,M.fire_stacks + 3) @@ -335,15 +331,12 @@ if(method == TOUCH) if(H.wear_mask) to_chat(H, "\red Your mask protects you from the holy water!") - return else if(H.head) to_chat(H, "\red Your helmet protects you from the holy water!") - return else to_chat(M, "Something holy interferes with your powers!") - M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2) diff --git a/code/modules/reagents/pandemic.dm b/code/modules/reagents/pandemic.dm index d532216c8db..bec2b92f049 100644 --- a/code/modules/reagents/pandemic.dm +++ b/code/modules/reagents/pandemic.dm @@ -275,7 +275,6 @@ if(stat & (NOPOWER|BROKEN)) return if(beaker) to_chat(user, "A beaker is already loaded into the machine!") - return if(!user.drop_item()) return @@ -283,7 +282,6 @@ beaker = I beaker.loc = src to_chat(user, "You add the beaker to the machine.") - src.updateUsrDialog() icon_state = "mixer1" diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index 3f86de28f0d..e8df519fe43 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -81,11 +81,9 @@ if(is_open_container()) if(reagents.total_volume >= volume) to_chat(user, "span class='warning'>\The [src] is full.") - return else reagents.add_reagent("water", min(volume - reagents.total_volume, amount_per_transfer_from_this)) to_chat(user, "You fill [src] from [source].") - return ..() \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index fa7915ed167..b92aceb4c79 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -73,16 +73,13 @@ var/datum/reagents/R = reagent_list[mode] if(!R.total_volume) to_chat(user, "The injector is empty.") - return if (!istype(M)) return if (R.total_volume && M.can_inject(user, 1, penetrate_thick = bypass_protection)) to_chat(user, "You inject [M] with the injector.") - to_chat(M, "You feel a tiny prick!") - R.add_reagent(M) if(M.reagents) var/datum/reagent/injected = chemical_reagents_list[reagent_ids[mode]] @@ -95,7 +92,6 @@ var/trans = R.trans_to(M, amount_per_transfer_from_this) to_chat(user, "[trans] units injected. [R.total_volume] units remaining.") - return /obj/item/weapon/reagent_containers/borghypo/attack_self(mob/user as mob) @@ -107,7 +103,6 @@ charge_tick = 0 //Prevents wasted chems/cell charge if you're cycling through modes. var/datum/reagent/R = chemical_reagents_list[reagent_ids[mode]] to_chat(user, "Synthesizer is now producing '[R.name]'.") - return /obj/item/weapon/reagent_containers/borghypo/examine(mob/user) @@ -120,9 +115,7 @@ var/datum/reagent/R = locate() in RS.reagent_list if(R) to_chat(user, "It currently has [R.volume] units of [R.name] stored.") - empty = 0 if(empty) to_chat(user, "It is currently empty. Allow some time for the internal syntheszier to produce more.") - diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index f91d6cfe619..2fedf8dd27f 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -18,12 +18,10 @@ if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red [target] is full.") - return if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/clothing/mask/cigarette)) //You can inject humans and food but you cant remove the shit. to_chat(user, "\red You cannot directly fill this object.") - return var/trans = 0 @@ -56,7 +54,6 @@ to_chat(user, "\blue You transfer [trans] units of the solution.") - if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -96,7 +93,6 @@ trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You transfer [trans] units of the solution.") - if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -105,19 +101,16 @@ if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) to_chat(user, "\red You cannot directly remove reagents from [target].") - return if(!target.reagents.total_volume) to_chat(user, "\red [target] is empty.") - return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) to_chat(user, "\blue You fill the [src] with [trans] units of the solution.") - filled = 1 icon_state = "[initial(icon_state)][filled]" diff --git a/code/modules/reagents/reagent_containers/drugs.dm b/code/modules/reagents/reagent_containers/drugs.dm index c7afd1b5f90..db162b6f7cc 100644 --- a/code/modules/reagents/reagent_containers/drugs.dm +++ b/code/modules/reagents/reagent_containers/drugs.dm @@ -25,33 +25,27 @@ if(!target.reagents.total_volume && target.reagents) to_chat(user, "\red [target] is empty.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\red [src] is full.") - return for(var/datum/reagent/A in target.reagents.reagent_list) if(A.reagent_state != 1) to_chat(user, "\red You can only put powders in [src].") - return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) to_chat(user, "\blue You fill [src] with [trans] units of the contents of [target].") - else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) to_chat(user, "\red [src] is empty.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red [target] is full.") - return // /vg/: Logging transfers of bad things @@ -68,7 +62,6 @@ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You transfer [trans] units of the solution to [target].") - //Safety for dumping stuff into a ninja suit. It handles everything through attackby() and this is unnecessary. /*else if(istype(target, /obj/machinery/bunsen_burner)) @@ -83,10 +76,8 @@ var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text)) if(length(tmp_label) > 10) to_chat(user, "\red The label can be at most 10 characters long.") - else to_chat(user, "\blue You set the label to \"[tmp_label]\".") - src.label_text = tmp_label src.update_name_label() diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index b0544abd4a0..9aaf72b6f8c 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -9,7 +9,6 @@ if (canopened == 0) playsound(src.loc,'sound/effects/canopen.ogg', rand(10,50), 1) to_chat(user, "You open the drink with an audible pop!") - canopened = 1 flags |= OPENCONTAINER else @@ -18,7 +17,6 @@ attack(mob/M as mob, mob/user as mob, def_zone) if (canopened == 0) to_chat(user, "You need to open the drink!") - return return ..(M, user, def_zone) @@ -27,11 +25,9 @@ if(!proximity) return if(istype(target, /obj/structure/reagent_dispensers) && (canopened == 0)) to_chat(user, "You need to open the drink!") - return else if(target.is_open_container() && (canopened == 0)) to_chat(user, "You need to open the drink!") - return else return ..(target, user, proximity) @@ -41,21 +37,16 @@ return if(!reagents || reagents.total_volume==0) to_chat(user, "\blue \The [src] is empty!") - else if (reagents.total_volume<=src.volume/4) to_chat(user, "\blue \The [src] is almost empty!") - else if (reagents.total_volume<=src.volume*0.66) to_chat(user, "\blue \The [src] is half full!") - else if (reagents.total_volume<=src.volume*0.90) to_chat(user, "\blue \The [src] is almost full!") - else to_chat(user, "\blue \The [src] is full!")*/ - //DRINKS /obj/item/weapon/reagent_containers/food/drinks/cans/cola diff --git a/code/modules/reagents/reagent_containers/food/condiment.dm b/code/modules/reagents/reagent_containers/food/condiment.dm index 5dee4c1c9d2..e1fb06f1be7 100644 --- a/code/modules/reagents/reagent_containers/food/condiment.dm +++ b/code/modules/reagents/reagent_containers/food/condiment.dm @@ -40,12 +40,10 @@ if(!R || !R.total_volume) to_chat(user, "\red None of [src] left, oh no!") - return 0 if(M == user) to_chat(M, "\blue You swallow some of contents of the [src].") - if(reagents.total_volume) reagents.reaction(M, INGEST) spawn(0) @@ -88,32 +86,26 @@ if(!target.reagents.total_volume) to_chat(user, "\red [target] is empty.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\red [src] is full.") - return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) to_chat(user, "\blue 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_open_container() || istype(target, /obj/item/weapon/reagent_containers/food/snacks)) if(!reagents.total_volume) to_chat(user, "\red [src] is empty.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red you can't add anymore to [target].") - return var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You transfer [trans] units of the condiment to [target].") - /obj/item/weapon/reagent_containers/food/condiment/on_reagent_change() if(!possible_states.len) return @@ -239,18 +231,15 @@ if(istype(target, /obj/item/weapon/reagent_containers/food/snacks)) if(!reagents.total_volume) to_chat(user, "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!")//Not sure if food can ever be full, but better safe than sorry. - qdel(src) return else to_chat(user, "You tear open [src] above [target] and the condiments drip onto it.") - src.reagents.trans_to(target, amount_per_transfer_from_this) qdel(src) diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 492ddd60223..d6a5d37012a 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -23,7 +23,6 @@ /obj/item/weapon/reagent_containers/food/drinks/attack(mob/M as mob, mob/user as mob, def_zone) if(!reagents || !reagents.total_volume) to_chat(user, " None of [src] left, oh no!") - return 0 if(istype(M, /mob/living/carbon)) @@ -47,34 +46,28 @@ var/obj/item/weapon/reagent_containers/food/drinks/cans/cantarget = target if(cantarget.canopened == 0) to_chat(user, "You need to open the drink you want to pour into!") - return 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.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, " [src] is full.") - return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) to_chat(user, " You fill [src] with [trans] units of the contents of [target].") - else if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) to_chat(user, " [src] is empty.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, " [target] is full.") - return @@ -88,7 +81,6 @@ var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, " You transfer [trans] units of the solution to [target].") - if(isrobot(user)) //Cyborg modules that include drinks automatically refill themselves, but drain the borg's cell if(refill in drinks) // Only synthesize drinks var/mob/living/silicon/robot/bro = user @@ -97,12 +89,10 @@ to_chat(user, "Now synthesizing [trans] units of [refillName]...") - spawn(300) reagents.add_reagent(refill, trans) to_chat(user, "Cyborg [src] refilled.") - return /obj/item/weapon/reagent_containers/food/drinks/attackby(var/obj/item/I, mob/user as mob, params) @@ -112,7 +102,6 @@ if(src.reagents) src.reagents.chem_temp += 15 to_chat(user, "You heat [src] with [I].") - src.reagents.handle_reactions() /obj/item/weapon/reagent_containers/food/drinks/examine(mob/user) @@ -120,21 +109,16 @@ return if(!reagents || reagents.total_volume==0) to_chat(user, " \The [src] is empty!") - else if (reagents.total_volume<=src.volume/4) to_chat(user, " \The [src] is almost empty!") - else if (reagents.total_volume<=src.volume*0.66) to_chat(user, " \The [src] is half full!")// We're all optimistic, right?! - else if (reagents.total_volume<=src.volume*0.90) to_chat(user, " \The [src] is almost full!") - else to_chat(user, " \The [src] is full!") - //////////////////////////////////////////////////////////////////////////////// /// Drinks. END //////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 07bc96abbf1..75919c4314f 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -26,18 +26,15 @@ if(src.contents.len > sandwich_limit) to_chat(user, "\red If you put anything else on \the [src] it's going to collapse.") - return else if(istype(W,/obj/item/weapon/shard)) to_chat(user, "\blue You hide [W] in \the [src].") - user.drop_item() W.loc = src update() return else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) to_chat(user, "\blue You layer [W] over \the [src].") - var/obj/item/weapon/reagent_containers/F = W F.reagents.trans_to(src, F.reagents.total_volume) user.drop_item() @@ -88,7 +85,6 @@ var/obj/item/O = pick(contents) to_chat(user, "\blue You think you can see [O.name] in there.") - /obj/item/weapon/reagent_containers/food/snacks/csandwich/attack(mob/M as mob, mob/user as mob, def_zone) var/obj/item/shard @@ -103,7 +99,6 @@ if(H && shard && M == user) //This needs a check for feeding the food to other people, but that could be abusable. to_chat(H, "\red You lacerate your mouth on a [shard.name] in the sandwich!") - H.adjustBruteLoss(5) //TODO: Target head if human. ..() */ \ No newline at end of file diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 705e3ab625d..d2754ba5972 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -22,7 +22,6 @@ if(!reagents.total_volume) if(M == usr) to_chat(usr, "You finish eating \the [src].") - usr.visible_message("[usr] finishes eating \the [src].") usr.unEquip(src) //so icons update :[ @@ -41,7 +40,6 @@ /obj/item/weapon/reagent_containers/food/snacks/attack(mob/M as mob, mob/user as mob, def_zone) if(reagents && !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!") - M.unEquip(src) //so icons update :[ qdel(src) return 0 @@ -63,15 +61,12 @@ return else if (bitecount==1) to_chat(user, "\blue \The [src] was bitten by someone!") - else if (bitecount<=3) to_chat(user, "\blue \The [src] was bitten [bitecount] times!") - else to_chat(user, "\blue \The [src] was bitten multiple times!") - /obj/item/weapon/reagent_containers/food/snacks/attackby(obj/item/weapon/W, mob/user, params) if(istype(W,/obj/item/weapon/pen)) var/n_name = sanitize(copytext(input(usr, "What would you like to name this dish?", "Food Renaming", null) as text, 1, MAX_NAME_LEN)) @@ -87,7 +82,6 @@ if(U.contents.len >= U.max_contents) to_chat(user, "You cannot fit anything else on your [U].") - return user.visible_message( \ @@ -139,7 +133,6 @@ if(!iscarbon(user)) return 1 to_chat(user, "\red You slip [W] inside [src].") - user.unEquip(W) if ((user.client && user.s_active != src)) user.client.screen -= W @@ -156,7 +149,6 @@ !(locate(/obj/item/weapon/storage/bag/tray) in src.loc) \ ) to_chat(user, "\red You cannot slice [src] here! You need a table or at least a tray to do it.") - return 1 var/slices_lost = 0 if (!inaccurate) @@ -202,7 +194,6 @@ else if(ismouse(M)) var/mob/living/simple_animal/mouse/N = M to_chat(N, text("\blue You nibble away at [src].")) - if(prob(50)) N.visible_message("[N] nibbles away at [src].", "") //N.emote("nibbles away at the [src]") @@ -519,11 +510,9 @@ if(!(clr in list("blue","green","mime","orange","purple","rainbow","red","yellow"))) to_chat(usr, "\blue The egg refuses to take on this color!") - return to_chat(usr, "\blue You color \the [src] [clr]") - icon_state = "egg-[clr]" item_color = clr else @@ -1153,7 +1142,6 @@ On_Consume() if(prob(unpopped)) //lol ...what's the point? to_chat(usr, "\red You bite down on an un-popped kernel!") - unpopped = max(0, unpopped-1) ..() @@ -1615,7 +1603,6 @@ if(!proximity) return if(istype(O,/obj/structure/sink) && !wrapped) to_chat(user, "You place [src] under a stream of water...") - user.drop_item() forceMove(get_turf(O)) return Expand() @@ -1623,7 +1610,6 @@ var/obj/machinery/computer/camera_advanced/xenobio/X = O X.monkeys++ to_chat(user, "You feed [src] to the [X]. It now has [X.monkeys] monkey cubes stored.") - qdel(src) return ..() @@ -1653,7 +1639,6 @@ icon_state = "monkeycube" desc = "Just add water!" to_chat(user, "You unwrap the cube.") - wrapped = 0 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped @@ -2843,7 +2828,6 @@ user.put_in_hands( pizza ) to_chat(user, "\red You take the [src.pizza] out of the [src].") - src.pizza = null update_icon() return @@ -2858,7 +2842,6 @@ user.put_in_hands( box ) to_chat(user, "\red You remove the topmost [src] from your hand.") - box.update_icon() update_icon() return @@ -2898,14 +2881,11 @@ update_icon() to_chat(user, "\red You put the [box] ontop of the [src]!") - else to_chat(user, "\red The stack is too high!") - else to_chat(user, "\red Close the [box] first!") - return if( istype(I, /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/) ) // Long ass fucking object name @@ -2918,10 +2898,8 @@ update_icon() to_chat(user, "\red You put the [I] in the [src]!") - else to_chat(user, "\red You try to push the [I] through the lid but it doesn't work!") - return if( istype(I, /obj/item/weapon/pen/) ) @@ -3225,11 +3203,9 @@ if(isturf(loc)) new /obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough(loc) to_chat(user, "You flatten [src].") - qdel(src) else to_chat(user, "You need to put [src] on a surface to roll it out!") - else ..() diff --git a/code/modules/reagents/reagent_containers/food/snacks/meat.dm b/code/modules/reagents/reagent_containers/food/snacks/meat.dm index 1b65d110cb3..dc9999a7f4c 100644 --- a/code/modules/reagents/reagent_containers/food/snacks/meat.dm +++ b/code/modules/reagents/reagent_containers/food/snacks/meat.dm @@ -18,7 +18,6 @@ new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) new /obj/item/weapon/reagent_containers/food/snacks/rawcutlet(src) to_chat(user, "You cut the meat in thin strips.") - qdel(src) else ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index aa291bee0d0..190b02c60d7 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -52,16 +52,13 @@ if (!is_open_container()) to_chat(user, "Airtight lid seals it completely.") - /obj/item/weapon/reagent_containers/glass/attack_self() ..() if (is_open_container()) to_chat(usr, "You put the lid on \the [src].") - flags ^= OPENCONTAINER else to_chat(usr, "You take the lid off \the [src].") - flags |= OPENCONTAINER update_icon() @@ -77,7 +74,6 @@ if(ismob(target) && target.reagents && reagents.total_volume) to_chat(user, "You splash the solution onto [target].") - var/mob/living/M = target var/list/injected = list() for(var/datum/reagent/R in reagents.reagent_list) @@ -101,27 +97,22 @@ if(!target.reagents.total_volume && target.reagents) to_chat(user, "[target] is empty.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "[src] is full.") - return var/trans = target.reagents.trans_to(src, target:amount_per_transfer_from_this) to_chat(user, "You fill [src] with [trans] units of the contents of [target].") - else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) to_chat(user, "[src] is empty.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "[target] is full.") - return // /vg/: Logging transfers of bad things @@ -138,10 +129,8 @@ var/trans = reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "You transfer [trans] units of the solution to [target].") - else if(istype(target, /obj/item/weapon/reagent_containers/glass) && !target.is_open_container()) to_chat(user, "You cannot fill [target] while it is sealed.") - return /*else if(istype(target, /obj/machinery/bunsen_burner)) @@ -155,7 +144,6 @@ else if(reagents.total_volume) to_chat(user, "You splash the solution onto [target].") - reagents.reaction(target, TOUCH) spawn(5) reagents.clear_reagents() return @@ -168,16 +156,13 @@ if(reagents) reagents.chem_temp += 15 to_chat(user, "You heat [src] with [I].") - reagents.handle_reactions() if(istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/device/flashlight/pen)) var/tmp_label = sanitize(input(user, "Enter a label for [name]","Label",label_text)) if(length(tmp_label) > MAX_NAME_LEN) to_chat(user, "The label can be at most [MAX_NAME_LEN] characters long.") - else to_chat(user, "You set the label to \"[tmp_label]\".") - label_text = tmp_label update_name_label() if(istype(I,/obj/item/weapon/storage/bag)) @@ -246,14 +231,12 @@ return if (assembly) to_chat(usr, "You detach [assembly] from \the [src]") - usr.put_in_hands(assembly) assembly = null update_icon() else to_chat(usr, "There is no assembly to remove.") - /obj/item/weapon/reagent_containers/glass/beaker/proc/heat_beaker() if(reagents) reagents.chem_temp += 30 @@ -263,7 +246,6 @@ if (istype(W,/obj/item/device/assembly_holder)) if (assembly) to_chat(usr, "The [src] already has an assembly.") - return ..() assembly = W user.drop_item() @@ -362,7 +344,6 @@ /obj/item/weapon/reagent_containers/glass/bucket/attackby(var/obj/D, mob/user as mob, params) if(isprox(D)) to_chat(user, "You add [D] to [src].") - qdel(D) user.put_in_hands(new /obj/item/weapon/bucket_sensor) user.unEquip(src) diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 268004299c0..22466811e3e 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -18,16 +18,13 @@ /obj/item/weapon/reagent_containers/hypospray/attack(mob/living/M, mob/user) if(!reagents.total_volume) to_chat(user, "\red [src] is empty.") - return if(!istype(M)) return if(reagents.total_volume && (ignore_flags || M.can_inject(user, 1))) to_chat(user, "\blue You inject [M] with [src].") - to_chat(M, "\red You feel a tiny prick!") - src.reagents.add_reagent(M) if(M.reagents) var/list/injected = list() @@ -46,7 +43,6 @@ var/trans = reagents.trans_to(M, amount_per_transfer_from_this) to_chat(user, "\blue [trans] units injected. [reagents.total_volume] units remaining in [src].") - return /obj/item/weapon/reagent_containers/hypospray/CMO/New() @@ -107,11 +103,9 @@ ..(user) if(reagents && reagents.reagent_list.len) to_chat(user, "\blue It is currently loaded.") - else to_chat(user, "\blue It is spent.") - /obj/item/weapon/reagent_containers/hypospray/autoinjector/teporone //basilisks name = "teporone autoinjector" desc = "A rapid way to regulate your body's temperature in the event of a hardsuit malfunction at the cost of some shortness of breath." diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index c4920fb395b..4af5ab79bc7 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -34,7 +34,6 @@ if(target.is_open_container() != 0 && target.reagents) if(!target.reagents.total_volume) to_chat(user, "[target] is empty. Cant dissolve [src].") - return // /vg/: Logging transfers of bad things @@ -49,7 +48,6 @@ log_game("[user.name] ([user.ckey]) added [reagents.get_reagent_ids(1)] to \a [target] with [src].") to_chat(user, "You dissolve [src] in [target].") - reagents.trans_to(target, reagents.total_volume) for(var/mob/O in viewers(2, user)) O.show_message("[user] puts something in [target].", 1) diff --git a/code/modules/reagents/reagent_containers/robodropper.dm b/code/modules/reagents/reagent_containers/robodropper.dm index c039a747255..b035b2aea12 100644 --- a/code/modules/reagents/reagent_containers/robodropper.dm +++ b/code/modules/reagents/reagent_containers/robodropper.dm @@ -16,12 +16,10 @@ if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red [target] is full.") - return if(!target.is_open_container() && !ismob(target) && !istype(target,/obj/item/weapon/reagent_containers/food)) //You can inject humans and food but you cant remove the shit. to_chat(user, "\red You cannot directly fill this object.") - return @@ -65,7 +63,6 @@ to_chat(user, "\blue You transfer [trans] units of the solution.") - if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -92,7 +89,6 @@ trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You transfer [trans] units of the solution.") - if (src.reagents.total_volume<=0) filled = 0 icon_state = "[initial(icon_state)]" @@ -101,19 +97,16 @@ if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) to_chat(user, "\red You cannot directly remove reagents from [target].") - return if(!target.reagents.total_volume) to_chat(user, "\red [target] is empty.") - return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) to_chat(user, "\blue You fill the dropper with [trans] units of the solution.") - filled = 1 icon_state = "[initial(icon_state)][filled]" diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index b1c9f631e26..32a0e752913 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -28,22 +28,18 @@ if(istype(A, /obj/structure/reagent_dispensers) && get_dist(src,A) <= 1) //this block copypasted from reagent_containers/glass, for lack of a better solution if(!A.reagents.total_volume && A.reagents) to_chat(user, "\The [A] is empty.") - return if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\The [src] is full.") - return var/trans = A.reagents.trans_to(src, A:amount_per_transfer_from_this) to_chat(user, "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, "\The [src] is empty!") - return spray(A) @@ -85,12 +81,10 @@ spray_currentrange = (spray_currentrange == 1 ? spray_maxrange : 1) 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.") - /obj/item/weapon/reagent_containers/spray/examine(mob/user) if(..(user, 0) && user==src.loc) to_chat(user, "[round(src.reagents.total_volume)] units left.") - /obj/item/weapon/reagent_containers/spray/verb/empty() set name = "Empty Spray Bottle" @@ -102,7 +96,6 @@ return if(isturf(usr.loc) && src.loc == usr) to_chat(usr, "You empty \the [src] onto the floor.") - reagents.reaction(usr.loc) src.reagents.clear_reagents() @@ -217,7 +210,6 @@ to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.") - // Plant-B-Gone /obj/item/weapon/reagent_containers/spray/plantbgone // -- Skie name = "Plant-B-Gone" diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index fffd08b3352..5c7e6d0ca4c 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -63,7 +63,6 @@ if(mode == SYRINGE_BROKEN) to_chat(user, "\red This syringe is broken!") - return /* if (user.a_intent == I_HARM && ismob(target)) @@ -78,27 +77,22 @@ if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\red The syringe is full.") - return if(ismob(target))//Blood! if(istype(target, /mob/living/carbon/slime)) to_chat(user, "\red You are unable to locate any blood.") - return if(src.reagents.has_reagent("blood")) to_chat(user, "\red There is already a blood sample in this syringe") - return if(istype(target, /mob/living/carbon))//maybe just add a blood reagent to all mobs. Then you can suck them dry...With hundreds of syringes. Jolly good idea. var/mob/living/carbon/T = target if(!T.dna) to_chat(usr, "You are unable to locate any blood. (To be specific, your target seems to be missing their DNA datum)") - return if(NOCLONE in T.mutations) //target done been et, no more blood in him to_chat(user, "\red You are unable to locate any blood.") - return @@ -107,7 +101,6 @@ var/mob/living/carbon/human/H = T if(H.species.flags & NO_BLOOD) to_chat(usr, "You are unable to locate any blood.") - return if(H.wear_suit && istype(H.wear_suit,/obj/item/clothing/suit/space)) time = 60 @@ -122,7 +115,6 @@ var/amount = src.reagents.maximum_volume - src.reagents.total_volume if(amount == 0) to_chat(usr, "The syringe is full!") - return var/datum/reagent/B @@ -142,7 +134,6 @@ src.reagents.handle_reactions() to_chat(user, "\blue You take a blood sample from [target]") - for(var/mob/O in viewers(4, user)) O.show_message("\red [user] takes a blood sample from [target].", 1) else @@ -151,18 +142,15 @@ else //if not mob if(!target.reagents.total_volume) to_chat(user, "\red [target] is empty.") - return if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers) && !istype(target,/obj/item/slime_extract)) to_chat(user, "\red You cannot directly remove reagents from this object.") - return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? to_chat(user, "\blue You fill the syringe with [trans] units of the solution.") - if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() @@ -170,24 +158,20 @@ if(SYRINGE_INJECT) if(!reagents.total_volume) to_chat(user, "\red The Syringe is empty.") - return if(istype(target, /obj/item/weapon/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food) && !istype(target, /obj/item/slime_extract) && !istype(target, /obj/item/clothing/mask/cigarette) && !istype(target, /obj/item/weapon/storage/fancy/cigarettes)) to_chat(user, "\red You cannot directly fill this object.") - return if(istype(target, /obj/item/clothing/mask/cigarette)) var/obj/item/clothing/mask/cigarette/C = target if(istype(C.loc, /obj/item/weapon/storage/fancy/cigarettes)) to_chat(user, "\red You cannot inject a cigarette while it's still in the pack.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red [target] is full.") - return var/mob/living/carbon/human/H = target @@ -195,11 +179,9 @@ var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting) if(!affected) to_chat(user, "\The [H] is missing that limb!") - return /* else if(affected.status & ORGAN_ROBOT) to_chat(user, "You cannot inject a robotic limb.") - return */ if(ismob(target) && target != user) @@ -275,7 +257,6 @@ else trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.") - if (reagents.total_volume <= 0 && mode==SYRINGE_INJECT) mode = SYRINGE_DRAW update_icon() @@ -327,7 +308,6 @@ if (!affecting || (affecting.status & ORGAN_DESTROYED) || affecting.is_stump()) to_chat(user, "They are missing that limb!") - return var/hit_area = affecting.name @@ -406,29 +386,24 @@ if(reagents.total_volume >= reagents.maximum_volume) to_chat(user, "\red The syringe is full.") - return if(ismob(target)) if(istype(target, /mob/living/carbon))//I Do not want it to suck 50 units out of people to_chat(usr, "This needle isn't designed for drawing blood.") - return else //if not mob if(!target.reagents.total_volume) to_chat(user, "\red [target] is empty.") - return if(!target.is_open_container() && !istype(target,/obj/structure/reagent_dispensers)) to_chat(user, "\red You cannot directly remove reagents from this object.") - return var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) // transfer from, transfer to - who cares? to_chat(user, "\blue You fill the syringe with [trans] units of the solution.") - if (reagents.total_volume >= reagents.maximum_volume) mode=!mode update_icon() @@ -436,17 +411,14 @@ if(SYRINGE_INJECT) if(!reagents.total_volume) to_chat(user, "\red The Syringe is empty.") - return if(istype(target, /obj/item/weapon/implantcase/chem)) return if(!target.is_open_container() && !ismob(target) && !istype(target, /obj/item/weapon/reagent_containers/food)) to_chat(user, "\red You cannot directly fill this object.") - return if(target.reagents.total_volume >= target.reagents.maximum_volume) to_chat(user, "\red [target] is full.") - return if(ismob(target) && target != user) @@ -461,7 +433,6 @@ spawn(5) var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) to_chat(user, "\blue You inject [trans] units of the solution. The syringe now contains [src.reagents.total_volume] units.") - if (reagents.total_volume >= reagents.maximum_volume && 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 04857089fb9..23f09e6c95b 100644 --- a/code/modules/reagents/reagent_dispenser.dm +++ b/code/modules/reagents/reagent_dispenser.dm @@ -27,15 +27,12 @@ if(!..(user, 2)) return to_chat(user, "\blue It contains:") - if(reagents && reagents.reagent_list.len) for(var/datum/reagent/R in reagents.reagent_list) to_chat(user, "\blue [R.volume] units of [R.name]") - else to_chat(user, "\blue Nothing.") - /obj/structure/reagent_dispensers/verb/set_APTFT() //set amount_per_transfer_from_this set name = "Set transfer amount" set category = "Object" @@ -120,7 +117,6 @@ if(rig) to_chat(usr, "There is some kind of device rigged to the tank.") - /obj/structure/reagent_dispensers/fueltank/attack_hand() if (rig) usr.visible_message("[usr] begins to detach [rig] from \the [src].", "You begin to detach [rig] from \the [src]") @@ -134,7 +130,6 @@ if (istype(W,/obj/item/device/assembly_holder) && accepts_rig) if (rig) to_chat(user, "\red There is another device in the way.") - return ..() user.visible_message("[user] begins rigging [W] to \the [src].", "You begin rigging [W] to \the [src]") if(do_after(user, 20, target = src)) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 59bda4fe8c3..b093048d5e5 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -223,7 +223,6 @@ /obj/machinery/conveyor_switch/attack_hand(mob/user) if(!allowed(user)) to_chat(user, "Access denied.") - return diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index 5c961aefb89..948973bc3bc 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -91,7 +91,6 @@ if(anchored) to_chat(usr, "You must unfasten the pipe before rotating it.") - return dir = turn(dir, -90) @@ -105,7 +104,6 @@ if(anchored) to_chat(usr, "You must unfasten the pipe before flipping it.") - return dir = turn(dir, 180) @@ -167,7 +165,6 @@ var/turf/T = src.loc if(T.intact) to_chat(user, "You can only attach the [nicetype] if the floor plating is removed.") - return var/obj/structure/disposalpipe/CP = locate() in T @@ -175,11 +172,9 @@ if(CP) // There's something there if(!istype(CP,/obj/structure/disposalpipe/trunk)) to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.") - return else // Nothing under, fuck. to_chat(user, "The [nicetype] requires a trunk underneath it in order to work.") - return else if(CP) @@ -189,7 +184,6 @@ pdir = CP.dir if(pdir & dpdir) to_chat(user, "There is already a [nicetype] at that location.") - return @@ -202,7 +196,6 @@ else density = 1 to_chat(user, "You detach the [nicetype] from the underfloor.") - else anchored = 1 if(ispipe) @@ -211,7 +204,6 @@ else density = 1 // We don't want disposal bins or outlets to go density 0 to_chat(user, "You attach the [nicetype] to the underfloor.") - playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1) update() @@ -221,11 +213,9 @@ if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) to_chat(user, "Welding the [nicetype] in place.") - if(do_after(user, 20, target = src)) if(!src || !W.isOn()) return to_chat(user, "The [nicetype] has been welded in place!") - update() // TODO: Make this neat if(ispipe) // Pipe @@ -265,9 +255,7 @@ return else to_chat(user, "You need more welding fuel to complete this task.") - return else to_chat(user, "You need to attach it to the plating first!") - return diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 0f549f7b39b..4301d393391 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -70,35 +70,29 @@ if(istype(I, /obj/item/weapon/screwdriver)) if(contents.len > 0) to_chat(user, "Eject the items first!") - return if(mode==0) // It's off but still not unscrewed mode=-1 // Set it to doubleoff l0l playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You remove the screws around the power connection.") - return else if(mode==-1) mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You attach the screws around the power connection.") - return else if(istype(I,/obj/item/weapon/weldingtool) && mode==-1) if(contents.len > 0) to_chat(user, "Eject the items first!") - return var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) to_chat(user, "You start slicing the floorweld off the disposal unit.") - if(do_after(user,20, target = src)) if(!src || !W.isOn()) return to_chat(user, "You sliced the floorweld off the disposal unit.") - var/obj/structure/disposalconstruct/C = new (src.loc) src.transfer_fingerprints_to(C) C.ptype = 6 // 6 = disposal unit @@ -109,12 +103,10 @@ return else to_chat(user, "You need more welding fuel to complete this task.") - return if(istype(I, /obj/item/weapon/melee/energy/blade)) to_chat(user, "You can't place that item inside the disposal unit.") - return if(istype(I, /obj/item/weapon/storage)) @@ -155,7 +147,6 @@ I.loc = src to_chat(user, "You place \the [I] into the [src].") - for(var/mob/M in viewers(src)) if(M == user) continue @@ -186,12 +177,10 @@ // must be awake, not stunned or whatever msg = "[user.name] climbs into the [src]." to_chat(user, "You climb into the [src].") - else if(target != user && !user.restrained() && !user.stat && !user.weakened && !user.stunned && !user.paralysis) msg = "[user.name] stuffs [target.name] into the [src]!" to_chat(user, "You stuff [target.name] into the [src]!") - user.attack_log += text("\[[time_stamp()]\] Has placed [key_name(target)] in disposals.") target.attack_log += text("\[[time_stamp()]\] Has been placed in disposals by [key_name(user)]") if(target.ckey) @@ -251,7 +240,6 @@ if(user && user.loc == src) to_chat(usr, "\red You cannot reach the controls from inside.") - return // Clumsy folks can only flush it. @@ -292,12 +280,10 @@ /obj/machinery/disposal/Topic(href, href_list) if(usr.loc == src) to_chat(usr, "\red You cannot reach the controls from inside.") - return if(mode==-1 && !href_list["eject"]) // only allow ejecting if mode is -1 to_chat(usr, "\red The disposal units power is disabled.") - return if(..()) @@ -652,7 +638,6 @@ for (var/mob/M in hearers(src.loc.loc)) to_chat(M, "CLONG, clong!") - playsound(src.loc, 'sound/effects/clang.ogg', 50, 0, 0) // called to vent all gas in holder to a location @@ -900,17 +885,14 @@ var/turf/uloc = user.loc var/atom/wloc = W.loc to_chat(user, "Slicing the disposal pipe.") - sleep(30) if(!W.isOn()) return if(user.loc == uloc && wloc == W.loc) welded() else to_chat(user, "You must stay still while welding the pipe.") - else to_chat(user, "You need more welding fuel to cut the pipe.") - return // called when pipe is cut with welder @@ -1051,7 +1033,6 @@ playsound(src.loc, 'sound/machines/twobeep.ogg', 100, 1) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) to_chat(user, "\blue Changed filter to [tag]") - updatedesc() @@ -1220,17 +1201,14 @@ var/turf/uloc = user.loc var/atom/wloc = W.loc to_chat(user, "Slicing the disposal pipe.") - sleep(30) if(!W.isOn()) return if(user.loc == uloc && wloc == W.loc) welded() else to_chat(user, "You must stay still while welding the pipe.") - else to_chat(user, "You need more welding fuel to cut the pipe.") - return // would transfer to next pipe segment, but we are in a trunk @@ -1338,24 +1316,20 @@ mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You remove the screws around the power connection.") - return else if(mode==1) mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You attach the screws around the power connection.") - return else if(istype(I,/obj/item/weapon/weldingtool) && mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) to_chat(user, "You start slicing the floorweld off the disposal outlet.") - if(do_after(user,20, target = src)) if(!src || !W.isOn()) return to_chat(user, "You sliced the floorweld off the disposal outlet.") - var/obj/structure/disposalconstruct/C = new (src.loc) src.transfer_fingerprints_to(C) C.ptype = 7 // 7 = outlet @@ -1366,7 +1340,6 @@ return else to_chat(user, "You need more welding fuel to complete this task.") - return diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index b872867ad07..f10a50be115 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -32,7 +32,6 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) to_chat(user, "*[tag]*") - sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) @@ -40,7 +39,6 @@ var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) to_chat(user, "Invalid text.") - return user.visible_message("[user] labels [src] as [str].") name = "[name] ([str])" @@ -60,7 +58,6 @@ to_chat(user, "You need more paper.") - /obj/item/smallDelivery name = "small parcel" desc = "A small wrapped package." @@ -89,7 +86,6 @@ if(sortTag != O.currTag) var/tag = uppertext(TAGGERLOCATIONS[O.currTag]) to_chat(user, "*[tag]*") - sortTag = O.currTag playsound(loc, 'sound/machines/twobeep.ogg', 100, 1) @@ -97,7 +93,6 @@ var/str = copytext(sanitize(input(user,"Label text?","Set label","")),1,MAX_NAME_LEN) if(!str || !length(str)) to_chat(user, "Invalid text.") - return user.visible_message("[user] labels [src] as [str].") name = "[name] ([str])" @@ -115,7 +110,6 @@ - /obj/item/stack/packageWrap name = "package wrapper" icon = 'icons/obj/items.dmi' @@ -168,7 +162,6 @@ O.loc = P else to_chat(user, "You need more paper.") - return else if(istype (target, /obj/structure/closet)) var/obj/structure/closet/O = target @@ -182,11 +175,9 @@ O.loc = P else to_chat(user, "You need more paper.") - return else to_chat(user, "The object you are trying to wrap is unsuitable for the sorting machinery.") - return user.visible_message("[user] wraps [target].") @@ -317,24 +308,20 @@ c_mode=1 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You remove the screws around the power connection.") - return else if(c_mode==1) c_mode=0 playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, "You attach the screws around the power connection.") - return else if(istype(I,/obj/item/weapon/weldingtool) && c_mode==1) var/obj/item/weapon/weldingtool/W = I if(W.remove_fuel(0,user)) playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1) to_chat(user, "You start slicing the floorweld off the delivery chute.") - if(do_after(user,20, target = src)) if(!src || !W.isOn()) return to_chat(user, "You sliced the floorweld off the delivery chute.") - var/obj/structure/disposalconstruct/C = new (src.loc) C.ptype = 8 // 8 = Delivery chute C.update() @@ -344,5 +331,4 @@ return else to_chat(user, "You need more welding fuel to complete this task.") - return diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm index f97fcc956a0..146f803edfb 100644 --- a/code/modules/research/circuitprinter.dm +++ b/code/modules/research/circuitprinter.dm @@ -120,30 +120,25 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). return else to_chat(user, "You can't load the [src.name] while it's opened.") - return if (disabled) return if (!linked_console) to_chat(user, "The [name] must be linked to an R&D console first!") - return 1 if (O.is_open_container()) return if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond)) to_chat(user, "You cannot insert this item into the [name]!") - return if (stat) return if (busy) to_chat(user, "The [name] is busy. Please wait for completion of previous operation.") - return var/obj/item/stack/sheet/stack = O if ((TotalMaterials() + stack.perunit) > max_material_amount) to_chat(user, "The [name] is full. Please remove glass from the protolathe in order to insert more.") - return var/amount = round(input("How many sheets do you want to add?") as num) @@ -155,7 +150,6 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis). busy = 1 use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount/10))) to_chat(user, "You add [amount] sheets to the [src.name].") - if(istype(stack, /obj/item/stack/sheet/glass)) g_amount += amount * MINERAL_MATERIAL_AMOUNT else if(istype(stack, /obj/item/stack/sheet/mineral/gold)) diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index 346b6437347..5a3bba6ae86 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -64,31 +64,25 @@ Note: Must be placed within 3 tiles of the R&D Console return if (!linked_console) to_chat(user, "The [src.name] must be linked to an R&D console first!") - return if (busy) to_chat(user, "The [src.name] is busy right now.") - return if (istype(O, /obj/item) && !loaded_item) if(!O.origin_tech) to_chat(user, "This doesn't seem to have a tech origin!") - return var/list/temp_tech = ConvertReqString2List(O.origin_tech) if (temp_tech.len == 0) to_chat(user, "You cannot deconstruct this item!") - return if(!user.drop_item()) to_chat(user, "\The [O] is stuck to your hand, you cannot put it in the [src.name]!") - return busy = 1 loaded_item = O O.loc = src to_chat(user, "You add the [O.name] to the [src.name]!") - flick("d_analyzer_la", src) spawn(10) icon_state = "d_analyzer_l" diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index aef6ced8f01..f0e3c089cfd 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -130,39 +130,32 @@ if(!checkCircumstances(O)) to_chat(user, "The [O] is not yet valid for the [src] and must be completed!") - return if (disabled) return if (!linked_console) to_chat(user, "The [src] must be linked to an R&D console first!") - return if (loaded_item) to_chat(user, "The [src] is already loaded.") - return if (istype(O, /obj/item)) if(!O.origin_tech) to_chat(user, "This doesn't seem to have a tech origin!") - return var/list/temp_tech = ConvertReqString2List(O.origin_tech) if (temp_tech.len == 0) to_chat(user, "You cannot experiment on this item!") - return if(O.reliability < 90 && O.crit_fail == 0) to_chat(usr, "Item is neither reliable enough or broken enough to learn from.") - return if(!user.drop_item()) return loaded_item = O O.loc = src to_chat(user, "You add the [O.name] to the machine.") - flick("h_lathe_load", src) return @@ -518,7 +511,6 @@ visible_message("[src] improves [exp_on], drawing 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]!") - m.take_overall_damage(50) investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor") var/list/reqs = ConvertReqString2List(exp_on.origin_tech) @@ -568,17 +560,14 @@ else if(recentlyExperimented) to_chat(usr, "[src] has been used too recently!") - return else if(!loaded_item) updateUsrDialog() //Set the interface to unloaded mode to_chat(usr, "[src] is not currently loaded!") - return else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item) updateUsrDialog() //Refresh interface to update interface hrefs to_chat(usr, "Interface failure detected in [src]. Please try again.") - return var/dotype if(text2num(scantype) == SCANTYPE_DISCOVER) @@ -651,7 +640,6 @@ if(revealed) if(cooldown) to_chat(user, "[src] does not react!") - return else if(src.loc == user) cooldown = TRUE @@ -661,7 +649,6 @@ else to_chat(user, "You aren't quite sure what to do with this, yet.") - //////////////// RELIC PROCS ///////////////////////////// /obj/item/weapon/relic/proc/throwSmoke(turf/where) @@ -692,7 +679,6 @@ var/message = "[src] begans to shake, and in the distance the sound of rampaging animals arises!" visible_message(message) to_chat(user, message) - var/animals = rand(1,25) var/counter var/list/valid_animals = list(/mob/living/simple_animal/parrot,/mob/living/simple_animal/butterfly,/mob/living/simple_animal/pet/cat,/mob/living/simple_animal/pet/corgi,/mob/living/simple_animal/crab,/mob/living/simple_animal/pet/fox,/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/pet/pug,/mob/living/simple_animal/hostile/bear,/mob/living/simple_animal/hostile/poison/bees,/mob/living/simple_animal/hostile/carp) @@ -702,7 +688,6 @@ warn_admins(user, "Mass Mob Spawn") if(prob(60)) to_chat(user, "[src] falls apart!") - qdel(src) /obj/item/weapon/relic/proc/rapidDupe(mob/user) @@ -729,7 +714,6 @@ /obj/item/weapon/relic/proc/explode(mob/user) to_chat(user, "[src] begins to heat up!") - spawn(rand(35,100)) if(src.loc == user) visible_message("The [src]'s top opens, releasing a powerful blast!") @@ -739,7 +723,6 @@ /obj/item/weapon/relic/proc/teleport(mob/user) to_chat(user, "The [src] begins to vibrate!") - spawn(rand(10,30)) var/turf/userturf = get_turf(user) if(src.loc == user && userturf.z != ZLEVEL_CENTCOMM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you! diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm index 4e0408b8bbc..a528c643809 100644 --- a/code/modules/research/message_server.dm +++ b/code/modules/research/message_server.dm @@ -114,9 +114,7 @@ var/global/list/obj/machinery/message_server/message_servers = list() /obj/machinery/message_server/attack_hand(user as mob) // to_chat(user, "\blue There seem to be some parts missing from this server. They should arrive on the station in a few days, give or take a few CentComm delays.") - to_chat(user, "You toggle PDA message passing from [active ? "On" : "Off"] to [active ? "Off" : "On"]") - active = !active update_icon() diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm index 80153dbd534..16748fbb46b 100644 --- a/code/modules/research/protolathe.dm +++ b/code/modules/research/protolathe.dm @@ -113,17 +113,14 @@ Note: Must be placed west/left of and R&D console to function. return 1 else to_chat(user, "You can't load the [src.name] while it's opened.") - return 1 if (disabled) return if (!linked_console) to_chat(user, " The [src.name] must be linked to an R&D console first!") - return 1 if (busy) to_chat(user, "The [src.name] is busy. Please wait for completion of previous operation.") - return 1 if (O.is_open_container()) return @@ -134,7 +131,6 @@ Note: Must be placed west/left of and R&D console to function. if(!materials.has_space( materials.get_item_material_amount(O) )) to_chat(user, "The [src.name]'s material bin is full! Please remove material before adding more.") - return 1 var/obj/item/stack/sheet/stack = O @@ -148,7 +144,6 @@ Note: Must be placed west/left of and R&D console to function. busy = 1 use_power(max(1000, (MINERAL_MATERIAL_AMOUNT*amount_inserted/10))) to_chat(user, "You add [amount_inserted] sheets to the [src.name].") - var/stackname = stack.name src.overlays += "protolathe_[stackname]" sleep(10) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 469948a5c78..c294ad8cff1 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -160,20 +160,17 @@ proc/CallMaterialName(ID) if(istype(D, /obj/item/weapon/disk)) if(t_disk || d_disk) to_chat(user, "A disk is already loaded into the machine.") - return if(istype(D, /obj/item/weapon/disk/tech_disk)) t_disk = D else if (istype(D, /obj/item/weapon/disk/design_disk)) d_disk = D else to_chat(user, "Machine cannot accept disks in that format.") - return if(!user.drop_item()) return D.loc = src to_chat(user, "You add the disk to the machine!") - else ..() src.updateUsrDialog() @@ -186,7 +183,6 @@ proc/CallMaterialName(ID) emagged = 1 to_chat(user, "You disable the security protocols") - /obj/machinery/computer/rdconsole/Topic(href, href_list) if(..()) return 1 @@ -270,7 +266,6 @@ proc/CallMaterialName(ID) if(linked_destroy.busy) to_chat(usr, " The destructive analyzer is busy at the moment.") - else if(linked_destroy.loaded_item) linked_destroy.loaded_item.loc = linked_destroy.loc linked_destroy.loaded_item = null @@ -295,7 +290,6 @@ proc/CallMaterialName(ID) if(linked_destroy) if(linked_destroy.busy) to_chat(usr, "The destructive analyzer is busy at the moment.") - else var/choice = input("Proceeding will destroy loaded item.") in list("Proceed", "Cancel") if(choice == "Cancel" || !linked_destroy) return @@ -309,7 +303,6 @@ proc/CallMaterialName(ID) if(!linked_destroy.hacked) if(!linked_destroy.loaded_item) to_chat(usr, "The destructive analyzer appears to be empty.") - screen = 1.0 return if((linked_destroy.loaded_item.reliability >= 99 - (linked_destroy.decon_mod * 3)) || linked_destroy.loaded_item.crit_fail) @@ -349,7 +342,6 @@ proc/CallMaterialName(ID) screen = 0.0 if(!sync) to_chat(usr, "You must connect to the network first!") - else griefProtection() //Putting this here because I dont trust the sync process spawn(30) @@ -647,7 +639,6 @@ proc/CallMaterialName(ID) return 1 if(!allowed(user) && !isobserver(user)) to_chat(user, "Access denied.") - return 1 interact(user) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index 50367612755..79eca347423 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -60,11 +60,9 @@ var/temp_wire = href_list["wire"] if (!istype(usr.get_active_hand(), /obj/item/device/multitool)) to_chat(usr, "You need a multitool!") - else if(src.wires[temp_wire]) to_chat(usr, "You can't pulse a cut wire.") - else if(src.hack_wire == href_list["wire"]) src.hacked = !src.hacked @@ -80,7 +78,6 @@ if(href_list["cut"]) if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters)) to_chat(usr, "You need wirecutters!") - else var/temp_wire = href_list["wire"] wires[temp_wire] = !wires[temp_wire] diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index bd23c33fce9..3bd5bad2f57 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -210,7 +210,6 @@ usr.set_machine(src) if(!src.allowed(usr) && !emagged) to_chat(usr, "\red You do not have the required access level") - return if(href_list["main"]) @@ -339,7 +338,6 @@ playsound(src.loc, 'sound/effects/sparks4.ogg', 75, 1) emagged = 1 to_chat(user, "\blue You you disable the security protocols") - src.updateUsrDialog() /obj/machinery/r_n_d/server/core diff --git a/code/modules/research/xenoarchaeology/artifact/artifact.dm b/code/modules/research/xenoarchaeology/artifact/artifact.dm index 940a40f954b..3087ad35a72 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact.dm @@ -82,7 +82,6 @@ user.visible_message("\blue[user] extends [P] towards [src].","\blue You extend [P] towards [src].") if(do_after(user,40, target = src)) to_chat(user, "\blue \icon[P] [src] has been excavated to a depth of [2*src.excavation_level]cm.") - return if (istype(W, /obj/item/weapon/pickaxe)) @@ -90,12 +89,10 @@ to_chat(user, "\red You start [P.drill_verb] [src].") - if(!do_after(user,P.digspeed, target = src)) return to_chat(user, "\blue You finish [P.drill_verb] [src].") - excavation_level += P.excavation_amount if(excavation_level > 100) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm index 065a617b9ea..d93b8f3573f 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm @@ -15,13 +15,11 @@ active = 0 icon_state = "gigadrill" to_chat(user, "\blue You press a button and [src] slowly spins down.") - else active = 1 icon_state = "gigadrill_mov" to_chat(user, "\blue You press a button and [src] shudders to life.") - /obj/machinery/giga_drill/Bump(atom/A) if(active && !drilling_turf) if(istype(A,/turf/simulated/mineral)) diff --git a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm index b12f431d206..d9041733d57 100644 --- a/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm +++ b/code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm @@ -222,23 +222,19 @@ var/list/valid_secondary_effect_types = list(\ /obj/machinery/artifact/attack_hand(var/mob/user as mob) if (get_dist(user, src) > 1) to_chat(user, "\red You can't reach [src] from here.") - return if(ishuman(user) && user:gloves) to_chat(user, "You touch [src] with your gloved hands, [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") - return src.add_fingerprint(user) if(my_effect.trigger == TRIGGER_TOUCH) to_chat(user, "You touch [src].") - my_effect.ToggleActivate() else to_chat(user, "You touch [src], [pick("but nothing of note happens","but nothing happens","but nothing interesting happens","but you notice nothing different","but nothing seems to have happened")].") - if(prob(25) && secondary_effect && secondary_effect.trigger == TRIGGER_TOUCH) secondary_effect.ToggleActivate(0) @@ -322,7 +318,6 @@ var/list/valid_secondary_effect_types = list(\ if(warn) to_chat(M, "You accidentally touch [src].") - ..() /obj/machinery/artifact/bullet_act(var/obj/item/projectile/P) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm index b98612c980a..89c74776f55 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_affect_cold.dm @@ -13,7 +13,6 @@ /datum/artifact_effect/cold/DoEffectTouch(var/mob/user) if(holder) to_chat(user, "\blue A chill passes up your spine!") - var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature = max(env.temperature - rand(5,50), 0) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm index 85c6b08432a..93a025336a0 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_badfeeling.dm @@ -33,11 +33,9 @@ if(prob(50)) if(prob(75)) to_chat(H, "[pick(drastic_messages)]") - else to_chat(H, "[pick(messages)]") - if(prob(50)) H.dizziness += rand(3,5) @@ -48,11 +46,9 @@ if(prob(5)) if(prob(75)) to_chat(H, "[pick(messages)]") - else to_chat(H, "[pick(drastic_messages)]") - if(prob(10)) H.dizziness += rand(3,5) return 1 @@ -64,11 +60,9 @@ if(prob(50)) if(prob(95)) to_chat(H, "[pick(drastic_messages)]") - else to_chat(H, "[pick(messages)]") - if(prob(50)) H.dizziness += rand(3,5) else if(prob(25)) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm index 37296545e74..ab66d1d0c6c 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_cellcharge.dm @@ -11,7 +11,6 @@ for (var/obj/item/weapon/stock_parts/cell/D in R.contents) D.charge += rand() * 100 + 50 to_chat(R, "\blue SYSTEM ALERT: Large energy boost detected!") - return 1 /datum/artifact_effect/cellcharge/DoEffectAura() @@ -26,7 +25,6 @@ for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge += 25 to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!") - return 1 /datum/artifact_effect/cellcharge/DoEffectPulse() @@ -41,5 +39,4 @@ for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge += rand() * 100 to_chat(M, "\blue SYSTEM ALERT: Energy boost detected!") - return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm index 978d3b0a9f4..97c113b2fef 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_celldrain.dm @@ -11,7 +11,6 @@ for (var/obj/item/weapon/stock_parts/cell/D in R.contents) D.charge = max(D.charge - rand() * 100, 0) to_chat(R, "\blue SYSTEM ALERT: Energy drain detected!") - return 1 return 1 @@ -28,7 +27,6 @@ for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge = max(D.charge - 50,0) to_chat(M, "\red SYSTEM ALERT: Energy drain detected!") - return 1 /datum/artifact_effect/celldrain/DoEffectPulse() @@ -43,5 +41,4 @@ for (var/obj/item/weapon/stock_parts/cell/D in M.contents) D.charge = max(D.charge - rand() * 150,0) to_chat(M, "\red SYSTEM ALERT: Energy drain detected!") - return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm index 31cd6c871ba..f52e8125e3f 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_goodfeeling.dm @@ -31,11 +31,9 @@ if(prob(50)) if(prob(75)) to_chat(H, "[pick(drastic_messages)]") - else to_chat(H, "[pick(messages)]") - if(prob(50)) H.dizziness += rand(3,5) @@ -46,11 +44,9 @@ if(prob(5)) if(prob(75)) to_chat(H, "[pick(messages)]") - else to_chat(H, "[pick(drastic_messages)]") - if(prob(5)) H.dizziness += rand(3,5) return 1 @@ -62,11 +58,9 @@ if(prob(50)) if(prob(95)) to_chat(H, "[pick(drastic_messages)]") - else to_chat(H, "[pick(messages)]") - if(prob(50)) H.dizziness += rand(3,5) else if(prob(25)) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm index 341f2543f37..c46549d0d50 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heal.dm @@ -11,7 +11,6 @@ var/mob/living/carbon/C = toucher to_chat(C, "\blue You feel a soothing energy invigorate you.") - if(ishuman(toucher)) var/mob/living/carbon/human/H = toucher for(var/obj/item/organ/external/affecting in H.organs) @@ -44,7 +43,6 @@ if(prob(weakness * 100)) if(prob(10)) to_chat(C, "\blue You feel a soothing energy radiating from something nearby.") - C.adjustBruteLoss(-1 * weakness) C.adjustFireLoss(-1 * weakness) C.adjustToxLoss(-1 * weakness) @@ -60,7 +58,6 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) to_chat(C, "\blue A wave of energy invigorates you.") - C.adjustBruteLoss(-5 * weakness) C.adjustFireLoss(-5 * weakness) C.adjustToxLoss(-5 * weakness) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm index 50b7c0a95a8..86828f7ef39 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_heat.dm @@ -16,7 +16,6 @@ /datum/artifact_effect/heat/DoEffectTouch(var/mob/user) if(holder) to_chat(user, "\red You feel a wave of heat travel up your spine!") - var/datum/gas_mixture/env = holder.loc.return_air() if(env) env.temperature += rand(5,50) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm index be7cc57fb7e..fd221b470fb 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_hurt.dm @@ -9,7 +9,6 @@ if(iscarbon(toucher) && prob(weakness * 100)) var/mob/living/carbon/C = toucher to_chat(C, "\red A painful discharge of energy strikes you!") - C.adjustOxyLoss(rand(5,25) * weakness) C.adjustToxLoss(rand(5,25) * weakness) C.adjustBruteLoss(rand(5,25) * weakness) @@ -28,7 +27,6 @@ if(prob(weakness * 100)) if(prob(10)) to_chat(C, "\red You feel a painful force radiating from something nearby.") - C.adjustBruteLoss(1 * weakness) C.adjustFireLoss(1 * weakness) C.adjustToxLoss(1 * weakness) @@ -43,7 +41,6 @@ var/weakness = GetAnomalySusceptibility(C) if(prob(weakness * 100)) to_chat(C, "\red A wave of painful energy strikes you!") - C.adjustBruteLoss(3 * weakness) C.adjustFireLoss(3 * weakness) C.adjustToxLoss(3 * weakness) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm index e4b99fad1f0..6f698bb8ee3 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_roboheal.dm @@ -11,7 +11,6 @@ if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user to_chat(R, "\blue Your systems report damaged components mending by themselves!") - R.adjustBruteLoss(rand(-10,-30)) R.adjustFireLoss(rand(-10,-30)) return 1 @@ -22,7 +21,6 @@ for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(prob(10)) to_chat(M, "\blue SYSTEM ALERT: Beneficial energy field detected!") - M.adjustBruteLoss(-1) M.adjustFireLoss(-1) M.updatehealth() @@ -33,7 +31,6 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) to_chat(M, "\blue SYSTEM ALERT: Structural damage has been repaired by energy pulse!") - M.adjustBruteLoss(-10) M.adjustFireLoss(-10) M.updatehealth() diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm index 3f542e17567..c7f4d7f9775 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_robohurt.dm @@ -11,7 +11,6 @@ if (istype(user, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = user to_chat(R, "\red Your systems report severe damage has been inflicted!") - R.adjustBruteLoss(rand(10,50)) R.adjustFireLoss(rand(10,50)) return 1 @@ -22,7 +21,6 @@ for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) if(prob(10)) to_chat(M, "\red SYSTEM ALERT: Harmful energy field detected!") - M.adjustBruteLoss(1) M.adjustFireLoss(1) M.updatehealth() @@ -33,7 +31,6 @@ var/turf/T = get_turf(holder) for (var/mob/living/silicon/robot/M in range(src.effectrange,T)) to_chat(M, "\red SYSTEM ALERT: Structural damage inflicted by energy pulse!") - M.adjustBruteLoss(10) M.adjustFireLoss(10) M.updatehealth() diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm index 4d4bf8babf2..7ff0af5bab1 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_sleepy.dm @@ -13,13 +13,11 @@ if(ishuman(toucher) && prob(weakness * 100)) var/mob/living/carbon/human/H = toucher to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) - H.drowsyness = min(H.drowsyness + rand(5,25) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(1,3) * weakness, 50 * weakness) return 1 else if(isrobot(toucher)) to_chat(toucher, "\red SYSTEM ALERT: CPU cycles slowing down.") - return 1 /datum/artifact_effect/sleepy/DoEffectAura() @@ -30,12 +28,10 @@ if(prob(weakness * 100)) if(prob(10)) to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) - H.drowsyness = min(H.drowsyness + 1 * weakness, 25 * weakness) H.eye_blurry = min(H.eye_blurry + 1 * weakness, 25 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.") - return 1 /datum/artifact_effect/sleepy/DoEffectPulse() @@ -45,10 +41,8 @@ var/weakness = GetAnomalySusceptibility(H) if(prob(weakness * 100)) to_chat(H, pick("\blue You feel like taking a nap.","\blue You feel a yawn coming on.","\blue You feel a little tired.")) - H.drowsyness = min(H.drowsyness + rand(5,15) * weakness, 50 * weakness) H.eye_blurry = min(H.eye_blurry + rand(5,15) * weakness, 50 * weakness) for (var/mob/living/silicon/robot/R in range(src.effectrange,holder)) to_chat(R, "\red SYSTEM ALERT: CPU cycles slowing down.") - return 1 diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm index 2c2b613db4e..5c924d2bb6e 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_stun.dm @@ -12,7 +12,6 @@ var/susceptibility = GetAnomalySusceptibility(C) if(prob(susceptibility * 100)) to_chat(C, "\red A powerful force overwhelms your consciousness.") - C.Weaken(rand(1,10) * susceptibility) C.stuttering += 30 * susceptibility C.Stun(rand(1,10) * susceptibility) @@ -24,7 +23,6 @@ var/susceptibility = GetAnomalySusceptibility(C) if(prob(10 * susceptibility)) to_chat(C, "\red Your body goes numb for a moment.") - C.Weaken(2) C.stuttering += 2 if(prob(10)) @@ -32,7 +30,6 @@ else if(prob(10)) to_chat(C, "\red You feel numb.") - /datum/artifact_effect/stun/DoEffectPulse() if(holder) var/turf/T = get_turf(holder) @@ -40,7 +37,6 @@ var/susceptibility = GetAnomalySusceptibility(C) if(prob(100 * susceptibility)) to_chat(C, "\red A wave of energy overwhelms your senses!") - C.SetWeakened(4 * susceptibility) C.stuttering = 4 * susceptibility if(prob(10)) diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm index 7252d123ec6..2c22bb9810e 100644 --- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm +++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_teleport.dm @@ -7,7 +7,6 @@ var/weakness = GetAnomalySusceptibility(user) if(prob(100 * weakness)) to_chat(user, "\red You are suddenly zapped away elsewhere!") - if (user.buckled) user.buckled.unbuckle_mob() @@ -27,7 +26,6 @@ var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) to_chat(M, "\red You are displaced by a strange force!") - if(M.buckled) M.buckled.unbuckle_mob() @@ -47,7 +45,6 @@ var/weakness = GetAnomalySusceptibility(M) if(prob(100 * weakness)) to_chat(M, "\red You are displaced by a strange force!") - if(M.buckled) M.buckled.unbuckle_mob() diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index e69c92f9951..f417fc49792 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -94,7 +94,6 @@ obj/item/weapon/reagent_containers/glass/solution_tray/attackby(obj/item/weapon/ if(new_label) name = "solution tray ([new_label])" to_chat(user, "\blue You write on the label of the solution tray.") - else ..(W, user) diff --git a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm index ec2ead4f34a..206280770e9 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_fossils.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_fossils.dm @@ -76,7 +76,6 @@ else src.desc = "Incomplete skeleton, looks like it could use [src.breq-src.bnum] more bones." to_chat(user, "Looks like it could use [src.breq-src.bnum] more bones.") - else ..() else if(istype(W,/obj/item/weapon/pen)) diff --git a/code/modules/research/xenoarchaeology/finds/finds_misc.dm b/code/modules/research/xenoarchaeology/finds/finds_misc.dm index f440015cf31..68293501b77 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_misc.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_misc.dm @@ -37,7 +37,6 @@ continue G.attackby(NG, user, params) to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.") - //SN src = null qdel(src) return diff --git a/code/modules/research/xenoarchaeology/finds/finds_special.dm b/code/modules/research/xenoarchaeology/finds/finds_special.dm index ac10df89458..dc315b80640 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_special.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_special.dm @@ -130,7 +130,6 @@ var/target = pick("chest","groin","head","l_arm","r_arm","r_leg","l_leg","l_hand","r_hand","l_foot","r_foot") M.apply_damage(rand(5, 10), BRUTE, target) to_chat(M, "\red The skin on your [parse_zone(target)] feels like it's ripping apart, and a stream of blood flies out.") - var/obj/effect/decal/cleanable/blood/splatter/animated/B = new(M.loc) B.target_turf = pick(range(1, src)) B.blood_DNA = list() @@ -202,4 +201,3 @@ /obj/effect/shadow_wight/Bump(var/atom/obstacle) to_chat(obstacle, "\red You feel a chill run down your spine!") - diff --git a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm index 356e9588d03..9cea4d29494 100644 --- a/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm +++ b/code/modules/research/xenoarchaeology/finds/finds_talkingitem.dm @@ -53,7 +53,6 @@ w.Add("[lowertext(seperate[next])]") // to_chat(world, "Adding [lowertext(seperate[next])] to [lowertext(seperate[Xa])]") - if(prob(30)) var/list/options = list("[holder_atom] seems to be listening intently to [source]...",\ "[holder_atom] seems to be focussing on [source]...",\ @@ -68,12 +67,10 @@ //set src in view() for(var/v in heard_words) to_chat(world, "[uppertext(v)]") - var/list/d = heard_words["[v]"] for(var/X in d) to_chat(world, "[X]")*/ - /datum/talking_atom/proc/SaySomething(var/word = null) if(!holder_atom) return @@ -125,5 +122,4 @@ for(var/mob/M in listening) to_chat(M, "\icon[holder_atom] [holder_atom] reverberates, \blue\"[msg]\"") - last_talk_time = world.time diff --git a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm index 7205b3db313..1e491f1ac48 100644 --- a/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm +++ b/code/modules/research/xenoarchaeology/genetics/reconstitutor.dm @@ -197,14 +197,12 @@ datum/genesequence pod1.biomass -= CLONE_BIOMASS else to_chat(usr, "\red \icon[src] Unable to locate cloning pod!") - else ..() /obj/machinery/computer/reconstitutor/Topic(href, href_list) if(href_list["insertpos"]) // to_chat(world, "inserting gene for genesequence [href_list["insertgenome"]] at pos [text2num(href_list["insertpos"])]") - var/sequence_num = text2num(href_list["sequence_num"]) var/insertpos = text2num(href_list["insertpos"]) diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm index 95fdbe1103b..017dcb7157d 100644 --- a/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm +++ b/code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm @@ -25,14 +25,12 @@ if(istype(I,/obj/item/weapon/anobattery)) if(!inserted_battery) to_chat(user, "\blue You insert [I] into [src].") - user.drop_item() I.loc = src src.inserted_battery = I updateDialog() else to_chat(user, "\red There is already a battery in [src].") - else return..() diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index ea953dad91b..22d644b5aa5 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -63,7 +63,6 @@ /obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob, params) if(scanning) to_chat(user, "You can't do that while [src] is scanning!") - else if(istype(I, /obj/item/stack/nanopaste)) var/choice = alert("What do you want to do with the nanopaste?","Radiometric Scanner","Scan nanopaste","Fix seal integrity") @@ -80,7 +79,6 @@ var/amount_transferred = min(src.reagents.maximum_volume - src.reagents.total_volume, G.reagents.total_volume) G.reagents.trans_to(src, amount_transferred) to_chat(user, "You empty [amount_transferred]u of coolant into [src].") - update_coolant() return else if(choice == "Empty coolant") @@ -88,7 +86,6 @@ var/amount_transferred = min(G.reagents.maximum_volume - G.reagents.total_volume, src.reagents.total_volume) src.reagents.trans_to(G, amount_transferred) to_chat(user, "You remove [amount_transferred]u of coolant from [src].") - update_coolant() return user.drop_item() @@ -335,14 +332,11 @@ scanning = 1 t_left_radspike = pick(5,10,15) to_chat(usr, "Scan initiated.") - else to_chat(usr, "Could not initiate scan, seal requires replacing.") - else to_chat(usr, "Insert an item to scan.") - if(href_list["maserWavelength"]) maser_wavelength = max(min(maser_wavelength + 1000 * text2num(href_list["maserWavelength"]), 10000), 1) diff --git a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm index 241c6423510..9d6cf4fa460 100644 --- a/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm +++ b/code/modules/research/xenoarchaeology/tools/ano_device_battery.dm @@ -41,7 +41,6 @@ if(istype(I, /obj/item/weapon/anobattery)) if(!inserted_battery) to_chat(user, "\blue You insert the battery.") - user.drop_item() I.loc = src inserted_battery = I @@ -105,7 +104,6 @@ //apply the touch effect to the holder if(holder) to_chat(holder, "the \icon[src] [src] held by [holder] shudders in your grasp.") - else src.loc.visible_message("the \icon[src] [src] shudders.") inserted_battery.battery_effect.DoEffectTouch(holder) diff --git a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm index 12cc7646b07..c05eb88c8bb 100644 --- a/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm +++ b/code/modules/research/xenoarchaeology/tools/bunsen_burner.dm @@ -13,13 +13,11 @@ if(istype(W, /obj/item/weapon/reagent_containers)) if(held_container) to_chat(user, "\red You must remove the [held_container] first.") - else user.drop_item(src) held_container = W held_container.loc = src to_chat(user, "\blue You put the [held_container] onto the [src].") - var/image/I = image("icon"=W, "layer"=FLOAT_LAYER) underlays += I if(heating) @@ -28,19 +26,16 @@ else to_chat(user, "\red You can't put the [W] onto the [src].") - /obj/machinery/bunsen_burner/attack_hand(mob/user as mob) if(held_container) underlays = null to_chat(user, "\blue You remove the [held_container] from the [src].") - held_container.loc = src.loc held_container.attack_hand(user) held_container = null else to_chat(user, "\red There is nothing on the [src].") - /obj/machinery/bunsen_burner/proc/try_heating() src.visible_message("\blue \icon[src] [src] hisses.") if(held_container && heating) diff --git a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm index 8be15d1c212..0a26c42a821 100644 --- a/code/modules/research/xenoarchaeology/tools/suspension_generator.dm +++ b/code/modules/research/xenoarchaeology/tools/suspension_generator.dm @@ -33,7 +33,6 @@ if(prob(5)) to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") - if(field_type == "iron") for(var/mob/living/silicon/M in T) M.Weaken(3) @@ -41,7 +40,6 @@ if(prob(5)) to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") - for(var/obj/item/I in T) if(!suspension_field.contents.len) suspension_field.icon_state = "energynet" @@ -54,7 +52,6 @@ if(prob(5)) to_chat(M, "\blue [pick("You feel tingly.","You feel like floating.","It is hard to speak.","You can barely move.")]") - if(cell.charge <= 0) deactivate() @@ -124,7 +121,6 @@ activate() else to_chat(usr, "You are unable to activate [src] until it is properly secured on the ground.") - else deactivate() if(href_list["select_field"]) @@ -140,10 +136,8 @@ auth_card = I if(attempt_unlock(I)) to_chat(usr, "You insert [I], the console flashes \'Access granted.\'") - else to_chat(usr, "You insert [I], the console flashes \'Access denied.\'") - else if(href_list["ejectcard"]) if(auth_card) if(ishuman(usr)) @@ -174,7 +168,6 @@ cell = null to_chat(user, "You remove the power cell") - /obj/machinery/suspension_gen/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if (istype(W, /obj/item/weapon/screwdriver)) if(!open) @@ -183,7 +176,6 @@ else screwed = 1 to_chat(user, "You [screwed ? "screw" : "unscrew"] the battery panel.") - else if (istype(W, /obj/item/weapon/crowbar)) if(!locked) if(!screwed) @@ -193,17 +185,13 @@ else open = 1 to_chat(user, "You crowbar the battery panel [open ? "open" : "in place"].") - icon_state = "suspension[open ? (cell ? "1" : "0") : "2"]" else to_chat(user, "[src]'s safety locks are engaged, shut it down first.") - else to_chat(user, "Unscrew [src]'s battery panel first.") - else to_chat(user, "[src]'s security locks are engaged.") - else if (istype(W, /obj/item/weapon/wrench)) if(!suspension_field) if(anchored) @@ -211,39 +199,32 @@ else anchored = 1 to_chat(user, "You wrench the stabilising legs [anchored ? "into place" : "up against the body"].") - if(anchored) desc = "It is resting securely on four stubby legs." else desc = "It has stubby legs bolted up against it's body for stabilising." else to_chat(user, "You are unable to secure [src] while it is active!") - else if (istype(W, /obj/item/weapon/stock_parts/cell)) if(open) if(cell) to_chat(user, "There is a power cell already installed.") - else user.drop_item() W.loc = src cell = W to_chat(user, "You insert the power cell.") - icon_state = "suspension1" else if(istype(W, /obj/item/weapon/card)) var/obj/item/weapon/card/I = W if(!auth_card) if(attempt_unlock(I)) to_chat(user, "You swipe [I], the console flashes \'Access granted.\'") - else to_chat(user, "You swipe [I], console flashes \'Access denied.\'") - else to_chat(user, "Remove [auth_card] first.") - /obj/machinery/suspension_gen/proc/attempt_unlock(var/obj/item/weapon/card/C) if(!open) if(istype(C, /obj/item/weapon/card/emag) && cell.charge > 0) @@ -325,7 +306,6 @@ for(var/mob/M in T) to_chat(M, "You no longer feel like floating.") - M.SetWeakened(min(M.weakened, 3)) src.visible_message("\blue \icon[src] [src] deactivates with a gentle shudder.") @@ -344,7 +324,6 @@ if(anchored) to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.") - else dir = turn(dir, 90) @@ -355,7 +334,6 @@ if(anchored) to_chat(usr, "\red You cannot rotate [src], it has been firmly fixed to the floor.") - else dir = turn(dir, -90) diff --git a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm index 0f012bcacdd..3ae1c15f660 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_anoscanner.dm @@ -28,7 +28,6 @@ to_chat(user, "[message]") - /obj/item/device/ano_scanner/proc/scan() last_scan_time = world.time nearest_artifact_distance = -1 diff --git a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm index c0f369b2524..c1d8bda97ee 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_coresampler.dm @@ -29,17 +29,14 @@ if(..(user, 2)) to_chat(user, "\blue Used to extract geological core samples - this one is [sampled_turf ? "full" : "empty"], and has [num_stored_bags] bag[num_stored_bags != 1 ? "s" : ""] remaining.") - /obj/item/device/core_sampler/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weapon/evidencebag)) if(num_stored_bags < 10) qdel(W) num_stored_bags += 1 to_chat(user, "\blue You insert the [W] into the core sampler.") - else to_chat(user, "\red The core sampler can not fit any more bags!") - else return ..() @@ -56,10 +53,8 @@ if(geo_data) if(filled_bag) to_chat(user, "\red The core sampler is full!") - else if(num_stored_bags < 1) to_chat(user, "\red The core sampler is out of sample bags!") - else //create a new sample bag which we'll fill with rock samples filled_bag = new /obj/item/weapon/evidencebag(src) @@ -81,15 +76,12 @@ filled_bag.w_class = 1 to_chat(user, "\blue You take a core sample of the [item_to_sample].") - else to_chat(user, "\red You are unable to take a sample of [item_to_sample].") - /obj/item/device/core_sampler/attack_self() if(filled_bag) to_chat(usr, "\blue You eject the full sample bag.") - var/success = 0 if(istype(src.loc, /mob)) var/mob/M = src.loc @@ -100,4 +92,3 @@ icon_state = "sampler0" else to_chat(usr, "\red The core sampler is empty.") - diff --git a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm index 486d405b8fa..6bf829ba220 100644 --- a/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm +++ b/code/modules/research/xenoarchaeology/tools/tools_depthscanner.dm @@ -48,7 +48,6 @@ for(var/mob/L in range(src, 1)) to_chat(L, "\blue \icon[src] [src] pings.") - else if(istype(A,/obj/structure/boulder)) var/obj/structure/boulder/B = A if(B.artifact_find) @@ -68,7 +67,6 @@ for(var/mob/L in range(src, 1)) to_chat(L, "\blue \icon[src] [src] pings [pick("madly","wildly","excitedly","crazily")]!.") - /obj/item/device/depth_scanner/attack_self(var/mob/user as mob) return src.interact(user) diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index ab2ad00f104..96746f780d8 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -151,7 +151,6 @@ to_chat(owner, "[X] now has [X.monkeys] monkeys left.") - /datum/action/monkey_recycle name = "Recycle Monkeys" action_type = AB_INNATE diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f810c41878b..0599d141c08 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -20,14 +20,11 @@ if(istype(O, /obj/item/weapon/slimesteroid2)) if(enhanced == 1) to_chat(user, " This extract has already been enhanced!") - return ..() if(Uses == 0) to_chat(user, " You can't enhance a used extract!") - return ..() to_chat(user, "You apply the enhancer. It now has triple the amount of uses.") - Uses = 3 enhanced = 1 qdel(O) @@ -157,15 +154,12 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. to_chat(user, " The potion only works on slimes!") - return ..() if(M.stat) to_chat(user, " The slime is dead!") - return..() if(M.mind) to_chat(user, " The slime resists!") - return ..() if(M.is_adult) var/mob/living/simple_animal/adultslime/pet = new /mob/living/simple_animal/adultslime(M.loc) @@ -197,7 +191,6 @@ qdel(src) to_chat(user, "You feed the slime the potion, removing it's powers and calming it.") - /obj/item/weapon/sentience_potion name = "sentience potion" desc = "A miraculous chemical mix that can raise the intelligence of creatures to human levels. Unlike normal slime potions, it can be absorbed by any nonsentient being." @@ -214,15 +207,12 @@ 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!") - return ..() if(M.stat) to_chat(user, "[M] is dead!") - return..() to_chat(user, "You offer the sentience potion to [M]...") - being_used = 1 var/list/candidates = pollCandidates("Do you want to play as [M.name]?", ROLE_SENTIENT, 0, 100) @@ -236,18 +226,14 @@ M.universal_speak = 1 M.faction |= "sentient" to_chat(M, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!") - to_chat(M, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist them in completing their goals at any cost.") - to_chat(user, "[M] accepts the potion and suddenly becomes attentive and aware. It worked!") - if(isanimal(M)) var/mob/living/simple_animal/S = M S.master_commander = user qdel(src) else to_chat(user, "[M] looks interested for a moment, but then looks back down. Maybe you should try again later.") - being_used = 0 ..() @@ -264,23 +250,18 @@ attack(mob/living/carbon/slime/M as mob, mob/user as mob) if(!istype(M, /mob/living/carbon/slime))//If target is not a slime. to_chat(user, " The steroid only works on baby slimes!") - return ..() if(M.is_adult) //Can't tame adults to_chat(user, " Only baby slimes can use the steroid!") - return..() if(M.stat) to_chat(user, " The slime is dead!") - return..() if(M.cores == 3) to_chat(user, " The slime already has the maximum amount of extract!") - return..() to_chat(user, "You feed the slime the steroid. It now has triple the amount of extract.") - M.cores = 3 qdel(src) @@ -305,14 +286,11 @@ ..() if(!istype(C)) to_chat(user, "The potion can only be used on items!") - return if(C.slowdown <= 0) to_chat(user, "The [C] can't be made any faster!") - return..() to_chat(user, "You slather the red gunk over the [C], making it faster.") - C.color = "#FF0000" C.slowdown = 0 qdel(src) @@ -334,14 +312,11 @@ return if(!istype(C)) to_chat(user, "The potion can only be used on clothing!") - return if(C.max_heat_protection_temperature == FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT) to_chat(user, "The [C] is already fireproof!") - return..() to_chat(user, "You slather the blue gunk over the [C], fireproofing it.") - C.name = "fireproofed [C.name]" C.color = "#000080" C.max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT @@ -507,20 +482,17 @@ for(var/mob/dead/observer/O in src.loc) if(!check_observer(O)) to_chat(O, "\red You are not eligible to become a golem.") - continue ghost = O break if(!ghost) to_chat(user, "The rune fizzles uselessly. There is no spirit nearby.") - return var/mob/living/carbon/human/golem/G = new /mob/living/carbon/human/golem G.change_gender(pick(MALE,FEMALE)) G.loc = src.loc G.key = ghost.key to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.") - qdel(src) @@ -531,7 +503,6 @@ if(A) to_chat(O, "\blue Golem rune created in [A.name]. (Teleport | Sign Up)") - Topic(href,href_list) if("signup" in href_list) var/mob/dead/observer/O = locate(href_list["signup"]) @@ -556,12 +527,9 @@ if(O in ghosts) ghosts.Remove(O) to_chat(O, "\red You are no longer signed up to be a golem.") - else if(!check_observer(O)) to_chat(O, "\red You are not eligible to become a golem.") - return ghosts.Add(O) to_chat(O, "\blue You are signed up to be a golem.") - diff --git a/code/modules/scripting/Parser/Keywords.dm b/code/modules/scripting/Parser/Keywords.dm index 9a52e1f39b0..4c186160838 100644 --- a/code/modules/scripting/Parser/Keywords.dm +++ b/code/modules/scripting/Parser/Keywords.dm @@ -83,7 +83,6 @@ var/const/Represents a special statement in the code triggered by a keyword. if(!ifstmt || !istype(ifstmt) || ifstmt.else_if) to_chat(usr, "NTSL: ELSE IF FAILED: [!ifstmt], [!istype(ifstmt)], [!istype(ifstmt) || ifstmt.else_if]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... - parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken) return KW_FAIL @@ -112,7 +111,6 @@ var/const/Represents a special statement in the code triggered by a keyword. if(!stmt || !istype(stmt) || stmt.else_block) //Ensure that it is an if statement to_chat(usr, "NTSL: ELSE IF FAILED: [!stmt], [!istype(stmt)], [!istype(stmt) || stmt.else_block]")// Usr is unsafe as SHIT but JUST incase I forget this debug line like the fucking asset cache... - parser.errors += new/datum/scriptError/ExpectedToken("if statement", parser.curToken) return KW_FAIL diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index 8e46a0e4e27..d27820ac033 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -24,13 +24,11 @@ /obj/machinery/keycard_auth/attack_ai(mob/user as mob) to_chat(user, "The station AI is not to interact with these devices.") - return /obj/machinery/keycard_auth/attackby(obj/item/weapon/W as obj, mob/user as mob, params) if(stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered.") - return if(istype(W,/obj/item/weapon/card/id)) var/obj/item/weapon/card/id/ID = W @@ -43,7 +41,6 @@ else if(screen == 2) if(event == "Emergency Response Team" && ert_reason == "Reason for ERT") to_chat(user, "Supply a reason for calling the ERT first!") - return event_triggered_by = usr broadcast_request() //This is the device making the initial event request. It needs to broadcast to other devices @@ -63,11 +60,9 @@ /obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) if(user.stat || stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered.") - return if(busy) to_chat(user, "This device is busy.") - return user.set_machine(src) @@ -88,11 +83,9 @@ return if(busy) to_chat(usr, "This device is busy.") - return if(usr.stat || stat & (BROKEN|NOPOWER)) to_chat(usr, "This device is without power.") - return if(href_list["triggerevent"]) event = href_list["triggerevent"] @@ -161,11 +154,9 @@ if("Emergency Response Team") if(is_ert_blocked()) to_chat(usr, "\red All Emergency Response Teams are dispatched and can not be called at this time.") - return to_chat(usr, "ERT request transmitted.") - if(admins.len) ERT_Announce(ert_reason , event_triggered_by) ert_reason = "Reason for ERT" diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm index d386fc3774a..fe3d059a08a 100644 --- a/code/modules/shuttle/assault_pod.dm +++ b/code/modules/shuttle/assault_pod.dm @@ -56,5 +56,4 @@ to_chat(user, "Landing zone set.") - qdel(src) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index fd2b2b74771..1f555693960 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -23,18 +23,15 @@ W = pda.id if (!W:access) //no access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return var/list/cardaccess = W:access if(!istype(cardaccess, /list) || !cardaccess.len) //no access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return if(!(access_heads in W:access)) //doesn't have this access to_chat(user, "The access level of [W:registered_name]\'s card is not high enough. ") - return 0 var/choice = alert(user, text("Would you like to (un)authorize a shortened launch time? [] authorization\s are still needed. Use abort to cancel all authorizations.", src.auth_need - src.authorized.len), "Shuttle Launch", "Authorize", "Repeal", "Abort") @@ -202,7 +199,6 @@ for(var/area/shuttle/escape/E in world) to_chat(E, 'sound/effects/hyperspace_begin.ogg') - if(time_left <= 0 && !shuttle_master.emergencyNoEscape) //move each escape pod to its corresponding transit dock for(var/obj/docking_port/mobile/pod/M in shuttle_master.mobile) @@ -211,7 +207,6 @@ //now move the actual emergency shuttle to its transit dock for(var/area/shuttle/escape/E in world) to_chat(E, 'sound/effects/hyperspace_progress.ogg') - enterTransit() mode = SHUTTLE_ESCAPE timer = world.time @@ -224,7 +219,6 @@ //now move the actual emergency shuttle to centcomm for(var/area/shuttle/escape/E in world) to_chat(E, 'sound/effects/hyperspace_end.ogg') - dock(shuttle_master.getDock("emergency_away")) mode = SHUTTLE_ENDGAME timer = 0 @@ -276,7 +270,6 @@ /obj/machinery/computer/shuttle/pod/emag_act(mob/user as mob) to_chat(user, " Access requirements overridden. The pod may now be launched manually at any time.") - admin_controlled = 0 icon_state = "dorm_emag" diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index 49dde9cb4d9..2f7c0c06496 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -686,7 +686,6 @@ to_chat(usr, "Invalid shuttle requested.") else to_chat(usr, "Unable to comply.") - updateUsrDialog() /obj/machinery/computer/shuttle/emag_act(mob/user) @@ -695,7 +694,6 @@ emagged = 1 to_chat(user, "You fried the consoles ID checking system.") - /obj/machinery/computer/shuttle/ferry name = "transport ferry console" circuit = /obj/item/weapon/circuitboard/ferry diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index d67c5142175..3245f6872dc 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -559,7 +559,6 @@ /obj/machinery/computer/supplycomp/attack_hand(var/mob/user as mob) if(!allowed(user) && !isobserver(user)) to_chat(user, "Access denied.") - return 1 post_signal("supply") @@ -569,7 +568,6 @@ /obj/machinery/computer/supplycomp/emag_act(user as mob) if(!hacked) to_chat(user, "Special supplies unlocked.") - hacked = 1 return @@ -654,7 +652,6 @@ if(href_list["send"]) if(shuttle_master.supply.canMove()) to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.") - else if(shuttle_master.supply.getDockedId() == "supply_home") shuttle_master.toggleShuttle("supply", "supply_home", "supply_away", 1) investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents: [shuttle_master.sold_atoms]", "cargo") @@ -722,7 +719,6 @@ investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [shuttle_master.points].", "cargo") else to_chat(usr, "There are insufficient supply points for this request.") - break else if (href_list["rreq"]) diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 0ce399c827b..b1afd14bcf5 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -17,7 +17,6 @@ if(href_list["move"]) if(challenge && world.time < SYNDICATE_CHALLENGE_TIMER) to_chat(usr, "You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.") - return 0 ..() @@ -33,7 +32,6 @@ if(href_list["move"]) if(z != ZLEVEL_CENTCOMM) to_chat(usr, "Pods are one way!") - return 0 ..() diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index fbe38ecd29f..2810617bd12 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -50,7 +50,6 @@ if(!Checks()) return to_chat(owner, "You grit your teeth and burst the implanted [target]!") - add_logs(owner, null, "swallowed an implanted pill", target) if(target.reagents.total_volume) target.reagents.reaction(owner, INGEST) diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm index 1cd7feac6d7..a21a7422696 100644 --- a/code/modules/surgery/helpers.dm +++ b/code/modules/surgery/helpers.dm @@ -58,7 +58,6 @@ if(current_surgery.status == 1 ) M.surgeries -= current_surgery to_chat(user, "You stop the surgery.") - qdel(current_surgery) else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel) M.surgeries -= current_surgery @@ -73,7 +72,6 @@ to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!") - return 1 return 0 diff --git a/code/modules/surgery/implant.dm b/code/modules/surgery/implant.dm index 009bc7aac4b..45da3bce5b6 100644 --- a/code/modules/surgery/implant.dm +++ b/code/modules/surgery/implant.dm @@ -157,7 +157,6 @@ break if(istype(tool,/obj/item/weapon/cautery)) to_chat(user, "you prepare to close the cavity wall.") - else if(tool) user.visible_message("[user] starts putting \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ "You start putting \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) @@ -174,17 +173,14 @@ if(istype(tool, /obj/item/weapon/disk/nuclear)) to_chat(user, "Central command would kill you if you implanted the disk into someone.") - return 0//fail if(istype(tool,/obj/item/organ)) to_chat(user, "This isn't the type of surgery for organ transplants!") - return 0//fail if(!user.canUnEquip(tool, 0)) to_chat(user, "[tool] is stuck to your hand, you can't put it in [target]!") - return 0 if(istype(tool,/obj/item/weapon/cautery)) @@ -192,14 +188,12 @@ else if(tool) if(IC) to_chat(user, "There seems to be something in there already!") - return 1 else user.visible_message(" [user] puts \the [tool] inside [target]'s [get_cavity(affected)] cavity.", \ " You put \the [tool] inside [target]'s [get_cavity(affected)] cavity." ) if((tool.w_class > get_max_wclass(affected)/2 && prob(50) && !(affected.status & ORGAN_ROBOT))) to_chat(user, " You tear some vessels trying to fit the object in the cavity.") - var/datum/wound/internal_bleeding/I = new () affected.wounds += I affected.owner.custom_pain("You feel something rip in your [affected.name]!", 1) @@ -216,7 +210,6 @@ return 1 else to_chat(user, "You don't find anything in [target]'s [target_zone].") - return 0 @@ -372,9 +365,7 @@ user.visible_message("[user] sucessfully removes [objects] objects from [H]'s [L.limb_name]!", "You sucessfully remove [objects] objects from [H]'s [L.limb_name].") else to_chat(user, "You find no objects embedded in [H]'s [L.limb_name]!") - else to_chat(user, "You can't find [target]'s [target_zone], let alone any objects embedded in it!") - return 1 \ No newline at end of file diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm index b75e1699c09..679a98c98f4 100644 --- a/code/modules/surgery/organs/augments_eyes.dm +++ b/code/modules/surgery/organs/augments_eyes.dm @@ -37,7 +37,6 @@ HMN.update_eyes() if(aug_message && !special) to_chat(owner, "[aug_message]") - M.sight |= vision_flags /obj/item/organ/internal/cyberimp/eyes/remove(var/mob/living/carbon/M, var/special = 0) @@ -61,7 +60,6 @@ if(prob(10 * severity)) return to_chat(owner, "Static obfuscates your vision!") - owner.flash_eyes(visual = 1) diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm index 622a484bb8b..a5af2caca3d 100644 --- a/code/modules/surgery/organs/augments_internal.dm +++ b/code/modules/surgery/organs/augments_internal.dm @@ -35,7 +35,6 @@ var/stun_amount = 5 + (severity-1 ? 0 : 5) owner.Stun(stun_amount) to_chat(owner, "Your body seizes up!") - return stun_amount @@ -73,7 +72,6 @@ if(!l_hand_obj && !r_hand_obj) to_chat(owner, "You are not holding any items, your hands relax...") - active = 0 else var/msg = 0 @@ -82,17 +80,13 @@ switch(msg) if(1) to_chat(owner, "Your left hand's grip tightens.") - if(2) to_chat(owner, "Your right hand's grip tightens.") - if(3) to_chat(owner, "Both of your hand's grips tighten.") - else release_items() to_chat(owner, "Your hands relax...") - l_hand_obj = null r_hand_obj = null @@ -110,13 +104,11 @@ A = pick(oview(range)) L_item.throw_at(A, range, 2) to_chat(owner, "Your left arm spasms and throws the [L_item.name]!") - if(R_item) A = pick(oview(range)) R_item.throw_at(A, range, 2) to_chat(owner, "Your right arm spasms and throws the [R_item.name]!") - /obj/item/organ/internal/cyberimp/brain/anti_drop/proc/release_items() if(!l_hand_ignore && l_hand_obj in owner.contents) l_hand_obj.flags ^= NODROP @@ -181,7 +173,6 @@ if(owner.nutrition <= hunger_threshold) synthesizing = 1 to_chat(owner, "You feel less hungry...") - owner.nutrition += 50 spawn(50) synthesizing = 0 @@ -192,7 +183,6 @@ owner.reagents.add_reagent("????",poison_amount / severity) //food poisoning to_chat(owner, "You feel like your insides are burning.") - /obj/item/organ/internal/cyberimp/chest/nutriment/plus name = "Nutriment pump implant PLUS" desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are hungry." @@ -258,7 +248,6 @@ if(H.stat == CONSCIOUS) to_chat(H, "You feel your heart beating again!") - //ARM...THAT GO IN THE CHEST /obj/item/organ/internal/cyberimp/chest/arm_mod//dummy parent item for making arm-mod implants. works best with nodrop items that are sent to nullspace upon being dropped. name = "Arm-mounted item implant" @@ -276,7 +265,6 @@ /obj/item/organ/internal/cyberimp/chest/arm_mod/ui_action_click() if(overloaded)//ensure the implant isn't broken to_chat(owner, "The implant doesn't respond. It seems to be broken...") - return if(out)//check if the owner has the item out already owner.unEquip(holder, 1)//if he does, take it away. then, @@ -294,7 +282,6 @@ holder.loc = null//keep it in nullspace to_chat(owner, "You can't extend [holder] if you can't use your hands!") - /obj/item/organ/internal/cyberimp/chest/arm_mod/emp_act(severity)//if the implant gets EMPed... if(!owner || overloaded)//ensure that it's in an owner and that it's not already EMPed, then... return @@ -306,7 +293,6 @@ owner.visible_message("A loud bang comes from [owner]...") playsound(get_turf(owner), 'sound/effects/bang.ogg', 100, 1) to_chat(owner, "You feel an explosion erupt inside you as your chest implant breaks. Is it hot in here?") - owner.adjust_fire_stacks(20) owner.IgniteMob()//ignite the owner, as well as owner.say("AUUUUUUUUUUUUUUUUUUGH!!") diff --git a/code/modules/surgery/organs/autoimplanter.dm b/code/modules/surgery/organs/autoimplanter.dm index 117210f732f..5c2aa1193d9 100644 --- a/code/modules/surgery/organs/autoimplanter.dm +++ b/code/modules/surgery/organs/autoimplanter.dm @@ -9,7 +9,6 @@ /obj/item/device/autoimplanter/attack_self(mob/user)//when the object it used... if(!storedorgan) to_chat(user, "[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.") @@ -20,21 +19,17 @@ if(istype(I, /obj/item/organ/internal/cyberimp)) if(storedorgan) to_chat(user, "[src] already has an implant stored.") - return if(!user.drop_item()) return I.forceMove(src) storedorgan = I to_chat(user, "You insert the [I] into [src].") - else if(istype(I, /obj/item/weapon/screwdriver)) if(!storedorgan) to_chat(user, "There's no implant in [src] for you to remove.") - else storedorgan.forceMove(get_turf(user)) storedorgan = null to_chat(user, "You remove the [storedorgan] from [src].") - playsound(get_turf(user), 'sound/items/Screwdriver.ogg', 50, 1) diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index 5487df397dc..f2dd4c3c778 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -127,11 +127,9 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 update_body() var/word = pick("dizzy","woosey","faint") to_chat(src, "\red You feel [word]") - if(prob(1)) var/word = pick("dizzy","woosey","faint") to_chat(src, "\red You feel [word]") - if(oxyloss < 20) oxyloss += 3 if(BLOOD_VOLUME_BAD to BLOOD_VOLUME_OKAY) @@ -146,7 +144,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 Paralyse(rand(1,3)) var/word = pick("dizzy","woosey","faint") to_chat(src, "\red You feel very [word]") - if(BLOOD_VOLUME_SURVIVE to BLOOD_VOLUME_BAD) if(!pale) pale = 1 @@ -158,7 +155,6 @@ var/const/BLOOD_VOLUME_SURVIVE = 122 Paralyse(rand(1,3)) var/word = pick("dizzy","woosey","faint") to_chat(src, "\red You feel extremely [word]") - if(0 to BLOOD_VOLUME_SURVIVE) death() diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm index ef9d3a4ca4b..3653e3df327 100644 --- a/code/modules/surgery/organs/body_egg.dm +++ b/code/modules/surgery/organs/body_egg.dm @@ -10,7 +10,6 @@ ..() to_chat(finder, "You found an unknown alien organism in [owner]'s [parent_organ]!") - /obj/item/organ/internal/body_egg/insert(var/mob/living/carbon/M, special = 0) ..() owner.status_flags |= XENO_HOST diff --git a/code/modules/surgery/organs/organ.dm b/code/modules/surgery/organs/organ.dm index 7a9c0886191..3bce602694a 100644 --- a/code/modules/surgery/organs/organ.dm +++ b/code/modules/surgery/organs/organ.dm @@ -145,7 +145,6 @@ var/list/organ_cache = list() if(status & ORGAN_DEAD) to_chat(user, "The decay has set in.") - /obj/item/organ/proc/handle_germ_effects() //** Handle the effects of infections var/antibiotics = owner.reagents.get_reagent_amount("spaceacillin") diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm index 8312bc4c5bb..ac96bd0f775 100644 --- a/code/modules/surgery/organs/organ_external.dm +++ b/code/modules/surgery/organs/organ_external.dm @@ -294,7 +294,6 @@ var/obj/item/organ/external/stump/S = locate() in children if(S) // to_chat(world, "Extra healing to go around ([brute+burn]) and [owner] needs a replacement limb.") - */ //Sync the organ's damage with its wounds @@ -530,7 +529,6 @@ Note that amputating the affected organ does in fact remove the infection from t if (!(status & ORGAN_DEAD)) status |= ORGAN_DEAD to_chat(owner, "You can't feel your [name] anymore...") - owner.update_body(1) germ_level++ diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index d429f161928..1794a896207 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -303,7 +303,6 @@ if (germ_level > INFECTION_LEVEL_ONE) if(prob(1)) to_chat(owner, " Your skin itches.") - if (germ_level > INFECTION_LEVEL_TWO) if(prob(1)) spawn owner.vomit() @@ -460,13 +459,11 @@ if(organhonked < world.time) organhonked = world.time+900 to_chat(owner, "HONK") - owner.sleeping = 0 owner.stuttering = 20 owner.ear_deaf = 30 owner.Weaken(3) to_chat(owner, 'sound/items/AirHorn.ogg') - if(prob(30)) owner.Stun(10) owner.Paralyse(4) diff --git a/code/modules/surgery/organs/pain.dm b/code/modules/surgery/organs/pain.dm index 7fb022bc9fa..b2f6945b6f1 100644 --- a/code/modules/surgery/organs/pain.dm +++ b/code/modules/surgery/organs/pain.dm @@ -41,7 +41,6 @@ mob/living/carbon/proc/pain(var/partname, var/amount, var/force, var/burning = 0 if(msg && (msg != last_pain_message || prob(10))) last_pain_message = msg to_chat(src, msg) - next_pain_time = world.time + (100 - amount) @@ -66,7 +65,6 @@ mob/living/carbon/human/proc/custom_pain(var/message, var/flash_strength) if(msg && ((msg != last_pain_message) || (world.time >= next_pain_time))) last_pain_message = msg to_chat(src, msg) - next_pain_time = world.time + 100 mob/living/carbon/human/proc/handle_pain() diff --git a/code/modules/surgery/organs/parasites.dm b/code/modules/surgery/organs/parasites.dm index 62bf5a391c8..2d15efdd041 100644 --- a/code/modules/surgery/organs/parasites.dm +++ b/code/modules/surgery/organs/parasites.dm @@ -20,7 +20,6 @@ owner.reagents.add_reagent("histamine", 5) if(5) to_chat(owner, "You feel like something is tearing its way out of your skin...") - owner.reagents.add_reagent("histamine", 10) if(prob(30)) owner.emote("scream") diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm index 7bcadd791bc..5d9bd517d3f 100644 --- a/code/modules/surgery/organs/subtypes/machine.dm +++ b/code/modules/surgery/organs/subtypes/machine.dm @@ -134,7 +134,6 @@ if(!special) to_chat(owner, "Error 404:Optical Sensors not found.") - . = ..() /obj/item/organ/internal/optical_sensor/surgeryize() diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index f23398b610c..83684822a26 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -88,17 +88,14 @@ I = tool if(target_zone != I.parent_organ || target.get_organ_slot(I.slot)) to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!") - return -1 if(I.damage > (I.max_damage * 0.75)) to_chat(user, " \The [I] is in no state to be transplanted.") - return -1 if(target.get_int_organ(I)) to_chat(user, " \The [target] already has [I].") - return -1 if(affected) user.visible_message("[user] starts transplanting \the [tool] into [target]'s [affected.name].", \ @@ -127,7 +124,6 @@ var/list/organs = target.get_organs_zone(target_zone) if(!organs.len) to_chat(user, "There are no removeable organs in [target]'s [parse_zone(target_zone)]!") - return -1 else for(var/obj/item/organ/internal/O in organs) @@ -158,7 +154,6 @@ if(!hasorgans(target)) to_chat(user, "They do not have organs to mend!") - return for(var/obj/item/organ/internal/I in affected.internal_organs) if(I && I.damage > 0) @@ -172,12 +167,10 @@ "You start treating damage to [target]'s [I.name] with [tool_name]." ) to_chat(user, "[I] does not appear to be damaged.") - H.custom_pain("The pain in your [affected.name] is living hell!",1) else if(istype(tool, /obj/item/weapon/reagent_containers/food/snacks/organ)) to_chat(user, "[tool] was biten by someone! It's too damaged to use!") - return -1 ..() @@ -213,7 +206,6 @@ spread_germs_to_organ(I, user) if(!user.canUnEquip(I, 0)) to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") - return 0 if(affected) diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 5d8d6406502..f8051575b05 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -241,13 +241,11 @@ var/braincase = target.named_organ_parent("brain") user.visible_message("[user] reaches into [target]'s head with [tool].", "You begin aligning [tool]'s light to the tumor on [target]'s brain...") to_chat(target, "A small part of your [braincase] pulses with agony as the light impacts it.") - ..() /datum/surgery_step/internal/dethrall/end_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool,datum/surgery/surgery) if(target.get_species() == "Lesser Shadowling") //Empowered thralls cannot be deconverted to_chat(target, "NOT LIKE THIS!") - user.visible_message("[target] suddenly slams upward and knocks down [user]!", \ "[target] suddenly bolts up and slams you with tremendous force!") user.resting = 0 //Remove all stuns diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index 3e685547ad1..da627a57f0d 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -233,7 +233,6 @@ if(istype(C)) if(!C.get_amount() >= 3) to_chat(user, "You need three or more cable pieces to repair this damage.") - return 2 C.use(3) return 1 @@ -291,20 +290,16 @@ if(I.status != ORGAN_ROBOT || I.robotic != 2) to_chat(user, "You can only implant cybernetic organs.") - if(target_zone != I.parent_organ || target.get_organ_slot(I.slot)) to_chat(user, "There is no room for [I] in [target]'s [parse_zone(target_zone)]!") - return -1 if(I.damage > (I.max_damage * 0.75)) to_chat(user, " \The [I] is in no state to be transplanted.") - return -1 if(target.get_int_organ(I)) to_chat(user, " \The [target] already has [I].") - return -1 user.visible_message("[user] begins reattaching [target]'s [tool].", \ @@ -316,7 +311,6 @@ if(target_zone != "chest") to_chat(user, " You must target the chest cavity.") - return -1 var/obj/item/device/mmi/M = tool @@ -329,27 +323,22 @@ if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) to_chat(user, "That brain is not usable.") - return -1 if(!(affected.status & ORGAN_ROBOT)) to_chat(user, "You cannot install a computer brain into a meat enclosure.") - return -1 if(!target.species) to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.") - return -1 if(!target.species.has_organ["brain"]) to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") - return -1 if(target.get_int_organ(/obj/item/organ/internal/brain/)) to_chat(user, "Your subject already has a brain.") - return -1 user.visible_message("[user] starts installing \the [tool] into [target]'s [affected.name].", \ @@ -364,7 +353,6 @@ return -1 if(!organs.len) to_chat(user, "There is no removeable organs in [target]'s [parse_zone(target_zone)]!") - return -1 else for(var/obj/item/organ/internal/O in organs) @@ -421,7 +409,6 @@ if(!user.canUnEquip(I, 0)) to_chat(user, "[I] is stuck to your hand, you can't put it in [target]!") - return 0 user.drop_item() @@ -529,27 +516,22 @@ if(!M.brainmob || !M.brainmob.client || !M.brainmob.ckey || M.brainmob.stat >= DEAD) to_chat(user, "That brain is not usable.") - return 2 if(!(affected.status & ORGAN_ROBOT)) to_chat(user, "You cannot install a computer brain into a meat enclosure.") - return 2 if(!target.species) to_chat(user, "You have no idea what species this person is. Report this on the bug tracker.") - return 2 if(!target.species.has_organ["brain"]) to_chat(user, "You're pretty sure [target.species.name_plural] don't normally have a brain.") - return 2 if(target.get_int_organ(/obj/item/organ/internal/brain/)) to_chat(user, "Your subject already has a brain.") - return 2 return 1 diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index e5aaf88613f..672ae3ac804 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -182,7 +182,6 @@ /proc/spread_germs_to_organ(obj/item/organ/E, mob/living/carbon/human/user) if(!istype(user) || !istype(E)) return // to_chat(world, "Germ spread: [E] : [E.owner]") - var/germ_level = user.germ_level if(user.gloves) germ_level = user.gloves.germ_level diff --git a/code/modules/telesci/telepad.dm b/code/modules/telesci/telepad.dm index 5d93e2ab280..0f1f7c8f582 100644 --- a/code/modules/telesci/telepad.dm +++ b/code/modules/telesci/telepad.dm @@ -48,7 +48,6 @@ M.buffer = src to_chat(user, "You save the data in the [I.name]'s buffer.") - if(exchange_parts(user, I)) return @@ -72,26 +71,21 @@ if(anchored) anchored = 0 to_chat(user, " The [src] can now be moved.") - else if(!anchored) anchored = 1 to_chat(user, " The [src] is now secured.") - if(istype(W, /obj/item/weapon/screwdriver)) if(stage == 0) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, " You unscrew the telepad's tracking beacon.") - stage = 1 else if(stage == 1) playsound(src, 'sound/items/Screwdriver.ogg', 50, 1) to_chat(user, " You screw in the telepad's tracking beacon.") - stage = 0 if(istype(W, /obj/item/weapon/weldingtool) && stage == 1) playsound(src, 'sound/items/Welder.ogg', 50, 1) to_chat(user, " You disassemble the telepad.") - new /obj/item/stack/sheet/metal(get_turf(src)) new /obj/item/stack/sheet/glass(get_turf(src)) qdel(src) @@ -108,7 +102,6 @@ /obj/item/device/telepad_beacon/attack_self(mob/user as mob) if(user) to_chat(user, " Locked In") - new /obj/machinery/telepad_cargo(user.loc) playsound(src, 'sound/effects/pop.ogg', 100, 1, 1) qdel(src) @@ -144,7 +137,6 @@ ..(user) to_chat(user, "There are [round(rcell.charge/chargecost)] charge\s left.") - /obj/item/weapon/rcs/Destroy() if(rcell) qdel(rcell) @@ -157,13 +149,11 @@ mode = 1 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) to_chat(user, " The telepad locator has become uncalibrated.") - else mode = 0 playsound(src.loc, 'sound/effects/pop.ogg', 50, 0) to_chat(user, " You calibrate the telepad locator.") - /obj/item/weapon/rcs/emag_act(user as mob) if(!emagged) emagged = 1 @@ -171,5 +161,4 @@ s.set_up(5, 1, src) s.start() to_chat(user, " You emag the RCS. Activate it to toggle between modes.") - return diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index 0c077bd1698..2640b61bd33 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -46,7 +46,6 @@ ..(user) to_chat(user, "There are [crystals.len ? crystals.len : "no"] bluespace crystal\s in the crystal slots.") - /obj/machinery/computer/telescience/initialize() ..() for(var/i = 1; i <= starting_crystals; i++) @@ -56,7 +55,6 @@ if(istype(W, /obj/item/weapon/ore/bluespace_crystal)) if(crystals.len >= max_crystals) to_chat(user, "There are not enough crystal slots.") - return user.drop_item() crystals += W @@ -76,7 +74,6 @@ telepad = M.buffer M.buffer = null to_chat(user, "You upload the data from the [W.name]'s buffer.") - updateUsrDialog() else ..() @@ -84,12 +81,10 @@ /obj/machinery/computer/telescience/emag_act(user as mob) if (!emagged) to_chat(user, "\blue You scramble the Telescience authentication key to an unknown signal. You should be able to teleport to more places now!") - emagged = 1 else to_chat(user, "\red The machine seems unaffected by the card swipe...") - /obj/machinery/computer/telescience/attack_ai(mob/user) src.attack_hand(user) diff --git a/code/modules/vehicle/train/train.dm b/code/modules/vehicle/train/train.dm index 33f5260728e..ea84d92c4ed 100644 --- a/code/modules/vehicle/train/train.dm +++ b/code/modules/vehicle/train/train.dm @@ -67,7 +67,6 @@ if(istype(load, /mob/living/carbon/human)) var/mob/living/D = load to_chat(D, "\red You hit [M]!") - msg_admin_attack("[key_name_admin(D)] hit [key_name_admin(M)] with [src].") @@ -88,7 +87,6 @@ var/turf/T = get_step_to(src, get_step(src, direction)) if(!T) to_chat(user, "You can't find a clear area to step onto.") - return 0 if(user != load) @@ -101,7 +99,6 @@ to_chat(user, "\blue You climb down from [src].") - return 1 /obj/vehicle/train/MouseDrop_T(var/atom/movable/C, mob/user as mob) @@ -113,7 +110,6 @@ if(!load(C)) to_chat(user, "\red You were unable to load [C] on [src].") - /obj/vehicle/train/attack_hand(mob/user as mob) if(user.stat || user.restrained() || !Adjacent(user)) return 0 @@ -150,17 +146,14 @@ /obj/vehicle/train/proc/attach_to(obj/vehicle/train/T, mob/user) if (get_dist(src, T) > 1) to_chat(user, "\red [src] is too far away from [T] to hitch them together.") - return if (lead) to_chat(user, "\red [src] is already hitched to something.") - return if (T.tow) to_chat(user, "\red [T] is already towing something.") - return //check for cycles. @@ -168,7 +161,6 @@ while (next_car) if (next_car == src) to_chat(user, "\red That seems very silly.") - return next_car = next_car.lead @@ -180,7 +172,6 @@ if(user) to_chat(user, "\blue You hitch [src] to [T].") - update_stats() @@ -188,7 +179,6 @@ /obj/vehicle/train/proc/unattach(mob/user) if (!lead) to_chat(user, "\red [src] is not hitched to anything.") - return lead.tow = null diff --git a/code/modules/vehicle/train/trains/ambulance.dm b/code/modules/vehicle/train/trains/ambulance.dm index 47bbaf647e0..6ef9e9822b2 100644 --- a/code/modules/vehicle/train/trains/ambulance.dm +++ b/code/modules/vehicle/train/trains/ambulance.dm @@ -143,7 +143,6 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load to_chat(D, "\red \b You ran over [H]!") - visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]") msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]") @@ -171,7 +170,6 @@ if(..(user, 1)) to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.") - /obj/vehicle/train/ambulance/engine/verb/check_power() set name = "Check power level" set category = "Object" @@ -182,12 +180,10 @@ if(!cell) to_chat(usr, "There is no power cell installed in [src].") - return to_chat(usr, "The power meter reads [round(cell.percent(), 0.01)]%") - /obj/vehicle/train/ambulance/engine/verb/start_engine() set name = "Start engine" set category = "Object" @@ -198,21 +194,17 @@ if(on) to_chat(usr, "The engine is already running.") - return turn_on() if (on) to_chat(usr, "You start [src]'s engine.") - else if(cell.charge < charge_use) to_chat(usr, "[src] is out of power.") - else to_chat(usr, "[src]'s engine won't start.") - /obj/vehicle/train/ambulance/engine/verb/stop_engine() set name = "Stop engine" set category = "Object" @@ -223,14 +215,12 @@ if(!on) to_chat(usr, "The engine is already stopped.") - return turn_off() if (!on) to_chat(usr, "You stop [src]'s engine.") - /obj/vehicle/train/ambulance/engine/verb/remove_key() set name = "Remove key" set category = "Object" diff --git a/code/modules/vehicle/train/trains/cargo/cargo_train.dm b/code/modules/vehicle/train/trains/cargo/cargo_train.dm index e36982ef1af..8df907b1420 100644 --- a/code/modules/vehicle/train/trains/cargo/cargo_train.dm +++ b/code/modules/vehicle/train/trains/cargo/cargo_train.dm @@ -139,7 +139,6 @@ if(is_train_head() && istype(load, /mob/living/carbon/human)) var/mob/living/carbon/human/D = load to_chat(D, "\red \b You ran over [H]!") - visible_message("\red \The [src] ran over [H]!") attack_log += text("\[[time_stamp()]\] ran over [key_name(H)], driven by [key_name(D)]") msg_admin_attack("[key_name_admin(D)] ran over [key_name_admin(H)]") @@ -168,10 +167,8 @@ return to_chat(user, "The power light is [on ? "on" : "off"].\nThere are[key ? "" : " no"] keys in the ignition.") - to_chat(user, "The charge meter reads [cell? round(cell.percent(), 0.01) : 0]%") - /obj/vehicle/train/cargo/engine/verb/start_engine() set name = "Start engine" set category = "Object" @@ -182,21 +179,17 @@ if(on) to_chat(usr, "The engine is already running.") - return turn_on() if (on) to_chat(usr, "You start [src]'s engine.") - else if(cell.charge < charge_use) to_chat(usr, "[src] is out of power.") - else to_chat(usr, "[src]'s engine won't start.") - /obj/vehicle/train/cargo/engine/verb/stop_engine() set name = "Stop engine" set category = "Object" @@ -207,14 +200,12 @@ if(!on) to_chat(usr, "The engine is already stopped.") - return turn_off() if (!on) to_chat(usr, "You stop [src]'s engine.") - /obj/vehicle/train/cargo/engine/verb/remove_key() set name = "Remove key" set category = "Object" diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm index 42bcf1a9521..105f02148b7 100644 --- a/code/modules/vehicle/vehicle.dm +++ b/code/modules/vehicle/vehicle.dm @@ -87,7 +87,6 @@ open = !open update_icon() to_chat(user, "Maintenance panel is now [open ? "opened" : "closed"].") - else if(istype(W, /obj/item/weapon/crowbar) && cell && open) remove_cell(user) @@ -102,13 +101,10 @@ user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!") else to_chat(user, "Unable to repair with the maintenance panel closed.") - else to_chat(user, "[src] does not need a repair.") - else to_chat(user, "Unable to repair while [src] is off.") - else if(hasvar(W,"force") && hasvar(W,"damtype")) switch(W.damtype) if("fire") @@ -211,7 +207,6 @@ locked = 0 to_chat(user, "You bypass [src]'s controls.") - /obj/vehicle/proc/explode() src.visible_message("\red [src] blows apart!", 1) var/turf/Tsec = get_turf(src) @@ -269,13 +264,11 @@ powercheck() to_chat(usr, "You install [C] in [src].") - /obj/vehicle/proc/remove_cell(var/mob/living/carbon/human/H) if(!cell) return to_chat(usr, "You remove [cell] from [src].") - cell.forceMove(get_turf(H)) H.put_in_hands(cell) cell = null diff --git a/code/world.dm b/code/world.dm index 3a0c990ae46..5ccf544ed59 100644 --- a/code/world.dm +++ b/code/world.dm @@ -83,18 +83,13 @@ var/global/datum/global_init/init = new () //world/Topic(href, href_list[]) // to_chat(world, "Received a Topic() call!") - // to_chat(world, "[href]") - // for(var/a in href_list) // to_chat(world, "[a]") - // if(href_list["hello"]) // to_chat(world, "Hello world!") - // return "Hello world!" // to_chat(world, "End of Topic() call.") - // ..() var/world_topic_spam_protect_ip = "0.0.0.0" @@ -186,15 +181,12 @@ var/world_topic_spam_protect_time = world.timeofday C.irc_admin = input["sender"] to_chat(C, 'sound/effects/adminhelp.ogg') - to_chat(C, message) - for(var/client/A in admins) if(A != C) to_chat(A, amessage) - return "Message Successful" else if("notes" in input) @@ -217,7 +209,6 @@ var/world_topic_spam_protect_time = world.timeofday for(var/client/C in clients) to_chat(C, "PR: [input["announce"]]") - /proc/keySpamProtect(var/addr) if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50) spawn(50) @@ -235,7 +226,6 @@ var/world_topic_spam_protect_time = world.timeofday log_admin("[key_name(usr)] has requested an immediate world restart via client side debugging tools") spawn(0) to_chat(world, "Rebooting world immediately due to host request") - return ..(1) var/delay if(!isnull(time)) @@ -244,16 +234,13 @@ var/world_topic_spam_protect_time = world.timeofday delay = ticker.restart_timeout if(ticker.delay_end) to_chat(world, "An admin has delayed the round end.") - return to_chat(world, "Rebooting world in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]") - sleep(delay) if(blackbox) blackbox.save_all_data_to_sql() if(ticker.delay_end) to_chat(world, "Reboot was cancelled by an admin.") - return feedback_set_details("[feedback_c]","[feedback_r]") log_game("Rebooting world. [reason]") @@ -263,7 +250,6 @@ var/world_topic_spam_protect_time = world.timeofday to_chat(world, sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg')))// random end sounds!! - LastyBatsy - processScheduler.stop() for(var/client/C in clients) @@ -289,7 +275,6 @@ var/world_topic_spam_protect_time = world.timeofday if(!istype(C.mob, /mob/dead)) log_access("AFK: [key_name(C)]") to_chat(C, "\red You have been inactive for more than 10 minutes and have been disconnected.") - del(C) if ( ((world.timeofday - sleep_check) > work_length) || ((world.timeofday - sleep_check) < 0) ) sleep(sleep_length) @@ -338,7 +323,6 @@ var/world_topic_spam_protect_time = world.timeofday fdel(F) to_chat(F, the_mode) - /hook/startup/proc/loadMusic() for(var/obj/machinery/media/jukebox/J in machines) J.process() From bb5e3bca6369b882dd80db4a58bcce37320ef055 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 5 Apr 2016 16:26:11 -0700 Subject: [PATCH 3/4] Fix remaining issues and sound shit --- code/__HELPERS/game.dm | 4 +- .../game/gamemodes/malfunction/malfunction.dm | 2 +- .../gamemodes/miniantags/morph/morph_event.dm | 4 +- .../gamemodes/miniantags/revenant/revenant.dm | 2 +- .../miniantags/slaughter/slaughter.dm | 2 +- code/game/gamemodes/shadowling/shadowling.dm | 3 +- .../shadowling/shadowling_abilities.dm | 2 +- .../special_shadowling_abilities.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 2 +- code/game/machinery/computer/cloning.dm | 2 +- code/game/objects/empulse.dm | 3 +- code/game/objects/explosion.dm | 2 +- code/game/sound.dm | 4 +- code/modules/admin/admin_memo.dm | 5 +- code/modules/admin/admin_verbs.dm | 2 +- code/modules/admin/topic.dm | 2 +- code/modules/admin/verbs/adminhelp.dm | 4 +- code/modules/admin/verbs/adminpm.dm | 2 +- code/modules/admin/verbs/playsound.dm | 12 ++--- code/modules/flufftext/Hallucination.dm | 46 +++++++++---------- .../living/simple_animal/friendly/mouse.dm | 4 +- code/modules/power/supermatter/supermatter.dm | 3 +- code/modules/projectiles/targeting.dm | 4 +- code/modules/reagents/Chemistry-Readme.dm | 6 +-- code/modules/shuttle/emergency.dm | 6 +-- code/modules/surgery/organs/organ_internal.dm | 2 +- code/world.dm | 2 +- 27 files changed, 65 insertions(+), 69 deletions(-) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 3542948ae10..b386fce364f 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -486,14 +486,14 @@ proc/pollCandidates(var/Question, var/be_special_type, var/antag_age_check = 0, if(G.has_enabled_antagHUD) continue spawn(0) - to_chat(G, 'sound/misc/notice2.ogg')//Alerting them to their consideration + G << 'sound/misc/notice2.ogg'//Alerting them to their consideration switch(alert(G,Question,"Please answer in [poll_time/10] seconds!","Yes","No")) if("Yes") to_chat(G, "Choice registered: Yes.") if((world.time-time_passed)>poll_time)//If more than 30 game seconds passed. to_chat(G, "Sorry, you were too late for the consideration!") - to_chat(G, 'sound/machines/buzz-sigh.ogg') + G << 'sound/machines/buzz-sigh.ogg' return candidates += G if("No") diff --git a/code/game/gamemodes/malfunction/malfunction.dm b/code/game/gamemodes/malfunction/malfunction.dm index ce257175636..79e864becf0 100644 --- a/code/game/gamemodes/malfunction/malfunction.dm +++ b/code/game/gamemodes/malfunction/malfunction.dm @@ -217,7 +217,7 @@ ticker.mode:to_nuke_or_not_to_nuke = 0 ticker.mode:explosion_in_progress = 1 for(var/mob/M in player_list) - to_chat(M, 'sound/machines/Alarm.ogg') + M << 'sound/machines/Alarm.ogg' var/obj/item/device/radio/R = new (src) var/AN = "Self-Destruct System" diff --git a/code/game/gamemodes/miniantags/morph/morph_event.dm b/code/game/gamemodes/miniantags/morph/morph_event.dm index 3a822467c66..2e11c65078c 100644 --- a/code/game/gamemodes/miniantags/morph/morph_event.dm +++ b/code/game/gamemodes/miniantags/morph/morph_event.dm @@ -9,7 +9,7 @@ return kill() var/mob/C = pick(candidates) key_of_morph = C.key - + if(!key_of_morph) return kill() @@ -23,7 +23,7 @@ player_mind.special_role = "Morph" ticker.mode.traitors |= player_mind to_chat(S, S.playstyle_string) - to_chat(S, 'sound/magic/Mutate.ogg') + S << 'sound/magic/Mutate.ogg' message_admins("[key_of_morph] has been made into morph by an event.") log_game("[key_of_morph] was spawned as a morph by an event.") return 1 diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 2dba746824a..0e048b85df0 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -119,7 +119,7 @@ spawn(5) if(src.mind) src.mind.wipe_memory() - to_chat(src, 'sound/effects/ghost.ogg') + src << 'sound/effects/ghost.ogg' to_chat(src, "
") to_chat(src, "You are a revenant.") to_chat(src, "Your formerly mundane spirit has been infused with alien energies and empowered into a revenant.") diff --git a/code/game/gamemodes/miniantags/slaughter/slaughter.dm b/code/game/gamemodes/miniantags/slaughter/slaughter.dm index f288cf39435..6f97740f8d5 100644 --- a/code/game/gamemodes/miniantags/slaughter/slaughter.dm +++ b/code/game/gamemodes/miniantags/slaughter/slaughter.dm @@ -57,7 +57,7 @@ if(mind) to_chat(src, src.playstyle_string) to_chat(src, "You are not currently in the same plane of existence as the station. Ctrl+Click a blood pool to manifest.") - to_chat(src, 'sound/misc/demon_dies.ogg') + src << 'sound/misc/demon_dies.ogg' mind.current.verbs += /mob/living/simple_animal/slaughter/proc/slaughterWhisper if(!(vialspawned)) var/datum/objective/slaughter/objective = new diff --git a/code/game/gamemodes/shadowling/shadowling.dm b/code/game/gamemodes/shadowling/shadowling.dm index ef098c87f91..5c6ca539f91 100644 --- a/code/game/gamemodes/shadowling/shadowling.dm +++ b/code/game/gamemodes/shadowling/shadowling.dm @@ -320,8 +320,7 @@ Made by Xhuis H.take_overall_damage(0, LIGHT_DAMAGE_TAKEN) if(H.stat != DEAD) to_chat(H, "The light burns you!")//Message spam to say "GET THE FUCK OUT" - - to_chat(H, 'sound/weapons/sear.ogg') + H << 'sound/weapons/sear.ogg' else if(light_amount < LIGHT_HEAL_THRESHOLD) H.heal_overall_damage(5, 5) H.adjustToxLoss(-5) diff --git a/code/game/gamemodes/shadowling/shadowling_abilities.dm b/code/game/gamemodes/shadowling/shadowling_abilities.dm index 5421789c0ea..b350a0556d3 100644 --- a/code/game/gamemodes/shadowling/shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/shadowling_abilities.dm @@ -565,7 +565,7 @@ datum/reagent/shadowling_blindness_smoke/on_mob_life(var/mob/living/M as mob) else if(issilicon(target)) var/mob/living/silicon/S = target to_chat(S, "ERROR $!(@ ERROR )#^! SENSORY OVERLOAD \[$(!@#") - to_chat(S, 'sound/misc/interference.ogg') + S << 'sound/misc/interference.ogg' 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) diff --git a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm index 80be87570f2..98f81f1d128 100644 --- a/code/game/gamemodes/shadowling/special_shadowling_abilities.dm +++ b/code/game/gamemodes/shadowling/special_shadowling_abilities.dm @@ -156,7 +156,7 @@ var/list/possibleShadowlingNames = list("U'ruan", "Y`shej", "Nex", "Hel-uae", "N M.Weaken(10) to_chat(M, "An immense pressure slams you onto the ground!") to_chat(world, "\"VYSHA NERADA YEKHEZET U'RUU!!\"") - to_chat(world, 'sound/hallucinations/veryfar_noise.ogg') + world << 'sound/hallucinations/veryfar_noise.ogg' for(var/obj/machinery/power/apc/A in apcs) A.overload_lighting() var/mob/A = new /mob/living/simple_animal/ascendant_shadowling(H.loc) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index ae6a9a30867..4dc42aacb4f 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -782,7 +782,7 @@ var/global/list/multiverse = list() GiveHint(target) else if(istype(I,/obj/item/weapon/bikehorn)) to_chat(target, "HONK") - to_chat(target, 'sound/items/AirHorn.ogg') + target << 'sound/items/AirHorn.ogg' target.ear_damage += rand(0,3) GiveHint(target) cooldown = world.time +cooldown_time diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 4e51c1e1dad..0818dccbe35 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -326,7 +326,7 @@ var/mob/selected = find_dead_player("[C.ckey]") if(!selected) return - to_chat(selected, 'sound/machines/chime.ogg')//probably not the best sound but I think it's reasonable + selected << 'sound/machines/chime.ogg' //probably not the best sound but I think it's reasonable var/answer = alert(selected,"Do you want to return to life?","Cloning","Yes","No") if(answer != "No" && pod.growclone(C)) diff --git a/code/game/objects/empulse.dm b/code/game/objects/empulse.dm index 6bf7b8dac11..ce7efc4fee3 100644 --- a/code/game/objects/empulse.dm +++ b/code/game/objects/empulse.dm @@ -15,8 +15,7 @@ light_range = heavy_range for(var/mob/M in range(heavy_range, epicenter)) - to_chat(M, 'sound/effects/EMPulse.ogg') - + M << 'sound/effects/EMPulse.ogg' for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) if(distance < 0) diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm index d21767cb4c0..caaf79a9981 100644 --- a/code/game/objects/explosion.dm +++ b/code/game/objects/explosion.dm @@ -73,7 +73,7 @@ for(var/mob/M in world) if(M.z == epicenter.z) if(!(M in close)) // check if the mob can hear if(M.ear_deaf <= 0 || !M.ear_deaf) if(!istype(M.loc,/turf/space)) - to_chat(M, 'sound/effects/explosionfar.ogg') + M << 'sound/effects/explosionfar.ogg' if(heavy_impact_range > 1) var/datum/effect/system/explosion/E = new/datum/effect/system/explosion() diff --git a/code/game/sound.dm b/code/game/sound.dm index 264b5f93565..cecf12c657d 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -93,12 +93,12 @@ var/const/FALLOFF_SOUNDS = 0.5 S.falloff = (falloff ? falloff : FALLOFF_SOUNDS) if(!is_global) S.environment = 2 - to_chat(src, S) + src << S /client/proc/playtitlemusic() if(!ticker || !ticker.login_music || config.disable_lobby_music) return if(prefs.sound & SOUND_LOBBY) - to_chat(src, sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1))// MAD JAMS + src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS /proc/get_rand_frequency() diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm index 3a1fec11bb4..489be7b68dc 100644 --- a/code/modules/admin/admin_memo.dm +++ b/code/modules/admin/admin_memo.dm @@ -1,7 +1,7 @@ /client/proc/admin_memo() set name = "Memo" set category = "Server" - if(!check_rights(R_SERVER)) + if(!check_rights(R_SERVER)) return if(!dbcon.IsConnected()) to_chat(src, "Failed to establish database connection.") @@ -102,7 +102,7 @@ if(!output && !silent) to_chat(src, "No memos found in database.") return - src << output + to_chat(src, output) if("Remove") var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]") if(!query_memodellist.Execute()) @@ -131,4 +131,3 @@ else log_admin("[key_name(src)] has removed [target_sql_ckey]'s memo.") message_admins("[key_name_admin(src)] has removed [target_sql_ckey]'s memo.") - \ No newline at end of file diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index ca20df573ec..a2d62b29c8a 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -918,7 +918,7 @@ var/list/admin_verbs_proccall = list ( if(confirm == "Yes") for (var/mob/T as mob in mob_list) to_chat(T, "
Man up.
Deal with it.
Move on.

") - to_chat(T, 'sound/voice/ManUp1.ogg') + T << 'sound/voice/ManUp1.ogg' log_admin("[key_name(usr)] told everyone to man up and deal with it.") message_admins("[key_name_admin(usr)] told everyone to man up and deal with it.") diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 49a06ac5947..60e196c7982 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -17,7 +17,7 @@ if(!C) return - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' to_chat(C, "- AdminHelp Rejected! -") to_chat(C, "Your admin help was rejected.") diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index ffebb5ce698..fce0201c765 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -112,13 +112,13 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey"," msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]" for(var/client/X in mentorholders + modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) - to_chat(X, 'sound/effects/adminhelp.ogg') + X << 'sound/effects/adminhelp.ogg' to_chat(X, msg) if("Adminhelp") msg = "[selected_type]: [key_name(src, 1, 1, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob, "holder")]) (CA) (REJT) [ai_found ? " (CL)" : ""]: [msg]" for(var/client/X in modholders + adminholders) if(X.prefs.sound & SOUND_ADMINHELP) - to_chat(X, 'sound/effects/adminhelp.ogg') + X << 'sound/effects/adminhelp.ogg' to_chat(X, msg) //show it to the person adminhelping too diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index ad5006611af..e533a4716b6 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -160,7 +160,7 @@ //play the recieving admin the adminhelp sound (if they have them enabled) //non-admins shouldn't be able to disable this if(C.prefs.sound & SOUND_ADMINHELP) - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]") //we don't use message_admins here because the sender/receiver might get it too diff --git a/code/modules/admin/verbs/playsound.dm b/code/modules/admin/verbs/playsound.dm index c363ed51d72..25b0ed54140 100644 --- a/code/modules/admin/verbs/playsound.dm +++ b/code/modules/admin/verbs/playsound.dm @@ -17,7 +17,7 @@ var/list/sounds_cache = list() message_admins("[key_name_admin(src)] played sound [S]", 1) for(var/mob/M in player_list) if(M.client.prefs.sound & SOUND_MIDI) - to_chat(M, uploaded_sound) + M << uploaded_sound feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -86,11 +86,11 @@ var/list/sounds_cache = list() for(var/mob/M in world) if(M.client) if(M.client.midis) - to_chat(M, 'cubanpetetime.ogg') + M << 'cubanpetetime.ogg' for(var/mob/living/carbon/human/CP in world) if(CP.real_name=="Cuban Pete" && CP.key!="Rosham") - to_chat(CP, "Your body can't contain the rhumba beat") + C << "Your body can't contain the rhumba beat" CP.gib() @@ -102,7 +102,7 @@ var/list/sounds_cache = list() for(var/mob/M in world) if(M.client) if(M.client.midis) - to_chat(M, 'bananaphone.ogg') + M << 'bananaphone.ogg' client/proc/space_asshole() @@ -113,7 +113,7 @@ client/proc/space_asshole() for(var/mob/M in world) if(M.client) if(M.client.midis) - to_chat(M, 'sound/music/space_asshole.ogg') + M << 'sound/music/space_asshole.ogg' client/proc/honk_theme() @@ -124,4 +124,4 @@ client/proc/honk_theme() for(var/mob/M in world) if(M.client) if(M.client.midis) - to_chat(M, 'honk_theme.ogg')*/ + M << 'honk_theme.ogg'*/ diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 69fbd9bc1fc..c4088d9a53f 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -421,7 +421,7 @@ Gunshots/explosions/opening doors/less rare audio (done) step_away(src,my_target,2) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) - to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))) + my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) my_target.visible_message("[my_target] flails around wildly.", \ "[my_target] has attacked [src]!") @@ -476,7 +476,7 @@ Gunshots/explosions/opening doors/less rare audio (done) if(prob(15)) src.do_attack_animation(my_target) if(weapon_name) - to_chat(my_target, sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg'))) + my_target << sound(pick('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')) my_target.show_message("[src.name] has attacked [my_target] with [weapon_name]!", 1) my_target.staminaloss += 30 if(prob(20)) @@ -485,7 +485,7 @@ Gunshots/explosions/opening doors/less rare audio (done) if(!locate(/obj/effect/overlay) in my_target.loc) fake_blood(my_target) else - to_chat(my_target, sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))) + my_target << sound(pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')) my_target.show_message("[src.name] has punched [my_target]!", 1) my_target.staminaloss += 30 if(prob(33)) @@ -618,36 +618,36 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite // to_chat(src, "Strange Audio") switch(rand(1,18)) if(1) - to_chat(src, 'sound/machines/airlock.ogg') + src << 'sound/machines/airlock.ogg' if(2) if(prob(50)) - to_chat(src, 'sound/effects/Explosion1.ogg') + src << 'sound/effects/Explosion1.ogg' else - to_chat(src, 'sound/effects/Explosion2.ogg') + src << 'sound/effects/Explosion2.ogg' if(3) - to_chat(src, 'sound/effects/explosionfar.ogg') + src << 'sound/effects/explosionfar.ogg' if(4) - to_chat(src, 'sound/effects/Glassbr1.ogg') + src << 'sound/effects/Glassbr1.ogg' if(5) - to_chat(src, 'sound/effects/Glassbr2.ogg') + src << 'sound/effects/Glassbr2.ogg' if(6) - to_chat(src, 'sound/effects/Glassbr3.ogg') + src << 'sound/effects/Glassbr3.ogg' if(7) - to_chat(src, 'sound/machines/twobeep.ogg') + src << 'sound/machines/twobeep.ogg' if(8) - to_chat(src, 'sound/machines/windowdoor.ogg') + src << 'sound/machines/windowdoor.ogg' if(9) //To make it more realistic, I added two gunshots (enough to kill) - to_chat(src, 'sound/weapons/Gunshot.ogg') + src << 'sound/weapons/Gunshot.ogg' spawn(rand(10,30)) - to_chat(src, 'sound/weapons/Gunshot.ogg') + src << 'sound/weapons/Gunshot.ogg' if(10) - to_chat(src, 'sound/weapons/smash.ogg') + src << 'sound/weapons/smash.ogg' if(11) //Same as above, but with tasers. - to_chat(src, 'sound/weapons/Taser.ogg') + src << 'sound/weapons/Taser.ogg' spawn(rand(10,30)) - to_chat(src, 'sound/weapons/Taser.ogg') + src << 'sound/weapons/Taser.ogg' //Rare audio if(12) //These sounds are (mostly) taken from Hidden: Source @@ -656,21 +656,21 @@ var/list/non_fakeattack_weapons = list(/obj/item/weapon/gun/projectile, /obj/ite 'sound/hallucinations/growl3.ogg', 'sound/hallucinations/im_here1.ogg', 'sound/hallucinations/im_here2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg',\ 'sound/hallucinations/look_up1.ogg', 'sound/hallucinations/look_up2.ogg', 'sound/hallucinations/over_here1.ogg', 'sound/hallucinations/over_here2.ogg', 'sound/hallucinations/over_here3.ogg',\ 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg', 'sound/hallucinations/veryfar_noise.ogg', 'sound/hallucinations/wail.ogg') - to_chat(src, pick(creepyasssounds)) + src << pick(creepyasssounds) if(13) to_chat(src, "You feel a tiny prick!") if(14) to_chat(src, "

Priority Announcement

") to_chat(src, "

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

") - to_chat(src, sound('sound/AI/shuttledock.ogg')) + src << sound('sound/AI/shuttledock.ogg') if(15) - to_chat(src, 'sound/items/Welder.ogg') + src << 'sound/items/Welder.ogg' if(16) - to_chat(src, 'sound/items/Screwdriver.ogg') + src << 'sound/items/Screwdriver.ogg' if(17) - to_chat(src, 'sound/weapons/saberon.ogg') + src << 'sound/weapons/saberon.ogg' if(18) - to_chat(src, 'sound/weapons/saberoff.ogg') + src << 'sound/weapons/saberoff.ogg' if("hudscrew") //Screwy HUD // to_chat(src, "Screwy HUD") diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index e6d48812842..b269256f7a0 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -37,7 +37,7 @@ ..() if(prob(speak_chance)) for(var/mob/M in view()) - to_chat(M, 'sound/effects/mousesqueek.ogg') + M << 'sound/effects/mousesqueek.ogg' /mob/living/simple_animal/mouse/Life() . = ..() @@ -113,7 +113,7 @@ if(!stat) var/mob/M = AM to_chat(M, "\blue \icon[src] Squeek!") - to_chat(M, 'sound/effects/mousesqueek.ogg') + M << 'sound/effects/mousesqueek.ogg' ..() /mob/living/simple_animal/mouse/death() diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index dcce2bb23ae..5bb36c06187 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -224,8 +224,7 @@ message_admins("Singularity has consumed a supermatter shard and can now become stage six.") visible_message("[src] is consumed by the singularity!") for(var/mob/M in mob_list) - to_chat(M, 'sound/effects/supermatter.ogg')//everyone goan know bout this - + M << 'sound/effects/supermatter.ogg' //everyone gunna know bout this to_chat(M, "A horrible screeching fills your ears, and a wave of dread washes over you...") qdel(src) return(gain) diff --git a/code/modules/projectiles/targeting.dm b/code/modules/projectiles/targeting.dm index 921cc49c60f..8eb0d7b6b45 100644 --- a/code/modules/projectiles/targeting.dm +++ b/code/modules/projectiles/targeting.dm @@ -157,7 +157,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. else return for(var/mob/living/K in viewers(usr)) - to_chat(K, 'sound/weapons/TargetOn.ogg') + K << 'sound/weapons/TargetOn.ogg' if(!targeted_by) targeted_by = list() targeted_by += I @@ -215,7 +215,7 @@ mob/living/proc/Targeted(var/obj/item/weapon/gun/I) //Self explanitory. mob/living/proc/NotTargeted(var/obj/item/weapon/gun/I) if(!I.silenced) for(var/mob/living/M in viewers(src)) - to_chat(M, 'sound/weapons/TargetOff.ogg') + M << 'sound/weapons/TargetOff.ogg' targeted_by -= I I.target.Remove(src) //De-target them if(!I.target.len) diff --git a/code/modules/reagents/Chemistry-Readme.dm b/code/modules/reagents/Chemistry-Readme.dm index e0540151f7d..fee6e61e2b9 100644 --- a/code/modules/reagents/Chemistry-Readme.dm +++ b/code/modules/reagents/Chemistry-Readme.dm @@ -227,9 +227,9 @@ About the Tools: By default, all atom have a reagents var - but its empty. if you want to use an object for the chem. system you'll need to add something like this in its new proc: - to_chat(var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum , 100 is the maximum_volume of the new holder datum.) - to_chat(reagents = R, <<< assign the new datum to the objects reagents var) - to_chat(R.my_atom = src, <<< set the holders my_atom to src so that we know where we are.) + var/datum/reagents/R = new/datum/reagents(100), <<< create a new datum, 100 is the maximum_volume of the new holder datum. + reagents = R, <<< assign the new datum to the objects reagents var + R.my_atom = src, <<< set the holders my_atom to src so that we know where we are. This can also be done by calling a convenience proc: atom/proc/create_reagents(var/max_volume) diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 1f555693960..31a4fa84280 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -197,7 +197,7 @@ if(time_left <= 50 && !sound_played) //4 seconds left - should sync up with the launch sound_played = 1 for(var/area/shuttle/escape/E in world) - to_chat(E, 'sound/effects/hyperspace_begin.ogg') + E << 'sound/effects/hyperspace_begin.ogg' if(time_left <= 0 && !shuttle_master.emergencyNoEscape) //move each escape pod to its corresponding transit dock @@ -206,7 +206,7 @@ M.enterTransit() //now move the actual emergency shuttle to its transit dock for(var/area/shuttle/escape/E in world) - to_chat(E, 'sound/effects/hyperspace_progress.ogg') + E << 'sound/effects/hyperspace_progress.ogg' enterTransit() mode = SHUTTLE_ESCAPE timer = world.time @@ -218,7 +218,7 @@ M.dock(shuttle_master.getDock("[M.id]_away")) //now move the actual emergency shuttle to centcomm for(var/area/shuttle/escape/E in world) - to_chat(E, 'sound/effects/hyperspace_end.ogg') + E << 'sound/effects/hyperspace_end.ogg' dock(shuttle_master.getDock("emergency_away")) mode = SHUTTLE_ENDGAME timer = 0 diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 1794a896207..248da9d1154 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -463,7 +463,7 @@ owner.stuttering = 20 owner.ear_deaf = 30 owner.Weaken(3) - to_chat(owner, 'sound/items/AirHorn.ogg') + owner << 'sound/items/AirHorn.ogg' if(prob(30)) owner.Stun(10) owner.Paralyse(4) diff --git a/code/world.dm b/code/world.dm index 5ccf544ed59..4c6451d6860 100644 --- a/code/world.dm +++ b/code/world.dm @@ -180,7 +180,7 @@ var/world_topic_spam_protect_time = world.timeofday C.received_irc_pm = world.time C.irc_admin = input["sender"] - to_chat(C, 'sound/effects/adminhelp.ogg') + C << 'sound/effects/adminhelp.ogg' to_chat(C, message) for(var/client/A in admins) From 797740da7da6f8662cb827a2e926ef2c8eb7bbc1 Mon Sep 17 00:00:00 2001 From: Tigercat2000 Date: Tue, 5 Apr 2016 21:16:52 -0700 Subject: [PATCH 4/4] Fix all of the merge conflicts and lacking to_chats with 4041 --- code/game/machinery/buttons.dm | 2 +- code/game/machinery/constructable_frame.dm | 2 +- code/game/machinery/lightswitch.dm | 2 +- code/modules/logic/converter.dm | 8 ++++---- code/modules/logic/logic_base.dm | 16 ++++++++-------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 0934959d20f..afeb5a1f778 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -67,7 +67,7 @@ if(istype(W, /obj/item/weapon/wrench)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30, target = src)) - user << "You detach \the [src] from the wall." + to_chat(user, "You detach \the [src] from the wall.") new/obj/item/mounted/frame/driver_button(get_turf(src)) qdel(src) return 1 diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 49cc616d174..72493bfba6f 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -924,4 +924,4 @@ obj/item/weapon/circuitboard/rdserver build_path = typepath name = "circuit board ([new_name])" if(user) - user << "You set the board to [new_name]." + to_chat(user, "You set the board to [new_name].") diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 41e1587ecd4..3bc2bec5ec4 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -151,7 +151,7 @@ if(istype(W, /obj/item/weapon/wrench)) playsound(get_turf(src), 'sound/items/Ratchet.ogg', 50, 1) if(do_after(user, 30, target = src)) - user << "You detach \the [src] from the wall." + to_chat(user, "You detach \the [src] from the wall.") new/obj/item/mounted/frame/light_switch(get_turf(src)) qdel(src) return 1 diff --git a/code/modules/logic/converter.dm b/code/modules/logic/converter.dm index 635bbf87176..ff4b8ad1db3 100644 --- a/code/modules/logic/converter.dm +++ b/code/modules/logic/converter.dm @@ -32,10 +32,10 @@ if(istype(O, /obj/item/device/assembly/signaler)) var/obj/item/device/assembly/signaler/S = O if(S.secured) - user << "The [S] is already secured." + to_chat(user, "The [S] is already secured.") return if(attached_signaler) - user << "There is already a device attached, remove it first." + to_chat(user, "There is already a device attached, remove it first.") return user.unEquip(S) S.forceMove(src) @@ -46,7 +46,7 @@ else S.receiving = 0 attached_signaler = S - user << "You attach \the [S] to the I/O connection port and secure it." + to_chat(user, "You attach \the [S] to the I/O connection port and secure it.") return if(attached_signaler && istype(O, /obj/item/weapon/screwdriver)) //Makes sure we remove the attached signaler before we can open up and deconstruct the machine var/obj/item/device/assembly/signaler/S = attached_signaler @@ -54,7 +54,7 @@ S.forceMove(get_turf(src)) S.holder = null S.toggle_secure() - user << "You unsecure and detach \the [S] from the I/O connection port." + to_chat(user, "You unsecure and detach \the [S] from the I/O connection port.") return ..() diff --git a/code/modules/logic/logic_base.dm b/code/modules/logic/logic_base.dm index b126b1af214..926b8a1f129 100644 --- a/code/modules/logic/logic_base.dm +++ b/code/modules/logic/logic_base.dm @@ -199,14 +199,14 @@ /obj/machinery/logic_gate/attackby(obj/item/O, mob/user, params) if(tamperproof) - user << "The [src] appears to be tamperproofed! You can't interact with it!" + to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!") return 0 if(istype(O, /obj/item/device/multitool)) update_multitool_menu(user) return 1 if(istype(O, /obj/item/weapon/screwdriver)) panel_open = !panel_open - user << "You [panel_open ? "open" : "close"] the access panel." + to_chat(user, "You [panel_open ? "open" : "close"] the access panel.") return 1 if(panel_open && istype(O, /obj/item/weapon/crowbar)) default_deconstruction_crowbar(O) @@ -218,20 +218,20 @@ /obj/machinery/logic_gate/attack_ai(mob/user) if(tamperproof) - user << "The [src] appears to be tamperproofed! You can't interface with it!" + to_chat(user, "The [src] appears to be tamperproofed! You can't interface with it!") return 0 add_hiddenprint(user) return ui_interact(user) /obj/machinery/logic_gate/attack_ghost(mob/user) if(tamperproof) - user << "The [src] appears to be tamperproofed! You can't haunt it!" + to_chat(user, "The [src] appears to be tamperproofed! You can't haunt it!") return 0 return ui_interact(user) /obj/machinery/logic_gate/attack_hand(mob/user) if(tamperproof) - user << "The [src] appears to be tamperproofed! You can't interact with it!" + to_chat(user, "The [src] appears to be tamperproofed! You can't interact with it!") return 0 . = ..() if(.) @@ -239,15 +239,15 @@ return interact(user) /obj/machinery/logic_gate/attack_alien(mob/user) //No xeno logic, that's too silly. - user << "The [src] appears to be too complex! You can't comprehend it and back off in fear!" + to_chat(user, "The [src] appears to be too complex! You can't comprehend it and back off in fear!") return 0 /obj/machinery/logic_gate/attack_animal(mob/user) //No animal logic either. - user << "The [src] appears to be beyond your comprehension! You can't fathom it!" + to_chat(user, "The [src] appears to be beyond your comprehension! You can't fathom it!") return 0 /obj/machinery/logic_gate/attack_slime(mob/user) //No slime logic. Seriously. - user << "The [src] appears to be beyond your gelatinous understanding! You ignore it!" + to_chat(user, "The [src] appears to be beyond your gelatinous understanding! You ignore it!") return 0 /obj/machinery/logic_gate/emp_act(severity)