From 892cee1705ea8b55d90bddc07dfd2fa24072e4da Mon Sep 17 00:00:00 2001 From: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Date: Thu, 15 Jun 2023 13:04:36 -0400 Subject: [PATCH] Adds grep for mapload and var in Args (#19203) * Adds grep for mapload and var in Args * vars in args * some more * stuff * Update shuttle_creator.dm * Update __techweb_helpers.dm * fix * Update discoball.dm * Update check_grep.sh * Update check_grep.sh * Update check_grep.sh * Update check_grep.sh * I'll finish this later * datum and lateinit maploads * componentinit stuff * mapload fixes * why isnt CI catching these major issues * MERGE CONFLICT FUCKED MY PR OVER * Update check_grep.sh * Update food.dm --- .github/guides/HARDDELETES.md | 4 +- .github/guides/STANDARDS.md | 12 ++-- .github/guides/STYLE.md | 2 +- .../signals/signals_atom/signals_atom_main.dm | 2 +- code/__DEFINES/dcs/signals/signals_object.dm | 2 +- code/__DEFINES/flags.dm | 2 +- code/__DEFINES/subsystems.dm | 4 +- code/__HELPERS/AStar.dm | 4 +- code/__HELPERS/game.dm | 8 +-- code/__HELPERS/heap.dm | 6 +- code/__HELPERS/icon_smoothing.dm | 2 +- code/__HELPERS/matrices.dm | 9 ++- code/__HELPERS/records.dm | 2 +- code/__HELPERS/type2type.dm | 2 +- code/__HELPERS/unsorted.dm | 10 +-- code/__HELPERS/unused.dm | 3 +- code/_onclick/adjacent.dm | 6 +- code/_onclick/ai.dm | 16 +++-- code/_onclick/cyborg.dm | 2 +- code/_onclick/hud/alert.dm | 2 +- code/_onclick/hud/fullscreen.dm | 2 +- code/_onclick/hud/picture_in_picture.dm | 2 +- code/_onclick/hud/plane_master.dm | 4 +- code/_onclick/observer.dm | 2 +- code/_onclick/overmind.dm | 4 +- code/_onclick/pai.dm | 4 +- code/_onclick/telekinesis.dm | 2 +- code/controllers/master.dm | 6 +- code/controllers/subsystem/atoms.dm | 4 +- code/controllers/subsystem/mapping.dm | 2 +- code/controllers/subsystem/pai.dm | 2 +- code/controllers/subsystem/pathfinder.dm | 2 +- code/datums/brain_damage/imaginary_friend.dm | 2 +- code/datums/brain_damage/special.dm | 2 +- code/datums/brain_damage/split_personality.dm | 2 +- code/datums/browser.dm | 22 +++---- code/datums/components/README.md | 4 +- code/datums/components/_component.dm | 2 +- code/datums/components/forced_gravity.dm | 2 +- code/datums/components/knockoff.dm | 2 +- code/datums/components/lifesteal.dm | 2 +- code/datums/components/material_container.dm | 14 ++-- code/datums/components/mind_linker.dm | 2 +- code/datums/components/mood.dm | 2 +- code/datums/components/shrapnel.dm | 2 +- code/datums/components/spawner.dm | 2 - code/datums/components/tactical.dm | 2 +- code/datums/diseases/_disease.dm | 4 +- code/datums/diseases/advance/advance.dm | 4 +- .../diseases/advance/symptoms/narcolepsy.dm | 2 +- .../diseases/advance/symptoms/sensory.dm | 2 +- code/datums/diseases/transformation.dm | 2 +- code/datums/dog_fashion.dm | 2 +- code/datums/martial/krav_maga.dm | 12 ++-- code/datums/martial/wrestling.dm | 2 +- code/datums/materials/_material.dm | 4 +- code/datums/mind.dm | 2 +- code/datums/outfit.dm | 2 +- code/datums/recipe.dm | 6 +- code/datums/status_effects/debuffs/debuffs.dm | 2 +- code/game/area/areas.dm | 6 +- code/game/area/areas/centcom.dm | 2 +- code/game/area/areas/holodeck.dm | 6 +- code/game/area/areas/shuttles.dm | 2 +- code/game/atoms.dm | 2 +- code/game/communications.dm | 8 +-- code/game/gamemodes/clock_cult/clock_cult.dm | 2 +- .../game/gamemodes/clown_ops/clown_weapons.dm | 14 ++-- code/game/gamemodes/clown_ops/honkmother.dm | 2 +- .../dynamic/dynamic_rulesets_latejoin.dm | 2 +- .../dynamic/dynamic_rulesets_midround.dm | 2 +- .../dynamic/dynamic_rulesets_roundstart.dm | 2 +- code/game/gamemodes/meteor/meteors.dm | 6 +- code/game/gamemodes/objective.dm | 2 +- code/game/machinery/Beacon.dm | 2 +- code/game/machinery/PDApainter.dm | 2 +- code/game/machinery/Sleeper.dm | 4 +- code/game/machinery/_machinery.dm | 6 +- code/game/machinery/airlock_control.dm | 2 +- code/game/machinery/airlock_cycle_control.dm | 4 +- code/game/machinery/announcement_system.dm | 2 +- code/game/machinery/aug_manipulator.dm | 2 +- code/game/machinery/autolathe.dm | 4 +- code/game/machinery/bank_machine.dm | 2 +- code/game/machinery/bounty_board.dm | 14 ++-- code/game/machinery/camera/camera.dm | 6 +- code/game/machinery/camera/motion.dm | 2 +- code/game/machinery/camera/presets.dm | 12 ++-- code/game/machinery/cloning.dm | 4 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/arcade.dm | 6 +- code/game/machinery/computer/atmos_alert.dm | 2 +- code/game/machinery/computer/atmos_control.dm | 4 +- code/game/machinery/computer/camera.dm | 4 +- .../machinery/computer/camera_advanced.dm | 4 +- code/game/machinery/computer/card.dm | 4 +- .../game/machinery/computer/communications.dm | 2 +- code/game/machinery/computer/dna_console.dm | 4 +- .../machinery/computer/gulag_teleporter.dm | 2 +- .../machinery/computer/launchpad_control.dm | 2 +- code/game/machinery/computer/law.dm | 2 +- code/game/machinery/computer/pod.dm | 2 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/computer/teleporter.dm | 2 +- code/game/machinery/cryopod.dm | 4 +- code/game/machinery/dance_machine.dm | 11 ++-- code/game/machinery/decontamination.dm | 4 +- code/game/machinery/defibrillator_mount.dm | 2 +- code/game/machinery/deployable.dm | 2 +- code/game/machinery/dish_drive.dm | 2 +- code/game/machinery/doors/airlock.dm | 4 +- code/game/machinery/doors/airlock_types.dm | 4 +- code/game/machinery/doors/alarmlock.dm | 4 +- code/game/machinery/doors/brigdoors.dm | 4 +- code/game/machinery/doors/door.dm | 2 +- code/game/machinery/doors/firedoor.dm | 2 +- code/game/machinery/doors/ministile.dm | 2 +- code/game/machinery/doors/turnstile.dm | 2 +- code/game/machinery/doppler_array.dm | 4 +- code/game/machinery/droneDispenser.dm | 2 +- code/game/machinery/electrolyzer.dm | 2 +- .../embedded_controller/access_controller.dm | 2 +- .../embedded_controller_base.dm | 2 +- code/game/machinery/exp_cloner.dm | 2 +- code/game/machinery/fat_sucker.dm | 2 +- code/game/machinery/flasher.dm | 4 +- code/game/machinery/gulag_processor.dm | 2 +- code/game/machinery/gulag_teleporter.dm | 2 +- code/game/machinery/harvester.dm | 2 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/launch_pad.dm | 4 +- code/game/machinery/lightswitch.dm | 2 +- code/game/machinery/limbgrower.dm | 2 +- code/game/machinery/magnet.dm | 4 +- code/game/machinery/medical_kiosk.dm | 2 +- code/game/machinery/navbeacon.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 8 +-- code/game/machinery/quantum_pad.dm | 2 +- code/game/machinery/rechargestation.dm | 4 +- code/game/machinery/recycler.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/scan_gate.dm | 2 +- code/game/machinery/sci_bombardment.dm | 4 +- code/game/machinery/shieldgen.dm | 2 +- code/game/machinery/shuttle/custom_shuttle.dm | 2 +- code/game/machinery/shuttle/shuttle_engine.dm | 2 +- code/game/machinery/shuttle/shuttle_heater.dm | 4 +- code/game/machinery/slotmachine.dm | 2 +- code/game/machinery/spaceheater.dm | 2 +- code/game/machinery/stasis.dm | 2 +- code/game/machinery/status_display.dm | 4 +- code/game/machinery/syndicatebomb.dm | 4 +- .../machinery/telecomms/computers/message.dm | 2 +- .../machinery/telecomms/machines/allinone.dm | 2 +- .../telecomms/machines/message_server.dm | 2 +- .../machinery/telecomms/machines/receiver.dm | 2 +- .../machinery/telecomms/machines/server.dm | 8 +-- code/game/machinery/teleporter.dm | 6 +- code/game/machinery/transformer.dm | 2 +- code/game/mecha/combat/gygax.dm | 2 +- code/game/mecha/combat/marauder.dm | 6 +- code/game/mecha/combat/reticence.dm | 4 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- .../mecha/equipment/tools/mining_tools.dm | 4 +- .../game/mecha/equipment/tools/other_tools.dm | 8 +-- code/game/mecha/equipment/tools/work_tools.dm | 16 ++--- code/game/mecha/equipment/weapons/weapons.dm | 6 +- code/game/mecha/mech_bay.dm | 4 +- code/game/mecha/mecha.dm | 14 ++-- code/game/mecha/mecha_parts.dm | 2 +- code/game/mecha/working/clarke.dm | 2 +- code/game/mecha/working/ripley.dm | 8 +-- code/game/objects/effects/bump_teleporter.dm | 2 +- code/game/objects/effects/contraband.dm | 2 +- code/game/objects/effects/countdown.dm | 2 +- .../effects/decals/cleanable/aliens.dm | 4 +- .../objects/effects/decals/cleanable/misc.dm | 14 ++-- .../effects/decals/cleanable/robots.dm | 4 +- code/game/objects/effects/decals/decal.dm | 4 +- .../effects/decals/turfdecal/tilecoloring.dm | 6 +- .../effects/effect_system/effect_system.dm | 2 +- .../effect_system/effects_explosion.dm | 4 +- .../effects/effect_system/effects_sparks.dm | 2 +- .../effects/effect_system/effects_water.dm | 4 +- code/game/objects/effects/forcefields.dm | 2 +- code/game/objects/effects/landmarks.dm | 12 ++-- code/game/objects/effects/mines.dm | 4 +- code/game/objects/effects/overlays.dm | 2 +- .../objects/effects/spawners/bombspawner.dm | 4 +- .../objects/effects/spawners/gibspawner.dm | 16 ++--- .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../effects/spawners/minor_variation.dm | 2 +- .../objects/effects/spawners/structure.dm | 34 +++++----- code/game/objects/effects/spawners/traps.dm | 2 +- code/game/objects/effects/spiders.dm | 8 +-- .../effects/temporary_visuals/clockcult.dm | 10 +-- .../temporary_visuals/temporary_visual.dm | 2 +- code/game/objects/items.dm | 6 +- code/game/objects/items/AI_modules.dm | 12 ++-- code/game/objects/items/RCD.dm | 6 +- code/game/objects/items/RCL.dm | 4 +- code/game/objects/items/RPD.dm | 4 +- code/game/objects/items/RSF.dm | 4 +- code/game/objects/items/airlock_painter.dm | 2 +- code/game/objects/items/apc_frame.dm | 2 +- code/game/objects/items/barriertape.dm | 12 ++-- code/game/objects/items/bell.dm | 2 +- code/game/objects/items/body_egg.dm | 4 +- code/game/objects/items/bodybag.dm | 2 +- code/game/objects/items/candle.dm | 2 +- code/game/objects/items/cardboard_cutouts.dm | 2 +- code/game/objects/items/cards_ids.dm | 30 ++++----- code/game/objects/items/charter.dm | 2 +- code/game/objects/items/chrono_eraser.dm | 6 +- code/game/objects/items/cigs_lighters.dm | 16 ++--- .../circuitboards/computer_circuitboards.dm | 2 +- .../circuitboards/machine_circuitboards.dm | 4 +- code/game/objects/items/clown_items.dm | 6 +- code/game/objects/items/control_wand.dm | 2 +- code/game/objects/items/cosmetics.dm | 2 +- code/game/objects/items/crayons.dm | 6 +- code/game/objects/items/defib.dm | 10 +-- code/game/objects/items/devices/PDA/PDA.dm | 2 +- .../objects/items/devices/PDA/PDA_types.dm | 6 +- code/game/objects/items/devices/PDA/cart.dm | 6 +- code/game/objects/items/devices/PDA/radio.dm | 2 +- code/game/objects/items/devices/beacon.dm | 2 +- .../items/devices/busterarm/_buster.dm | 2 +- .../items/devices/busterarm/megabuster.dm | 2 +- .../items/devices/busterarm/wire_snatch.dm | 2 +- code/game/objects/items/devices/camera_bug.dm | 2 +- .../objects/items/devices/chameleonproj.dm | 2 +- .../devices/electroadaptive_pseudocircuit.dm | 2 +- code/game/objects/items/devices/flashlight.dm | 8 +-- .../objects/items/devices/geiger_counter.dm | 2 +- code/game/objects/items/devices/gps.dm | 8 +-- .../objects/items/devices/laserpointer.dm | 4 +- .../objects/items/devices/lightreplacer.dm | 2 +- code/game/objects/items/devices/megaphone.dm | 2 +- code/game/objects/items/devices/multitool.dm | 2 +- code/game/objects/items/devices/paicard.dm | 2 +- .../objects/items/devices/pressureplates.dm | 2 +- .../items/devices/radio/electropack.dm | 2 +- .../items/devices/radio/encryptionkey.dm | 2 +- .../objects/items/devices/radio/headset.dm | 18 ++--- .../game/objects/items/devices/radio/radio.dm | 4 +- .../items/devices/reverse_bear_trap.dm | 2 +- code/game/objects/items/devices/scanners.dm | 2 +- .../objects/items/devices/taperecorder.dm | 2 +- code/game/objects/items/dice.dm | 6 +- code/game/objects/items/discoball.dm | 5 +- code/game/objects/items/etherealdiscoball.dm | 2 +- code/game/objects/items/extinguisher.dm | 8 +-- code/game/objects/items/gems.dm | 8 +-- code/game/objects/items/gift.dm | 2 +- .../objects/items/grenades/chem_grenade.dm | 34 +++++----- .../objects/items/grenades/clusterbuster.dm | 4 +- .../game/objects/items/grenades/ghettobomb.dm | 4 +- code/game/objects/items/grenades/plastic.dm | 4 +- code/game/objects/items/grenades/smokebomb.dm | 2 +- code/game/objects/items/handcuffs.dm | 6 +- code/game/objects/items/his_grace.dm | 2 +- code/game/objects/items/holy_weapons.dm | 20 +++--- .../game/objects/items/implants/implant_bb.dm | 4 +- .../objects/items/implants/implant_chem.dm | 2 +- .../items/implants/implant_greytide.dm | 2 +- .../objects/items/implants/implant_stealth.dm | 2 +- .../objects/items/implants/implantchair.dm | 2 +- code/game/objects/items/inducer.dm | 4 +- code/game/objects/items/kitchen.dm | 4 +- code/game/objects/items/laser_level.dm | 2 +- code/game/objects/items/mail.dm | 2 +- code/game/objects/items/melee/energy.dm | 6 +- code/game/objects/items/melee/misc.dm | 8 +-- code/game/objects/items/melee/transforming.dm | 2 +- code/game/objects/items/mop.dm | 2 +- code/game/objects/items/pinpointer.dm | 2 +- code/game/objects/items/plushes.dm | 4 +- code/game/objects/items/pneumaticCannon.dm | 10 +-- code/game/objects/items/religion.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 12 ++-- code/game/objects/items/robot/robot_parts.dm | 4 +- code/game/objects/items/shields.dm | 4 +- code/game/objects/items/stacks/bscrystal.dm | 2 +- code/game/objects/items/stacks/cash.dm | 2 +- code/game/objects/items/stacks/medical.dm | 2 +- .../game/objects/items/stacks/sheets/glass.dm | 2 +- .../items/stacks/sheets/sheet_types.dm | 2 +- code/game/objects/items/storage/backpack.dm | 18 ++--- code/game/objects/items/storage/bags.dm | 32 ++++----- code/game/objects/items/storage/belt.dm | 62 ++++++++--------- code/game/objects/items/storage/book.dm | 4 +- code/game/objects/items/storage/boxes.dm | 28 ++++---- code/game/objects/items/storage/briefcase.dm | 2 +- code/game/objects/items/storage/fancy.dm | 16 ++--- code/game/objects/items/storage/firstaid.dm | 14 ++-- code/game/objects/items/storage/food.dm | 10 +-- code/game/objects/items/storage/lockbox.dm | 8 +-- code/game/objects/items/storage/secure.dm | 6 +- code/game/objects/items/storage/storage.dm | 2 +- code/game/objects/items/storage/toolbox.dm | 8 +-- .../game/objects/items/storage/uplink_kits.dm | 6 +- code/game/objects/items/storage/wallets.dm | 2 +- code/game/objects/items/stunbaton.dm | 4 +- .../objects/items/supermatter_delaminator.dm | 4 +- .../objects/items/syndicateReverseCard.dm | 2 +- code/game/objects/items/tanks/jetpack.dm | 4 +- code/game/objects/items/tanks/tanks.dm | 2 +- code/game/objects/items/tanks/watertank.dm | 16 ++--- code/game/objects/items/teleportation.dm | 2 +- code/game/objects/items/theft_tools.dm | 4 +- code/game/objects/items/tools/screwdriver.dm | 2 +- code/game/objects/items/tools/weldingtool.dm | 2 +- code/game/objects/items/tools/wirecutters.dm | 2 +- code/game/objects/items/toys.dm | 14 ++-- code/game/objects/items/twohanded.dm | 16 ++--- code/game/objects/items/weaponry.dm | 12 ++-- code/game/objects/obj_defense.dm | 2 +- code/game/objects/objs.dm | 4 +- code/game/objects/structures.dm | 2 +- code/game/objects/structures/aliens.dm | 6 +- code/game/objects/structures/artstuff.dm | 2 +- code/game/objects/structures/barsigns.dm | 2 +- .../objects/structures/beds_chairs/bed.dm | 6 +- .../objects/structures/beds_chairs/chair.dm | 4 +- .../objects/structures/beds_chairs/pew.dm | 4 +- code/game/objects/structures/bedsheet_bin.dm | 4 +- .../structures/crates_lockers/closets.dm | 2 +- .../closets/bluespace_locker.dm | 4 +- .../crates_lockers/closets/bodybag.dm | 2 +- .../crates_lockers/closets/infinite.dm | 2 +- .../crates_lockers/closets/secure/freezer.dm | 2 +- .../structures/crates_lockers/crates.dm | 6 +- .../structures/crates_lockers/crates/bins.dm | 2 +- .../crates_lockers/crates/critter.dm | 2 +- code/game/objects/structures/displaycase.dm | 4 +- code/game/objects/structures/door_assembly.dm | 2 +- code/game/objects/structures/electricchair.dm | 2 +- code/game/objects/structures/false_walls.dm | 2 +- code/game/objects/structures/fence.dm | 4 +- code/game/objects/structures/fireaxe.dm | 8 +-- code/game/objects/structures/flora.dm | 66 +++++++++---------- code/game/objects/structures/grille.dm | 6 +- code/game/objects/structures/guillotine.dm | 2 +- code/game/objects/structures/headpike.dm | 2 +- code/game/objects/structures/hivebot.dm | 2 +- code/game/objects/structures/holosign.dm | 8 +-- .../structures/icemoon/cave_entrance.dm | 2 +- code/game/objects/structures/janicart.dm | 2 +- code/game/objects/structures/ladders.dm | 2 +- .../objects/structures/lavaland/geyser.dm | 2 +- .../structures/lavaland/necropolis_tendril.dm | 4 +- code/game/objects/structures/manned_turret.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 4 +- code/game/objects/structures/mop_bucket.dm | 2 +- code/game/objects/structures/morgue.dm | 6 +- code/game/objects/structures/plasticflaps.dm | 4 +- code/game/objects/structures/railings.dm | 2 +- code/game/objects/structures/reflector.dm | 2 +- code/game/objects/structures/showcase.dm | 4 +- code/game/objects/structures/shower.dm | 2 +- code/game/objects/structures/spawner.dm | 2 +- code/game/objects/structures/statues.dm | 2 +- code/game/objects/structures/table_frames.dm | 2 +- code/game/objects/structures/tables_racks.dm | 14 ++-- .../game/objects/structures/tank_dispenser.dm | 2 +- .../transit_tube_construction.dm | 2 +- .../transit_tubes/transit_tube_pod.dm | 2 +- code/game/objects/structures/traps.dm | 2 +- code/game/objects/structures/watercloset.dm | 4 +- .../objects/structures/windoor_assembly.dm | 2 +- code/game/objects/structures/window.dm | 4 +- code/game/say.dm | 2 +- code/game/turfs/baseturf_skipover.dm | 2 +- code/game/turfs/closed.dm | 6 +- code/game/turfs/open.dm | 6 +- code/game/turfs/openspace/openspace.dm | 2 +- code/game/turfs/simulated/chasm.dm | 4 +- code/game/turfs/simulated/dirtystation.dm | 2 +- .../game/turfs/simulated/floor/fancy_floor.dm | 10 +-- .../game/turfs/simulated/floor/light_floor.dm | 2 +- .../turfs/simulated/floor/mineral_floor.dm | 4 +- code/game/turfs/simulated/floor/misc_floor.dm | 4 +- code/game/turfs/simulated/floor/plating.dm | 2 +- .../turfs/simulated/floor/plating/asteroid.dm | 4 +- .../simulated/floor/plating/misc_plating.dm | 10 +-- .../game/turfs/simulated/floor/reinf_floor.dm | 2 +- code/game/turfs/simulated/minerals.dm | 6 +- code/game/turfs/simulated/wall/misc_walls.dm | 6 +- code/game/turfs/space/space.dm | 2 +- code/game/turfs/turf.dm | 2 +- code/modules/NTNet/relays.dm | 2 +- code/modules/VR/vr_human.dm | 2 +- code/modules/VR/vr_sleeper.dm | 8 +-- code/modules/admin/fun_balloon.dm | 4 +- code/modules/admin/ipintel.dm | 2 +- code/modules/admin/permissions/database.dm | 2 +- code/modules/admin/stickyban.dm | 2 +- .../admin/verbs/SDQL2/SDQL_2_parser.dm | 4 +- code/modules/admin/verbs/debug.dm | 6 +- code/modules/admin/verbs/one_click_antag.dm | 4 +- code/modules/admin/verbs/randomverbs.dm | 4 +- .../admin/view_variables/massmodvar.dm | 2 +- .../admin/view_variables/modifyvariables.dm | 4 +- code/modules/admin/whitelist.dm | 2 +- .../antagonists/abductor/equipment/gland.dm | 4 +- .../antagonists/abductor/machinery/console.dm | 2 +- .../abductor/machinery/dispenser.dm | 2 +- .../antagonists/abductor/machinery/pad.dm | 2 +- code/modules/antagonists/blob/blob_mobs.dm | 4 +- .../blob/blobstrains/_blobstrain.dm | 2 +- .../antagonists/blob/blobstrains/_reagent.dm | 2 +- .../blob/blobstrains/debris_devourer.dm | 2 +- code/modules/antagonists/blob/overmind.dm | 2 +- .../antagonists/blob/structures/_blob.dm | 2 +- .../antagonists/blob/structures/node.dm | 2 +- .../bloodsuckers/bloodsuckers_objects.dm | 6 +- .../antagonists/bloodsuckers/powers/cloak.dm | 2 +- .../bloodsuckers/powers/gangrel.dm | 10 +-- .../structures/bloodsucker_crypt.dm | 4 +- .../antagonists/changeling/changeling.dm | 2 +- .../changeling/powers/mutations.dm | 14 ++-- .../changeling/powers/transform.dm | 20 +++--- .../antagonists/clockcult/clock_effect.dm | 2 +- .../clock_effects/city_of_cogs_rift.dm | 2 +- .../clockcult/clock_effects/clock_overlay.dm | 2 +- .../clockcult/clock_effects/clock_sigils.dm | 2 +- .../clock_effects/general_markers.dm | 2 +- .../clock_effects/servant_blocker.dm | 2 +- .../clock_effects/spatial_gateway.dm | 2 +- .../antagonists/clockcult/clock_item.dm | 2 +- .../clockcult/clock_items/clock_components.dm | 2 +- .../clockcult/clock_items/clockwork_armor.dm | 8 +-- .../clockcult/clock_items/clockwork_slab.dm | 2 +- .../clock_items/construct_chassis.dm | 2 +- .../clockcult/clock_items/integration_cog.dm | 2 +- .../clockcult/clock_items/judicial_visor.dm | 2 +- .../clockcult/clock_items/soul_vessel.dm | 2 +- .../clock_items/wraith_spectacles.dm | 2 +- .../antagonists/clockcult/clock_mobs.dm | 2 +- .../clockcult/clock_mobs/_eminence.dm | 2 +- .../antagonists/clockcult/clock_structure.dm | 4 +- .../clock_structures/_trap_object.dm | 2 +- .../ark_of_the_clockwork_justicar.dm | 4 +- .../clock_structures/clockwork_obelisk.dm | 2 +- .../clock_structures/heralds_beacon.dm | 2 +- .../clock_structures/ocular_warden.dm | 2 +- .../ratvar_the_clockwork_justicar.dm | 2 +- .../clockcult/clock_structures/stargazer.dm | 2 +- .../clock_structures/taunting_trail.dm | 2 +- .../trap_triggers/pressure_sensor.dm | 2 +- .../clock_structures/traps/brass_skewer.dm | 2 +- .../clockcult/clock_structures/wall_gear.dm | 2 +- code/modules/antagonists/creep/creep.dm | 2 +- code/modules/antagonists/cult/blood_magic.dm | 2 +- code/modules/antagonists/cult/cult_comms.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 16 ++--- .../antagonists/cult/cult_structures.dm | 8 +-- code/modules/antagonists/cult/ritual.dm | 2 +- code/modules/antagonists/cult/runes.dm | 30 ++++----- .../antagonists/demon/sins/gluttony.dm | 2 +- code/modules/antagonists/devil/imp/imp.dm | 2 +- .../devil/true_devil/_true_devil.dm | 2 +- .../antagonists/disease/disease_disease.dm | 2 +- .../antagonists/disease/disease_mob.dm | 6 +- .../eldritch_cult/eldritch_effects.dm | 2 +- .../eldritch_cult/eldritch_items.dm | 2 +- .../eldritch_cult/eldritch_magic.dm | 2 +- code/modules/antagonists/fugitive/old_god.dm | 4 +- code/modules/antagonists/horror/horror.dm | 2 +- .../horror/horror_abilities_and_upgrades.dm | 2 +- .../antagonists/horror/horror_datums.dm | 2 +- code/modules/antagonists/morph/morph.dm | 2 +- .../nukeop/equipment/borgchameleon.dm | 2 +- .../nukeop/equipment/nuclearbomb.dm | 6 +- .../nukeop/equipment/pinpointer.dm | 2 +- code/modules/antagonists/revenant/revenant.dm | 4 +- .../antagonists/slaughter/slaughter.dm | 4 +- .../antagonists/traitor/datum_traitor.dm | 2 +- .../traitor/equipment/Malf_Modules.dm | 2 +- .../traitor/equipment/contractor.dm | 8 +-- .../antagonists/traitor/syndicate_contract.dm | 6 +- .../antagonists/wizard/equipment/artefact.dm | 6 +- code/modules/antagonists/zombie/zombie.dm | 2 +- code/modules/assembly/assembly.dm | 4 +- code/modules/assembly/holder.dm | 2 +- code/modules/assembly/igniter.dm | 2 +- code/modules/assembly/infrared.dm | 2 +- code/modules/assembly/proximity.dm | 2 +- code/modules/assembly/radio.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- code/modules/assembly/timer.dm | 2 +- .../environmental/LINDA_turf_tile.dm | 2 +- .../binary_devices/binary_devices.dm | 2 +- .../machinery/components/components_base.dm | 4 +- .../machinery/components/fusion/hfr_core.dm | 2 +- .../gas_recipe_machines/crystallizer.dm | 2 +- .../trinary_devices/trinary_devices.dm | 2 +- .../components/unary_devices/cryo.dm | 2 +- .../components/unary_devices/thermomachine.dm | 6 +- .../components/unary_devices/vent_scrubber.dm | 2 +- .../atmospherics/machinery/other/miner.dm | 2 +- .../machinery/pipes/heat_exchange/he_pipes.dm | 2 +- .../machinery/pipes/layermanifold.dm | 2 +- .../atmospherics/machinery/pipes/manifold.dm | 4 +- .../machinery/portable/canister.dm | 2 +- .../atmospherics/machinery/portable/pump.dm | 2 +- .../machinery/portable/scrubber.dm | 2 +- code/modules/awaymissions/away_props.dm | 4 +- code/modules/awaymissions/capture_the_flag.dm | 6 +- code/modules/awaymissions/corpse.dm | 4 +- code/modules/awaymissions/gateway.dm | 8 +-- .../awaymissions/mission_code/Academy.dm | 2 +- .../awaymissions/mission_code/Cabin.dm | 2 +- .../awaymissions/mission_code/murderdome.dm | 2 +- .../awaymissions/mission_code/runner.dm | 2 +- .../mission_code/stationCollision.dm | 14 ++-- code/modules/awaymissions/signpost.dm | 4 +- .../modules/awaymissions/super_secret_room.dm | 4 +- code/modules/cargo/bounty_console.dm | 4 +- code/modules/cargo/centcom_podlauncher.dm | 4 +- code/modules/cargo/console.dm | 2 +- code/modules/cargo/expressconsole.dm | 4 +- code/modules/cargo/order.dm | 6 +- code/modules/cargo/supplypod.dm | 4 +- code/modules/cargo/supplypod_beacon.dm | 2 +- code/modules/client/client_procs.dm | 4 +- code/modules/client/message.dm | 2 +- code/modules/clothing/chameleon.dm | 58 ++++++++-------- code/modules/clothing/clothing.dm | 2 +- code/modules/clothing/ears/_ears.dm | 4 +- code/modules/clothing/glasses/_glasses.dm | 4 +- .../clothing/glasses/engine_goggles.dm | 2 +- code/modules/clothing/glasses/hud.dm | 2 +- code/modules/clothing/gloves/miscellaneous.dm | 2 +- code/modules/clothing/head/_head.dm | 2 +- code/modules/clothing/head/hardhat.dm | 2 +- code/modules/clothing/head/helmet.dm | 8 +-- code/modules/clothing/head/jobs.dm | 4 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/head/soft_caps.dm | 2 +- code/modules/clothing/masks/breath.dm | 2 +- code/modules/clothing/masks/miscellaneous.dm | 10 +-- code/modules/clothing/neck/_neck.dm | 4 +- code/modules/clothing/neck/bodycamera.dm | 4 +- code/modules/clothing/outfits/amber.dm | 6 +- code/modules/clothing/outfits/imperial.dm | 10 +-- code/modules/clothing/outfits/occupying.dm | 8 +-- code/modules/clothing/shoes/bananashoes.dm | 2 +- code/modules/clothing/shoes/miscellaneous.dm | 18 ++--- .../modules/clothing/spacesuits/chronosuit.dm | 4 +- code/modules/clothing/spacesuits/hardsuit.dm | 34 +++++----- code/modules/clothing/suits/armor.dm | 6 +- code/modules/clothing/suits/jobs.dm | 4 +- code/modules/clothing/suits/miscellaneous.dm | 8 +-- code/modules/clothing/suits/toggles.dm | 4 +- code/modules/clothing/suits/wiz_robe.dm | 2 +- code/modules/clothing/under/_under.dm | 2 +- code/modules/clothing/under/accessories.dm | 4 +- code/modules/clothing/under/color.dm | 6 +- code/modules/clothing/under/jobs/civilian.dm | 2 +- code/modules/clothing/under/miscellaneous.dm | 6 +- code/modules/detectivework/scanner.dm | 6 +- code/modules/events/_event.dm | 2 +- code/modules/events/fugitive_spawning.dm | 4 +- code/modules/events/holiday/halloween.dm | 2 +- code/modules/events/holiday/vday.dm | 4 +- code/modules/events/holiday/xmas.dm | 2 +- code/modules/events/pirates.dm | 2 +- code/modules/events/shuttle_loan.dm | 2 +- code/modules/events/spacevine.dm | 4 +- code/modules/events/wizard/magicarp.dm | 2 +- code/modules/fields/fields.dm | 2 +- code/modules/flufftext/Hallucination.dm | 4 +- code/modules/food_and_drinks/drinks/drinks.dm | 8 +-- .../food_and_drinks/drinks/drinks/bottle.dm | 6 +- .../drinks/drinks/drinkingglass.dm | 2 +- code/modules/food_and_drinks/food.dm | 2 +- .../modules/food_and_drinks/food/condiment.dm | 2 +- .../food_and_drinks/food/customizables.dm | 2 +- code/modules/food_and_drinks/food/snacks.dm | 2 +- .../food_and_drinks/food/snacks_bread.dm | 2 +- .../food_and_drinks/food/snacks_burgers.dm | 2 +- .../food_and_drinks/food/snacks_cheese.dm | 2 +- .../food_and_drinks/food/snacks_egg.dm | 2 +- .../food_and_drinks/food/snacks_meat.dm | 12 ++-- .../food_and_drinks/food/snacks_other.dm | 12 ++-- .../food_and_drinks/food/snacks_pastry.dm | 10 +-- .../food_and_drinks/food/snacks_pie.dm | 2 +- .../food_and_drinks/food/snacks_pizza.dm | 2 +- .../food_and_drinks/food/snacks_salad.dm | 4 +- .../food_and_drinks/food/snacks_seafood.dm | 2 +- .../food_and_drinks/food/snacks_soup.dm | 8 +-- .../food_and_drinks/food/snacks_spaghetti.dm | 2 +- .../kitchen_machinery/deep_fryer.dm | 2 +- .../kitchen_machinery/food_cart.dm | 2 +- .../kitchen_machinery/gibber.dm | 2 +- .../kitchen_machinery/griddle.dm | 2 +- .../kitchen_machinery/grill.dm | 2 +- .../kitchen_machinery/icecream_vat.dm | 10 +-- .../kitchen_machinery/microwave.dm | 2 +- .../kitchen_machinery/processor.dm | 4 +- .../kitchen_machinery/smartfridge.dm | 8 +-- code/modules/food_and_drinks/pizzabox.dm | 22 +++---- code/modules/goals/station_goals/dna_vault.dm | 2 +- code/modules/goals/station_goals/shield.dm | 2 +- code/modules/holiday/easter.dm | 4 +- code/modules/holiday/halloween.dm | 6 +- code/modules/holodeck/area_copy.dm | 2 +- code/modules/holodeck/holo_effect.dm | 18 ++--- code/modules/holodeck/items.dm | 6 +- code/modules/holodeck/turfs.dm | 14 ++-- code/modules/hydroponics/beekeeping/beebox.dm | 4 +- .../hydroponics/beekeeping/honey_frame.dm | 2 +- .../hydroponics/beekeeping/honeycomb.dm | 2 +- code/modules/hydroponics/biogenerator.dm | 2 +- code/modules/hydroponics/fermenting_barrel.dm | 2 +- code/modules/hydroponics/gene_modder.dm | 4 +- code/modules/hydroponics/grown/banana.dm | 2 +- code/modules/hydroponics/grown/melon.dm | 2 +- .../hydroponics/grown/rainbow_bunch.dm | 2 +- code/modules/hydroponics/grown/random.dm | 4 +- code/modules/hydroponics/grown/replicapod.dm | 2 +- code/modules/hydroponics/grown/towercap.dm | 2 +- code/modules/hydroponics/growninedible.dm | 2 +- code/modules/hydroponics/hydroitemdefines.dm | 6 +- code/modules/hydroponics/plant_genes.dm | 2 +- code/modules/hydroponics/sample.dm | 2 +- code/modules/hydroponics/seeds.dm | 4 +- code/modules/instruments/items.dm | 8 +-- code/modules/jobs/job_types/_job.dm | 2 +- .../jobs/job_types/security_officer.dm | 2 +- .../jobs/job_types/station_engineer.dm | 2 +- code/modules/jobs/jobs.dm | 4 +- code/modules/language/language_holder.dm | 2 +- code/modules/language/ratvarian.dm | 4 +- code/modules/library/lib_items.dm | 6 +- code/modules/library/lib_machines.dm | 2 +- code/modules/library/random_books.dm | 4 +- code/modules/lighting/lighting_area.dm | 4 +- code/modules/lighting/lighting_atom.dm | 4 +- code/modules/lighting/lighting_corner.dm | 2 +- code/modules/lighting/lighting_source.dm | 6 +- code/modules/lighting/lighting_turf.dm | 4 +- code/modules/mapping/mapping_helpers.dm | 10 +-- code/modules/mapping/minimap.dm | 2 +- code/modules/mining/abandoned_crates.dm | 2 +- code/modules/mining/aux_base.dm | 2 +- code/modules/mining/aux_base_camera.dm | 8 +-- .../modules/mining/equipment/explorer_gear.dm | 10 +-- .../mining/equipment/kinetic_crusher.dm | 2 +- .../mining/equipment/mineral_scanner.dm | 4 +- .../mining/equipment/mining_charges.dm | 2 +- code/modules/mining/equipment/mining_tools.dm | 4 +- .../mining/equipment/regenerative_core.dm | 4 +- code/modules/mining/equipment/resonator.dm | 2 +- code/modules/mining/equipment/survival_pod.dm | 2 +- code/modules/mining/equipment/upgrades.dm | 2 +- code/modules/mining/fulton.dm | 2 +- code/modules/mining/laborcamp/laborstacker.dm | 2 +- code/modules/mining/lavaland/ash_flora.dm | 4 +- .../mining/lavaland/necropolis_chests.dm | 12 ++-- code/modules/mining/lavaland/seismicarm.dm | 2 +- code/modules/mining/lavaland/world_anvil.dm | 2 +- code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_stacking.dm | 2 +- code/modules/mining/machine_vending.dm | 4 +- code/modules/mining/mine_items.dm | 2 +- code/modules/mining/minebot.dm | 2 +- code/modules/mining/mint.dm | 2 +- code/modules/mining/money_bag.dm | 2 +- code/modules/mining/ores_coins.dm | 6 +- code/modules/mob/dead/dead.dm | 2 +- .../mob/dead/new_player/latejoin_menu.dm | 2 +- .../modules/mob/dead/new_player/new_player.dm | 2 +- .../mob/dead/new_player/sprite_accessories.dm | 2 +- code/modules/mob/dead/observer/observer.dm | 4 +- code/modules/mob/dead/observer/say.dm | 2 +- code/modules/mob/living/brain/MMI.dm | 4 +- code/modules/mob/living/brain/brain.dm | 4 +- code/modules/mob/living/brain/posibrain.dm | 2 +- code/modules/mob/living/brain/say.dm | 2 +- code/modules/mob/living/carbon/alien/alien.dm | 2 +- .../carbon/alien/humanoid/caste/drone.dm | 2 +- .../carbon/alien/humanoid/caste/praetorian.dm | 2 +- .../carbon/alien/humanoid/caste/sentinel.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- .../mob/living/carbon/alien/larva/larva.dm | 2 +- .../carbon/alien/special/alien_embryo.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 4 +- code/modules/mob/living/carbon/human/human.dm | 10 +-- .../mob/living/carbon/human/human_defense.dm | 2 +- .../carbon/human/species_types/golems.dm | 2 +- .../carbon/human/species_types/jellypeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 2 +- .../carbon/human/species_types/snail.dm | 2 +- .../mob/living/carbon/monkey/combat.dm | 8 +-- .../mob/living/carbon/monkey/monkey.dm | 2 +- .../mob/living/carbon/monkey/punpun.dm | 2 +- .../modules/mob/living/carbon/update_icons.dm | 2 +- code/modules/mob/living/living.dm | 2 +- code/modules/mob/living/say.dm | 2 +- code/modules/mob/living/silicon/ai/ai.dm | 2 +- .../ai/decentralized/ai_core_display.dm | 2 +- .../silicon/ai/decentralized/ai_data_core.dm | 2 +- .../ai/decentralized/server_cabinet.dm | 2 +- .../silicon/ai/decentralized/systech/cpu.dm | 2 +- .../silicon/ai/decentralized/systech/rack.dm | 2 +- .../mob/living/silicon/ai/freelook/eye.dm | 2 +- .../modules/mob/living/silicon/ai/multicam.dm | 4 +- code/modules/mob/living/silicon/ai/say.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 2 +- .../mob/living/silicon/pai/pai_defense.dm | 2 +- code/modules/mob/living/silicon/pai/say.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 10 +-- .../mob/living/silicon/robot/robot_defense.dm | 2 +- .../mob/living/silicon/robot/robot_modules.dm | 6 +- code/modules/mob/living/silicon/silicon.dm | 2 +- .../living/simple_animal/bot/SuperBeepsky.dm | 2 +- .../mob/living/simple_animal/bot/bot.dm | 4 +- .../mob/living/simple_animal/bot/cleanbot.dm | 6 +- .../living/simple_animal/bot/construction.dm | 4 +- .../mob/living/simple_animal/bot/ed209bot.dm | 2 +- .../mob/living/simple_animal/bot/firebot.dm | 2 +- .../mob/living/simple_animal/bot/honkbot.dm | 4 +- .../mob/living/simple_animal/bot/mulebot.dm | 2 +- .../mob/living/simple_animal/bot/secbot.dm | 10 +-- .../mob/living/simple_animal/constructs.dm | 10 +-- .../mob/living/simple_animal/corpse.dm | 2 +- .../living/simple_animal/eldritch_demons.dm | 4 +- .../simple_animal/friendly/butterfly.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 6 +- .../simple_animal/friendly/cockroach.dm | 2 +- .../mob/living/simple_animal/friendly/dog.dm | 8 +-- .../simple_animal/friendly/drone/_drone.dm | 2 +- .../friendly/drone/drones_as_items.dm | 2 +- .../friendly/drone/extra_drone_types.dm | 10 +-- .../simple_animal/friendly/farm_animals.dm | 12 ++-- .../living/simple_animal/friendly/gondola.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 2 +- .../living/simple_animal/friendly/penguin.dm | 2 +- .../mob/living/simple_animal/friendly/pet.dm | 2 +- .../simple_animal/friendly/spiderbot.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 2 +- .../simple_animal/guardian/types/assassin.dm | 2 +- .../simple_animal/guardian/types/ranged.dm | 2 +- .../simple_animal/guardian/types/support.dm | 2 +- .../mob/living/simple_animal/hostile/bees.dm | 6 +- .../simple_animal/hostile/bosses/boss.dm | 2 +- .../hostile/bosses/paperwizard.dm | 2 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 6 +- .../simple_animal/hostile/glockroach.dm | 2 +- .../mob/living/simple_animal/hostile/goose.dm | 4 +- .../living/simple_animal/hostile/hivebot.dm | 2 +- .../living/simple_animal/hostile/hostile.dm | 10 +-- .../simple_animal/hostile/jungle/leaper.dm | 6 +- .../simple_animal/hostile/mecha_pilot.dm | 4 +- .../hostile/megafauna/blood_drunk_miner.dm | 2 +- .../hostile/megafauna/bubblegum.dm | 16 ++--- .../hostile/megafauna/colossus.dm | 16 ++--- .../hostile/megafauna/demonic_frost_miner.dm | 6 +- .../simple_animal/hostile/megafauna/drake.dm | 22 +++---- .../hostile/megafauna/hierophant.dm | 10 +-- .../hostile/megafauna/megafauna.dm | 2 +- .../hostile/megafauna/stalwart.dm | 2 +- .../hostile/megafauna/swarmer.dm | 4 +- .../hostile/mining_mobs/basilisk.dm | 2 +- .../hostile/mining_mobs/drakeling.dm | 6 +- .../hostile/mining_mobs/elites/elite.dm | 2 +- .../mining_mobs/elites/goliath_broodmother.dm | 4 +- .../hostile/mining_mobs/elites/herald.dm | 6 +- .../hostile/mining_mobs/elites/legionnaire.dm | 6 +- .../hostile/mining_mobs/elites/pandora.dm | 8 +-- .../hostile/mining_mobs/goldgrub.dm | 2 +- .../hostile/mining_mobs/goliath.dm | 2 +- .../hostile/mining_mobs/gutlunch.dm | 8 +-- .../hostile/mining_mobs/hivelord.dm | 10 +-- .../simple_animal/hostile/mining_mobs/wasp.dm | 2 +- .../living/simple_animal/hostile/mushroom.dm | 2 +- .../simple_animal/hostile/netherworld.dm | 6 +- .../mob/living/simple_animal/hostile/rat.dm | 2 +- .../living/simple_animal/hostile/regalrat.dm | 4 +- .../simple_animal/hostile/retaliate/frog.dm | 2 +- .../simple_animal/hostile/retaliate/ghost.dm | 2 +- .../living/simple_animal/hostile/skeleton.dm | 2 +- .../simple_animal/hostile/space_dragon.dm | 2 +- .../living/simple_animal/hostile/statue.dm | 4 +- .../living/simple_animal/hostile/stickman.dm | 2 +- .../living/simple_animal/hostile/syndicate.dm | 16 ++--- .../simple_animal/hostile/venus_human_trap.dm | 2 +- .../living/simple_animal/hostile/wizard.dm | 4 +- .../simple_animal/hostile/wumborian_fugu.dm | 2 +- .../mob/living/simple_animal/parrot.dm | 6 +- .../mob/living/simple_animal/simple_animal.dm | 4 +- code/modules/mob/mob.dm | 8 +-- code/modules/mob/mob_helpers.dm | 4 +- code/modules/mob/mob_lists.dm | 2 +- code/modules/mob/say.dm | 2 +- .../computers/item/computer.dm | 2 +- .../integrated_tablet/integrated_tablet.dm | 2 +- .../computers/item/laptop/laptop.dm | 2 +- .../computers/item/laptop/laptop_presets.dm | 6 +- .../computers/item/pda/pda_presets.dm | 20 +++--- .../computers/item/phone/phone_presets.dm | 2 +- .../computers/item/tablet/tablet.dm | 2 +- .../machinery/console/modular_console.dm | 2 +- .../computers/machinery/modular_computer.dm | 4 +- .../machinery/telescreen/telescreen.dm | 2 +- .../telescreen/telescreen_presets.dm | 2 +- .../modular_computers/file_system/program.dm | 2 +- .../programs/antagonist/contract_uplink.dm | 2 +- .../programs/antagonist/revelation.dm | 2 +- .../file_system/programs/paperworkprinter.dm | 2 +- .../programs/supply/budgetordering.dm | 2 +- .../modular_computers/hardware/_hardware.dm | 6 +- .../modular_computers/hardware/hard_drive.dm | 12 ++-- .../hardware/network_card.dm | 6 +- .../hardware/portable_disk.dm | 2 +- .../modular_computers/hardware/printer.dm | 2 +- code/modules/music/music.dm | 2 +- code/modules/ninja/energy_katana.dm | 2 +- code/modules/ninja/suit/suit.dm | 2 +- .../modules/ninja/suit/suit_initialisation.dm | 8 +-- code/modules/paperwork/clipboard.dm | 2 +- code/modules/paperwork/faxmachine.dm | 10 +-- code/modules/paperwork/folders.dm | 8 +-- code/modules/paperwork/inspector_booth.dm | 2 +- code/modules/paperwork/paper.dm | 6 +- code/modules/paperwork/paper_bundle.dm | 2 +- code/modules/paperwork/paper_cutter.dm | 4 +- code/modules/paperwork/pen.dm | 6 +- code/modules/paperwork/photocopier.dm | 6 +- code/modules/paperwork/ticketmachine.dm | 2 +- code/modules/photography/camera/camera.dm | 4 +- .../camera/camera_image_capturing.dm | 2 +- code/modules/photography/photos/album.dm | 2 +- code/modules/plumbing/plumbers/pumps.dm | 2 +- code/modules/pool/pool.dm | 2 +- code/modules/pool/pool_items.dm | 2 +- code/modules/power/apc.dm | 2 +- code/modules/power/cable.dm | 2 +- code/modules/power/cell.dm | 20 +++--- code/modules/power/energyharvester.dm | 2 +- code/modules/power/gravitygenerator.dm | 2 +- code/modules/power/lighting.dm | 10 +-- code/modules/power/monitor.dm | 2 +- code/modules/power/port_gen.dm | 6 +- code/modules/power/power.dm | 2 +- code/modules/power/rtg.dm | 2 +- code/modules/power/singularity/emitter.dm | 4 +- .../power/singularity/field_generator.dm | 2 +- code/modules/power/singularity/narsie.dm | 6 +- .../particle_accelerator.dm | 2 +- .../particle_accelerator/particle_control.dm | 2 +- code/modules/power/smes.dm | 2 +- code/modules/power/solar.dm | 4 +- code/modules/power/supermatter/supermatter.dm | 2 +- code/modules/power/terminal.dm | 2 +- code/modules/power/tesla/coil.dm | 4 +- code/modules/power/tesla/energy_ball.dm | 4 +- code/modules/power/turbine.dm | 6 +- .../procedural_mapping/mapGeneratorReadme.dm | 16 ++--- .../mapGenerators/cellular.dm | 6 +- .../projectiles/ammunition/_ammunition.dm | 2 +- .../ammunition/ballistic/shotgun.dm | 6 +- .../ammunition/reusable/_reusable.dm | 2 +- .../projectiles/ammunition/reusable/arrow.dm | 10 +-- .../boxes_magazines/_box_magazine.dm | 2 +- .../boxes_magazines/internal/revolver.dm | 2 +- code/modules/projectiles/gun.dm | 2 +- code/modules/projectiles/guns/ballistic.dm | 2 +- .../projectiles/guns/ballistic/automatic.dm | 6 +- .../modules/projectiles/guns/ballistic/bow.dm | 10 +-- .../guns/ballistic/laser_gatling.dm | 8 +-- .../projectiles/guns/ballistic/minigun.dm | 8 +-- .../projectiles/guns/ballistic/revolver.dm | 2 +- .../projectiles/guns/ballistic/shotgun.dm | 2 +- .../modules/projectiles/guns/ballistic/toy.dm | 2 +- code/modules/projectiles/guns/energy.dm | 2 +- .../projectiles/guns/energy/dueling.dm | 4 +- .../projectiles/guns/energy/energy_gun.dm | 2 +- .../guns/energy/kinetic_accelerator.dm | 2 +- code/modules/projectiles/guns/energy/pulse.dm | 2 +- .../projectiles/guns/energy/special.dm | 4 +- code/modules/projectiles/guns/magic.dm | 2 +- code/modules/projectiles/guns/magic/staff.dm | 2 +- code/modules/projectiles/guns/magic/wand.dm | 2 +- .../projectiles/guns/misc/beam_rifle.dm | 2 +- .../projectiles/guns/misc/blastcannon.dm | 2 +- .../modules/projectiles/guns/misc/chem_gun.dm | 2 +- code/modules/projectiles/guns/misc/medbeam.dm | 12 ++-- .../projectiles/guns/misc/syringe_gun.dm | 4 +- code/modules/projectiles/projectile.dm | 2 +- code/modules/projectiles/projectile/beams.dm | 2 +- .../projectile/bullets/dart_syringe.dm | 2 +- .../projectiles/projectile/bullets/shotgun.dm | 2 +- .../projectiles/projectile/bullets/special.dm | 2 +- .../projectile/energy/net_snare.dm | 2 +- .../projectile/energy/nuclear_particle.dm | 2 +- code/modules/projectiles/projectile/magic.dm | 8 +-- .../projectiles/projectile/special/gravity.dm | 6 +- code/modules/reagents/chemistry/holder.dm | 2 +- .../chemistry/machinery/chem_dispenser.dm | 18 ++--- .../chemistry/machinery/chem_master.dm | 2 +- .../reagents/chemistry/machinery/pandemic.dm | 2 +- .../chemistry/machinery/reagentgrinder.dm | 4 +- .../chemistry/machinery/smoke_machine.dm | 2 +- code/modules/reagents/chemistry/readme.md | 36 +++++----- .../chemistry/reagents/alcohol_reagents.dm | 2 +- .../reagents/chemistry/recipes/special.dm | 2 +- .../reagents/reagent_containers/blood_pack.dm | 4 +- .../reagents/reagent_containers/borghypo.dm | 2 +- .../reagents/reagent_containers/bottle.dm | 6 +- .../reagents/reagent_containers/glass.dm | 4 +- .../reagents/reagent_containers/hypospray.dm | 8 +-- .../reagents/reagent_containers/pill.dm | 4 +- .../reagents/reagent_containers/spray.dm | 4 +- .../reagents/reagent_containers/syringes.dm | 4 +- code/modules/reagents/reagent_dispenser.dm | 8 +-- code/modules/recycling/conveyor2.dm | 4 +- .../recycling/disposal/construction.dm | 2 +- code/modules/recycling/disposal/pipe.dm | 4 +- .../recycling/disposal/pipe_sorting.dm | 2 +- code/modules/recycling/sortingmachinery.dm | 4 +- code/modules/religion/rites.dm | 2 +- code/modules/research/designs.dm | 2 +- .../research/designs/autolathe_designs.dm | 2 +- .../research/designs/limbgrower_designs.dm | 2 +- code/modules/research/experimentor.dm | 4 +- .../modules/research/machinery/_production.dm | 2 +- .../research/machinery/plortmachine.dm | 4 +- .../research/nanites/nanite_chamber.dm | 2 +- .../nanites/nanite_chamber_computer.dm | 2 +- .../research/nanites/nanite_program_hub.dm | 2 +- .../modules/research/nanites/program_disks.dm | 2 +- .../research/nanites/public_chamber.dm | 2 +- code/modules/research/rdconsole.dm | 6 +- code/modules/research/rdmachines.dm | 2 +- code/modules/research/research_disk.dm | 4 +- code/modules/research/server.dm | 2 +- code/modules/research/stock_parts.dm | 2 +- .../research/techweb/__techweb_helpers.dm | 4 +- .../xenobiology/crossbreeding/__corecross.dm | 8 +-- .../xenobiology/crossbreeding/_clothing.dm | 2 +- .../xenobiology/crossbreeding/_misc.dm | 4 +- .../xenobiology/crossbreeding/_structures.dm | 12 ++-- .../xenobiology/crossbreeding/_weapons.dm | 2 +- .../xenobiology/crossbreeding/burning.dm | 2 +- .../xenobiology/crossbreeding/charged.dm | 2 +- .../xenobiology/crossbreeding/chilling.dm | 2 +- .../xenobiology/crossbreeding/consuming.dm | 2 +- .../xenobiology/crossbreeding/industrial.dm | 2 +- .../xenobiology/crossbreeding/recurring.dm | 2 +- .../xenobiology/crossbreeding/regenerative.dm | 2 +- .../crossbreeding/selfsustaining.dm | 2 +- .../xenobiology/crossbreeding/stabilized.dm | 4 +- .../research/xenobiology/xenobio_camera.dm | 6 +- .../research/xenobiology/xenobiology.dm | 2 +- code/modules/ruins/lavaland_ruin_code.dm | 4 +- .../ruins/objects_and_mobs/ash_walker_den.dm | 2 +- .../ruins/objects_and_mobs/necropolis_gate.dm | 6 +- .../ruins/objects_and_mobs/sin_ruins.dm | 2 +- .../ruins/spaceruin_code/caravanambush.dm | 2 +- .../ruins/spaceruin_code/hilbertshotel.dm | 12 ++-- .../security_levels/keycard_authentication.dm | 2 +- code/modules/shuttle/custom_shuttle.dm | 12 ++-- code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 2 +- code/modules/shuttle/shuttle.dm | 2 +- .../shuttle_creation/shuttle_creator.dm | 4 +- .../shuttle_creation/shuttle_creator_eye.dm | 4 +- .../shuttle/spaceship_navigation_beacon.dm | 2 +- code/modules/shuttle/special.dm | 6 +- code/modules/shuttle/white_ship.dm | 2 +- .../spells/spell_types/self/disguise.dm | 4 +- code/modules/surgery/anesthesia_machine.dm | 4 +- code/modules/surgery/bone_mending.dm | 6 +- code/modules/surgery/burn_dressing.dm | 4 +- code/modules/surgery/organs/augment_legs.dm | 4 +- code/modules/surgery/organs/augments_arms.dm | 12 ++-- code/modules/surgery/organs/augments_eyes.dm | 8 +-- .../surgery/organs/augments_internal.dm | 4 +- code/modules/surgery/organs/autosurgeon.dm | 4 +- code/modules/surgery/organs/eyes.dm | 4 +- code/modules/surgery/organs/heart.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 8 +-- code/modules/surgery/organs/tongue.dm | 4 +- code/modules/surgery/repair_puncture.dm | 2 +- code/modules/surgery/surgery.dm | 2 +- code/modules/surgery/tools.dm | 8 +-- code/modules/swarmers/swarmer.dm | 2 +- code/modules/swarmers/swarmer_objs.dm | 2 +- code/modules/tgui/tgui.dm | 2 +- code/modules/tgui/tgui_window.dm | 4 +- code/modules/tgui_panel/external.dm | 2 +- code/modules/tgui_panel/tgui_panel.dm | 4 +- code/modules/uplink/uplink_devices.dm | 6 +- code/modules/uplink/uplink_items.dm | 2 +- code/modules/vehicles/atv.dm | 4 +- code/modules/vehicles/bicycle.dm | 2 +- code/modules/vehicles/cars/car.dm | 2 +- code/modules/vehicles/lavaboat.dm | 4 +- code/modules/vehicles/ridden.dm | 2 +- code/modules/vehicles/scooter.dm | 8 +-- code/modules/vehicles/secway.dm | 2 +- code/modules/vehicles/speedbike.dm | 6 +- code/modules/vehicles/wheelchair.dm | 2 +- code/modules/vending/cola.dm | 2 +- code/modules/vending/security_armaments.dm | 2 +- code/modules/vending/snack.dm | 2 +- code/modules/zombie/items.dm | 2 +- code/modules/zombie/organs.dm | 4 +- tools/Redirector/Redirector.dm | 2 +- tools/travis/check_grep.sh | 15 ++++- yogstation/code/__HELPERS/mobs.dm | 10 +-- yogstation/code/__HELPERS/unsorted.dm | 6 +- yogstation/code/_onclick/adjacent.dm | 2 +- yogstation/code/controllers/subsystem/yogs.dm | 2 +- yogstation/code/datums/antagonists/vampire.dm | 6 +- yogstation/code/datums/components/crawl.dm | 2 +- yogstation/code/datums/components/fishable.dm | 2 +- .../code/datums/martial/garden_warfare.dm | 2 +- .../gamemodes/battle_royale/battleroyale.dm | 4 +- .../code/game/gamemodes/battle_royale/loot.dm | 2 +- .../code/game/gamemodes/gangs/dominator.dm | 2 +- .../code/game/gamemodes/gangs/gangtool.dm | 2 +- .../game/gamemodes/vampire/vampire_bite.dm | 2 +- .../game/gamemodes/vampire/vampire_other.dm | 2 +- .../code/game/machinery/computer/Operating.dm | 2 +- .../code/game/machinery/computer/arcade.dm | 2 +- .../code/game/machinery/computer/atmos_sim.dm | 2 +- .../code/game/machinery/computer/crew.dm | 2 +- .../code/game/machinery/computer/medical.dm | 2 +- .../code/game/machinery/doors/poddoor.dm | 2 +- .../code/game/machinery/doors/spacepod.dm | 2 +- .../telecomms/computers/logbrowser.dm | 2 +- .../telecomms/computers/telemonitor.dm | 2 +- .../machinery/telecomms/machines/server.dm | 2 +- yogstation/code/game/mecha/mecha.dm | 4 +- .../code/game/objects/effects/landmarks.dm | 4 +- yogstation/code/game/objects/items/balloon.dm | 2 +- .../code/game/objects/items/clown_items.dm | 4 +- yogstation/code/game/objects/items/crayons.dm | 2 +- .../game/objects/items/devices/powersink.dm | 2 +- .../code/game/objects/items/fishing/rods.dm | 4 +- .../code/game/objects/items/fryingpan.dm | 2 +- .../objects/items/grenades/glitterbombs.dm | 2 +- .../game/objects/items/holotool/holotool.dm | 2 +- .../code/game/objects/items/holotool/modes.dm | 12 ++-- .../objects/items/implants/implant_gang.dm | 4 +- .../items/implants/implant_teleporter.dm | 2 +- yogstation/code/game/objects/items/plushes.dm | 2 +- .../code/game/objects/items/premadepapers.dm | 48 +++++++------- .../objects/items/stacks/dilithiumcrystal.dm | 2 +- .../game/objects/items/storage/backpack.dm | 2 +- .../code/game/objects/items/storage/boxes.dm | 2 +- .../code/game/objects/items/storage/mre.dm | 2 +- .../code/game/objects/items/tool_switcher.dm | 2 +- .../code/game/objects/structures/fireaxe.dm | 2 +- .../game/objects/structures/ghostbeacon.dm | 2 +- .../objects/structures/signs/signs_plaques.dm | 2 +- .../game/objects/structures/toilet_bong.dm | 2 +- yogstation/code/game/soccer.dm | 2 +- yogstation/code/modules/admin/moja.dm | 2 +- yogstation/code/modules/admin/prettyfilter.dm | 2 +- .../code/modules/admin/verbs/adminhelp.dm | 4 +- .../code/modules/admin/verbs/fix_air.dm | 2 +- .../darkspawn/darkspawn_objects/dark_bead.dm | 2 +- .../darkspawn/darkspawn_objects/simulacrum.dm | 2 +- .../darkspawn/darkspawn_progenitor.dm | 4 +- .../antagonists/infiltrator/items/hardsuit.dm | 4 +- .../shadowling/ascendant_shadowling.dm | 2 +- .../shadowling/shadowling_items.dm | 4 +- .../antagonists/slaughter/slaughter.dm | 2 +- yogstation/code/modules/assembly/signaler.dm | 2 +- yogstation/code/modules/clothing/donator.dm | 4 +- yogstation/code/modules/clothing/fishing.dm | 8 +-- .../code/modules/clothing/head/helmet.dm | 2 +- yogstation/code/modules/clothing/mask.dm | 4 +- .../code/modules/clothing/masks/hailer.dm | 2 +- yogstation/code/modules/clothing/shoe.dm | 2 +- .../modules/clothing/shoes/miscellaneous.dm | 2 +- .../modules/clothing/suits/miscellaneous.dm | 6 +- .../code/modules/clothing/suits/nerd.dm | 4 +- yogstation/code/modules/clothing/under.dm | 2 +- .../modules/clothing/under/miscellaneous.dm | 2 +- yogstation/code/modules/donor/borg_skins.dm | 2 +- .../code/modules/events/immovable_duck.dm | 2 +- .../code/modules/events/infiltrators.dm | 2 +- .../guardian/abilities/special/pocket.dm | 6 +- .../code/modules/guardian/guardianbuilder.dm | 2 +- .../code/modules/guardian/standarrow.dm | 2 +- yogstation/code/modules/mentor/mentorhelp.dm | 4 +- .../code/modules/mentor/mentortickets.dm | 2 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/reindex_screams.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 2 +- .../living/simple_animal/friendly/chocobo.dm | 2 +- .../living/simple_animal/friendly/goats.dm | 6 +- .../simple_animal/hostile/floor_cluwne.dm | 6 +- .../hostile/retaliate/king_of_goats.dm | 2 +- .../code/modules/mob/new_player/poll.dm | 2 +- yogstation/code/modules/ninja/suit/ninja.dm | 2 +- .../code/modules/paperwork/photography.dm | 4 +- yogstation/code/modules/power/validhunter.dm | 2 +- .../reagents/reagent_containers/gummies.dm | 4 +- .../recycling/disposal/pipe_sorting.dm | 2 +- yogstation/code/modules/research/rdconsole.dm | 2 +- yogstation/code/modules/scripting/IDE.dm | 2 +- .../code/modules/spacepods/equipment.dm | 2 +- yogstation/code/modules/spacepods/parts.dm | 4 +- yogstation/code/modules/spacepods/prebuilt.dm | 4 +- yogstation/code/modules/spacepods/spacepod.dm | 2 +- yogstation/code/modules/webhook/webhook.dm | 28 ++++---- .../code/modules/xenoarch/loot/gigadrill.dm | 2 +- 1118 files changed, 2398 insertions(+), 2389 deletions(-) diff --git a/.github/guides/HARDDELETES.md b/.github/guides/HARDDELETES.md index defc09360af6..a8ead6c0d87b 100644 --- a/.github/guides/HARDDELETES.md +++ b/.github/guides/HARDDELETES.md @@ -129,7 +129,7 @@ You can read more about how BYOND prioritizes these things [Here](https://www.pa ## Detecting Hard Deletes -For very simple hard deletes, simple inspection should be enough to find them. Look at what the object does during `Initialize()`, and see if it's doing anything it doesn't undo later. +For very simple hard deletes, simple inspection should be enough to find them. Look at what the object does during `Initialize(mapload)`, and see if it's doing anything it doesn't undo later. If that fails, search the object's typepath, and look and see if anything is holding a reference to it without regard for the object deleting BYOND currently doesn't have the capability to give us information about where a hard delete is. Fortunately we can search for most all of then ourselves. @@ -273,7 +273,7 @@ But if you can't do anything else for reasons of conversion ease, or hot code, t First, do a quick check. -Are you doing anything to the object in `Initialize()` that you don't undo in `Destroy()`? I don't mean like, setting its name, but are you adding it to any lists, stuff like that +Are you doing anything to the object in `Initialize(mapload)` that you don't undo in `Destroy()`? I don't mean like, setting its name, but are you adding it to any lists, stuff like that If this fails, you're just gonna have to read over this doc. You can skip the theory if you'd like, but it's all pretty important for having an understanding of this problem diff --git a/.github/guides/STANDARDS.md b/.github/guides/STANDARDS.md index ab83dd43b4d0..c5d36c5b0389 100644 --- a/.github/guides/STANDARDS.md +++ b/.github/guides/STANDARDS.md @@ -84,7 +84,7 @@ Copying code from one place to another may be suitable for small, short-time pro Instead you can use object orientation, or simply placing repeated code in a function, to obey this specification easily. -### Prefer `Initialize()` over `New()` for atoms +### Prefer `Initialize(mapload)` over `New()` for atoms Our game controller is pretty good at handling long operations and lag, but it can't control what happens when the map is loaded, which calls `New` for all atoms on the map. If you're creating a new atom, use the `Initialize` proc to do what you would normally do in `New`. This cuts down on the number of proc calls needed when the world is loaded. See here for details on `Initialize`: https://github.com/yogstation13/Yogstation/blob/df044da8608d94cbe1fe242264f749a92ca8283b/code/game/atoms.dm#L111 While we normally encourage (and in some cases, even require) bringing out of date code up to date when you make unrelated changes near the out of date code, that is not the case for `New` -> `Initialize` conversions. These systems are generally more dependent on parent and children procs so unrelated random conversions of existing things can cause bugs that take months to figure out. @@ -243,7 +243,7 @@ First, read the comments in [this BYOND thread](http://www.byond.com/forum/?post There are two key points here: -1) Defining a list in the variable's definition calls a hidden proc - init. If you have to define a list at startup, do so in New() (or preferably Initialize()) and avoid the overhead of a second call (Init() and then New()) +1) Defining a list in the variable's definition calls a hidden proc - init. If you have to define a list at startup, do so in New() (or preferably Initialize(mapload)) and avoid the overhead of a second call (Init() and then New()) 2) It also consumes more memory to the point where the list is actually required, even if the object in question may never use it! @@ -270,7 +270,7 @@ Bad: Good: ```dm -/obj/machine/update_overlays(var/blah) +/obj/machine/update_overlays(blah) var/static/on_overlay var/static/off_overlay var/static/broken_overlay @@ -298,7 +298,7 @@ Associated lists that could instead be variables or statically defined number in Bad: ```dm -/obj/machine/update_overlays(var/blah) +/obj/machine/update_overlays(blah) var/static/our_overlays if (isnull(our_overlays)) our_overlays = list("on" = iconstate2appearance(overlay_icon, "on"), "off" = iconstate2appearance(overlay_icon, "off"), "broken" = iconstate2appearance(overlay_icon, "broken")) @@ -314,7 +314,7 @@ Good: #define OUR_OFF_OVERLAY 2 #define OUR_BROKEN_OVERLAY 3 -/obj/machine/update_overlays(var/blah) +/obj/machine/update_overlays(blah) var/static/our_overlays if (isnull(our_overlays)) our_overlays = list(iconstate2appearance(overlay_icon, "on"), iconstate2appearance(overlay_icon, "off"), iconstate2appearance(overlay_icon, "broken")) @@ -331,7 +331,7 @@ Storing these in a flat (non-associated) list saves on memory, and using defines Also good: ```dm -/obj/machine/update_overlays(var/blah) +/obj/machine/update_overlays(blah) var/static/on_overlay var/static/off_overlay var/static/broken_overlay diff --git a/.github/guides/STYLE.md b/.github/guides/STYLE.md index 3ef22b687625..87814dfeabd1 100644 --- a/.github/guides/STYLE.md +++ b/.github/guides/STYLE.md @@ -343,7 +343,7 @@ This is good: getter_turned_into_variable = condition ? VALUE_C : VALUE_D ``` -### When passing vars through New() or Initialize()'s arguments, use src.var +### When passing vars through New() or Initialize(mapload)'s arguments, use src.var Using src.var + naming the arguments the same as the var is the most readable and intuitive way to pass arguments into a new instance's vars. The main benefit is that you do not need to give arguments odd names with prefixes and suffixes that are easily forgotten in `new()` when sending named args. This is very bad: diff --git a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm index 6755c0e9dff6..43db37a73bd4 100644 --- a/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm +++ b/code/__DEFINES/dcs/signals/signals_atom/signals_atom_main.dm @@ -3,7 +3,7 @@ // All signals send the source datum of the signal as the first argument // /atom signals -///from base of atom/proc/Initialize(): sent any time a new atom is created in this atom +///from base of atom/proc/Initialize(mapload): sent any time a new atom is created in this atom #define COMSIG_ATOM_INITIALIZED_ON "atom_initialized_on" //from SSatoms InitAtom - Only if the atom was not deleted or failed initialization #define COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZE "atom_init_success" diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index 99aec06ba473..b67a6087889c 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -220,7 +220,7 @@ #define COMSIG_CLOSET_DELIVERED "crate_delivered" ///Eigenstasium -///From base of [/datum/controller/subsystem/eigenstates/proc/use_eigenlinked_atom]: (var/target) +///From base of [/datum/controller/subsystem/eigenstates/proc/use_eigenlinked_atom]: (target) #define COMSIG_EIGENSTATE_ACTIVATE "eigenstate_activate" // /obj signals for economy diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 57cd7e418873..0375106e0f2b 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -37,7 +37,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 #define HOLOGRAM_1 (1<<10) /// TESLA_IGNORE grants immunity from being targeted by tesla-style electricity #define TESLA_IGNORE_1 (1<<11) -///Whether /atom/Initialize() has already run for the object +///Whether /atom/Initialize(mapload) has already run for the object #define INITIALIZED_1 (1<<12) /// was this spawned by an admin? used for stat tracking stuff. #define ADMIN_SPAWNED_1 (1<<13) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 26cc4a4e88a3..3bbf6a8b540c 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -69,9 +69,9 @@ ///New should not call Initialize #define INITIALIZATION_INSSATOMS 0 -///New should call Initialize(TRUE) +///New should call Initialize(mapload, TRUE) #define INITIALIZATION_INNEW_MAPLOAD 2 -///New should call Initialize(FALSE) +///New should call Initialize(mapload, FALSE) #define INITIALIZATION_INNEW_REGULAR 1 //! ### Initialization hints diff --git a/code/__HELPERS/AStar.dm b/code/__HELPERS/AStar.dm index 4323efa55459..382eed951421 100644 --- a/code/__HELPERS/AStar.dm +++ b/code/__HELPERS/AStar.dm @@ -193,7 +193,7 @@ Actual Adjacent procs : L.Add(T) return L -/turf/proc/reachableTurftest(caller, var/turf/T, ID, simulated_only) +/turf/proc/reachableTurftest(caller, turf/T, ID, simulated_only) if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller, ID)) return TRUE @@ -228,7 +228,7 @@ Actual Adjacent procs : if(T && !T.density && !LinkBlockedWithAccess(T, caller, ID) && !(simulated_only && SSpathfinder.space_type_cache[T.type])) return TRUE -/turf/proc/reachableTurftestdensity(caller, var/turf/T, ID, simulated_only) //used for the sake of pathfinding while excluding turfs with dense objects +/turf/proc/reachableTurftestdensity(caller, turf/T, ID, simulated_only) //used for the sake of pathfinding while excluding turfs with dense objects if(T && !T.density && !(simulated_only && SSpathfinder.space_type_cache[T.type]) && !LinkBlockedWithAccess(T,caller, ID)) for(var/obj/D in T) if(D.density) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 786392594510..0fe0b3154d3b 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -436,7 +436,7 @@ viewing += M.client flick_overlay(I, viewing, duration) -/proc/get_active_player_count(var/alive_check = 0, var/afk_check = 0, var/human_check = 0) +/proc/get_active_player_count(alive_check = 0, afk_check = 0, human_check = 0) // Get active players who are playing in the round var/active_players = 0 for(var/i = 1; i <= GLOB.player_list.len; i++) @@ -646,8 +646,6 @@ ++i return L -/proc/poll_helper(var/mob/living/M) - /proc/makeBody(mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character if(!G_found || !G_found.key) return @@ -689,7 +687,7 @@ return A.loc -/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) +/proc/AnnounceArrival(mob/living/carbon/human/character, rank) if(!SSticker.IsRoundInProgress() || QDELETED(character)) return var/area/A = get_area(character) @@ -724,7 +722,7 @@ return (is_type_in_list(item, pire_wire)) // Find a obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type. -/proc/find_obstruction_free_location(var/range, var/atom/center, var/area/specific_area) +/proc/find_obstruction_free_location(range, atom/center, area/specific_area) var/list/turfs = RANGE_TURFS(range, center) var/list/possible_loc = list() diff --git a/code/__HELPERS/heap.dm b/code/__HELPERS/heap.dm index 916e7fc05c5a..1e369fd7e181 100644 --- a/code/__HELPERS/heap.dm +++ b/code/__HELPERS/heap.dm @@ -33,7 +33,7 @@ Sink(1) //Get a node up to its right position in the heap -/datum/Heap/proc/Swim(var/index) +/datum/Heap/proc/Swim(index) var/parent = round(index * 0.5) while(parent > 0 && (call(cmp)(L[index],L[parent]) > 0)) @@ -42,7 +42,7 @@ parent = round(index * 0.5) //Get a node down to its right position in the heap -/datum/Heap/proc/Sink(var/index) +/datum/Heap/proc/Sink(index) var/g_child = GetGreaterChild(index) while(g_child > 0 && (call(cmp)(L[index],L[g_child]) < 0)) @@ -52,7 +52,7 @@ //Returns the greater (relative to the comparison proc) of a node children //or 0 if there's no child -/datum/Heap/proc/GetGreaterChild(var/index) +/datum/Heap/proc/GetGreaterChild(index) if(index * 2 > L.len) return 0 diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 801a2cd4319f..41b9d266c59e 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -299,7 +299,7 @@ return A && A.type == source.type ? A : null //Icon smoothing helpers -/proc/smooth_zlevel(var/zlevel, now = FALSE) +/proc/smooth_zlevel(zlevel, now = FALSE) var/list/away_turfs = block(locate(1, 1, zlevel), locate(world.maxx, world.maxy, zlevel)) for(var/V in away_turfs) var/turf/T = V diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index ab87a94d1fc9..636e4735bc02 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -165,15 +165,18 @@ round(cos_inv_third+sqrt3_sin, 0.001), round(cos_inv_third-sqrt3_sin, 0.001), ro //These next three rotate values about one axis only //x is the red axis, y is the green axis, z is the blue axis. /proc/color_matrix_rotate_x(angle) - var/sinval = round(sin(angle), 0.001); var/cosval = round(cos(angle), 0.001) + var/sinval = round(sin(angle), 0.001) + var/cosval = round(cos(angle), 0.001) return list(1,0,0,0, 0,cosval,sinval,0, 0,-sinval,cosval,0, 0,0,0,1, 0,0,0,0) /proc/color_matrix_rotate_y(angle) - var/sinval = round(sin(angle), 0.001); var/cosval = round(cos(angle), 0.001) + var/sinval = round(sin(angle), 0.001) + var/cosval = round(cos(angle), 0.001) return list(cosval,0,-sinval,0, 0,1,0,0, sinval,0,cosval,0, 0,0,0,1, 0,0,0,0) /proc/color_matrix_rotate_z(angle) - var/sinval = round(sin(angle), 0.001); var/cosval = round(cos(angle), 0.001) + var/sinval = round(sin(angle), 0.001) + var/cosval = round(cos(angle), 0.001) return list(cosval,sinval,0,0, -sinval,cosval,0,0, 0,0,1,0, 0,0,0,1, 0,0,0,0) diff --git a/code/__HELPERS/records.dm b/code/__HELPERS/records.dm index 0f2453373313..89fc67721fe0 100644 --- a/code/__HELPERS/records.dm +++ b/code/__HELPERS/records.dm @@ -1,5 +1,5 @@ -/proc/overwrite_field_if_available(datum/data/record/base, datum/data/record/other, var/field_name) +/proc/overwrite_field_if_available(datum/data/record/base, datum/data/record/other, field_name) if(other.fields[field_name]) base.fields[field_name] = other.fields[field_name] diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 9da27183de78..42907e430e6d 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -519,7 +519,7 @@ //The string is well, obviously the string being checked //The datum is used as a source for var names, to check validity //Otherwise every single word could technically be a variable! -/proc/string2listofvars(var/t_string, var/datum/var_source) +/proc/string2listofvars(t_string, datum/var_source) if(!t_string || !var_source) return list() diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 3600fb33ef40..4d29da2282aa 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -874,7 +874,7 @@ B --><-- A // eg: center_image(I, 32,32) // eg2: center_image(I, 96,96) -/proc/center_image(var/image/I, x_dimension = 0, y_dimension = 0) +/proc/center_image(image/I, x_dimension = 0, y_dimension = 0) if(!I) return @@ -1031,7 +1031,7 @@ B --><-- A return L -/atom/proc/contains(var/atom/A) +/atom/proc/contains(atom/A) if(!A) return 0 for(var/atom/location = A.loc, location, location = location.loc) @@ -1184,7 +1184,7 @@ GLOBAL_REAL_VAR(list/stack_trace_storage) pixel_x = initialpixelx pixel_y = initialpixely -/proc/weightclass2text(var/w_class) +/proc/weightclass2text(w_class) switch(w_class) if(WEIGHT_CLASS_TINY) . = "tiny" @@ -1223,7 +1223,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) move_resist = INFINITY var/ready_to_die = FALSE -/mob/dview/Initialize() //Properly prevents this mob from gaining huds or joining any global lists +/mob/dview/Initialize(mapload) //Properly prevents this mob from gaining huds or joining any global lists SHOULD_CALL_PARENT(FALSE) if(flags_1 & INITIALIZED_1) stack_trace("Warning: [src]([type]) initialized multiple times!") @@ -1500,7 +1500,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) for(var/i in L) if(condition.Invoke(i)) . |= i -/proc/generate_items_inside(list/items_list,var/where_to) +/proc/generate_items_inside(list/items_list, where_to) for(var/each_item in items_list) for(var/i in 1 to items_list[each_item]) new each_item(where_to) diff --git a/code/__HELPERS/unused.dm b/code/__HELPERS/unused.dm index fce25720b751..8280bb73b7f2 100644 --- a/code/__HELPERS/unused.dm +++ b/code/__HELPERS/unused.dm @@ -10,8 +10,7 @@ var/dest_x var/dest_y -/datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \ - var/power_x, var/power_y, var/dest_x, var/dest_y) +/datum/projectile_data/New(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y) src.src_x = src_x src.src_y = src_y src.time = time diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index c0f1b81582a1..c9746fae9806 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -14,7 +14,7 @@ return 0 // Not a sane use of the function and (for now) indicative of an error elsewhere -/area/Adjacent(var/atom/neighbor) +/area/Adjacent(atom/neighbor) CRASH("Call to /area/Adjacent(), unimplemented proc") @@ -65,7 +65,7 @@ Adjacency (to anything else): * Must be on a turf */ -/atom/movable/Adjacent(var/atom/neighbor) +/atom/movable/Adjacent(atom/neighbor) if(neighbor == loc) return TRUE var/turf/T = loc @@ -76,7 +76,7 @@ return FALSE // This is necessary for storage items not on your person. -/obj/item/Adjacent(var/atom/neighbor, var/recurse = 1) +/obj/item/Adjacent(atom/neighbor, recurse = 1) if(neighbor == loc) return 1 if(isitem(loc)) diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index c7ba9f29c6fe..e1ed79d14053 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -9,7 +9,7 @@ Note that AI have no need for the adjacency proc, and so this proc is a lot cleaner. */ -/mob/living/silicon/ai/DblClickOn(var/atom/A, params) +/mob/living/silicon/ai/DblClickOn(atom/A, params) if(control_disabled || incapacitated()) return @@ -18,7 +18,7 @@ else A.move_camera_by_click() -/mob/living/silicon/ai/ClickOn(var/atom/A, params) +/mob/living/silicon/ai/ClickOn(atom/A, params) if(world.time <= next_click) return next_click = world.time + 1 @@ -99,14 +99,16 @@ for AI shift, ctrl, and alt clicking. */ -/mob/living/silicon/ai/CtrlShiftClickOn(var/atom/A) +/mob/living/silicon/ai/CtrlShiftClickOn(atom/A) A.AICtrlShiftClick(src) -/mob/living/silicon/ai/ShiftClickOn(var/atom/A) + +/mob/living/silicon/ai/ShiftClickOn(atom/A) A.AIShiftClick(src) -/mob/living/silicon/ai/CtrlClickOn(var/atom/A) +/mob/living/silicon/ai/CtrlClickOn(atom/A) A.AICtrlClick(src) -/mob/living/silicon/ai/AltClickOn(var/atom/A) + +/mob/living/silicon/ai/AltClickOn(atom/A) A.AIAltClick(src) /* @@ -199,5 +201,5 @@ // Override TurfAdjacent for AltClicking // -/mob/living/silicon/ai/TurfAdjacent(var/turf/T) +/mob/living/silicon/ai/TurfAdjacent(turf/T) return (GLOB.cameranet && GLOB.cameranet.checkTurfVis(T)) diff --git a/code/_onclick/cyborg.dm b/code/_onclick/cyborg.dm index 607f4a532891..c9ced2e9fcf5 100644 --- a/code/_onclick/cyborg.dm +++ b/code/_onclick/cyborg.dm @@ -6,7 +6,7 @@ adjacency code. */ -/mob/living/silicon/robot/ClickOn(var/atom/A, var/params) +/mob/living/silicon/robot/ClickOn(atom/A, params) if(HAS_TRAIT(src, TRAIT_NOINTERACT)) // INTERCEPTED to_chat(src, span_danger("You can't interact with anything right now!")) return diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index 993180bba4ab..ed1e17115f5f 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -350,7 +350,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion." var/angle = 0 var/mob/living/simple_animal/hostile/construct/Cviewer = null -/atom/movable/screen/alert/bloodsense/Initialize() +/atom/movable/screen/alert/bloodsense/Initialize(mapload) . = ..() narnar = new('icons/mob/screen_alert.dmi', "mini_nar") START_PROCESSING(SSprocessing, src) diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm index 19b45b7b04b2..ca010c562392 100644 --- a/code/_onclick/hud/fullscreen.dm +++ b/code/_onclick/hud/fullscreen.dm @@ -180,7 +180,7 @@ color = "#000000" show_when_dead = TRUE -/atom/movable/screen/fullscreen/cinematic_backdrop/Initialize() +/atom/movable/screen/fullscreen/cinematic_backdrop/Initialize(mapload) . = ..() layer = SPLASHSCREEN_LAYER - 1 diff --git a/code/_onclick/hud/picture_in_picture.dm b/code/_onclick/hud/picture_in_picture.dm index 6cf1bfd6a634..354a6ed54630 100644 --- a/code/_onclick/hud/picture_in_picture.dm +++ b/code/_onclick/hud/picture_in_picture.dm @@ -14,7 +14,7 @@ var/mutable_appearance/standard_background var/const/max_dimensions = 10 -/atom/movable/screen/movable/pic_in_pic/Initialize() +/atom/movable/screen/movable/pic_in_pic/Initialize(mapload) . = ..() make_backgrounds() diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm index a789c0d24077..b9a47e411f32 100644 --- a/code/_onclick/hud/plane_master.dm +++ b/code/_onclick/hud/plane_master.dm @@ -78,7 +78,7 @@ blend_mode = BLEND_MULTIPLY mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/atom/movable/screen/plane_master/lighting/Initialize() +/atom/movable/screen/plane_master/lighting/Initialize(mapload) . = ..() filters += filter(type="alpha", render_source = EMISSIVE_RENDER_TARGET, flags = MASK_INVERSE) filters += filter(type="alpha", render_source = EMISSIVE_UNBLOCKABLE_RENDER_TARGET, flags = MASK_INVERSE) @@ -98,7 +98,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT render_target = EMISSIVE_RENDER_TARGET -/atom/movable/screen/plane_master/emissive/Initialize() +/atom/movable/screen/plane_master/emissive/Initialize(mapload) . = ..() filters += filter(type="alpha", render_source=EMISSIVE_BLOCKER_RENDER_TARGET, flags=MASK_INVERSE) // Should be moved to the world render plate when render plates get ported in diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index abea6dc94a1a..2e03a4c54680 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -22,7 +22,7 @@ forceMove(get_turf(A)) update_parallax_contents() -/mob/dead/observer/ClickOn(var/atom/A, var/params) +/mob/dead/observer/ClickOn(atom/A, params) if(check_click_intercept(params,A)) return diff --git a/code/_onclick/overmind.dm b/code/_onclick/overmind.dm index 8ace273dd8fe..40c60b992686 100644 --- a/code/_onclick/overmind.dm +++ b/code/_onclick/overmind.dm @@ -1,7 +1,7 @@ // Blob Overmind Controls -/mob/camera/blob/ClickOn(var/atom/A, var/params) //Expand blob +/mob/camera/blob/ClickOn(atom/A, params) //Expand blob var/list/modifiers = params2list(params) if(modifiers["middle"]) MiddleClickOn(A) @@ -32,4 +32,4 @@ /mob/camera/blob/AltClickOn(atom/A) //Remove a blob var/turf/T = get_turf(A) if(T) - remove_blob(T) \ No newline at end of file + remove_blob(T) diff --git a/code/_onclick/pai.dm b/code/_onclick/pai.dm index 7d1fc253433c..bf027a1887f8 100644 --- a/code/_onclick/pai.dm +++ b/code/_onclick/pai.dm @@ -1,6 +1,6 @@ -/mob/living/silicon/pai/ClickOn(var/atom/A, params) +/mob/living/silicon/pai/ClickOn(atom/A, params) ..() if(aicamera.in_camera_mode) //pAI picture taking aicamera.camera_mode_off() aicamera.captureimage(A, usr, null, aicamera.picture_size_x, aicamera.picture_size_y) - return \ No newline at end of file + return diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 36ca113bc782..c622cefd7656 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -82,7 +82,7 @@ var/atom/movable/focus = null var/mob/living/carbon/tk_user = null -/obj/item/tk_grab/Initialize() +/obj/item/tk_grab/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/code/controllers/master.dm b/code/controllers/master.dm index cadf504d0a2a..7af5e449d917 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -207,7 +207,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new Initialize(20, TRUE) // Please don't stuff random bullshit here, -// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize() +// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize(mapload) /datum/controller/master/Initialize(delay, init_sss, tgs_prime) set waitfor = 0 @@ -322,9 +322,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if(result && !(result in valid_results)) warning("[subsystem.name] subsystem initialized, returning invalid result [result]. This is a bug.") - // just returned ..() or didn't implement Initialize() at all + // just returned ..() or didn't implement Initialize(mapload) at all if(result == SS_INIT_NONE) - warning("[subsystem.name] subsystem does not implement Initialize() or it returns ..(). If the former is true, the SS_NO_INIT flag should be set for this subsystem.") + warning("[subsystem.name] subsystem does not implement Initialize(mapload) or it returns ..(). If the former is true, the SS_NO_INIT flag should be set for this subsystem.") if(result != SS_INIT_FAILURE) // Some form of success, implicit failure, or the SS in unused. diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index 625317c23513..e7e6275cd8bc 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -192,13 +192,13 @@ SUBSYSTEM_DEF(atoms) . += "Path : [path] \n" var/fails = BadInitializeCalls[path] if(fails & BAD_INIT_DIDNT_INIT) - . += "- Didn't call atom/Initialize()\n" + . += "- Didn't call atom/Initialize(mapload)\n" if(fails & BAD_INIT_NO_HINT) . += "- Didn't return an Initialize hint\n" if(fails & BAD_INIT_QDEL_BEFORE) . += "- Qdel'd in New()\n" if(fails & BAD_INIT_SLEPT) - . += "- Slept during Initialize()\n" + . += "- Slept during Initialize(mapload)\n" /// Prepares an atom to be deleted once the atoms SS is initialized. /datum/controller/subsystem/atoms/proc/prepare_deletion(atom/target) diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index d54de2030372..b8b3396a129c 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -409,7 +409,7 @@ GLOBAL_LIST_EMPTY(the_station_areas) if (. && VM.map_name != config.map_name) to_chat(world, span_boldannounce("Map rotation has chosen [VM.map_name] for next round!")) -/datum/controller/subsystem/mapping/proc/changemap(var/datum/map_config/VM) +/datum/controller/subsystem/mapping/proc/changemap(datum/map_config/VM) if(!VM.MakeNextMap()) next_map_config = load_map_config(default_to_box = TRUE) message_admins("Failed to set new map with next_map.json for [VM.map_name]! Using default as backup!") diff --git a/code/controllers/subsystem/pai.dm b/code/controllers/subsystem/pai.dm index 21c5c7d8e4dc..b14d0c60deb9 100644 --- a/code/controllers/subsystem/pai.dm +++ b/code/controllers/subsystem/pai.dm @@ -133,7 +133,7 @@ SUBSYSTEM_DEF(pai) /datum/controller/subsystem/pai/proc/spam_again() ghost_spam = FALSE -/datum/controller/subsystem/pai/proc/check_ready(var/datum/paiCandidate/C) +/datum/controller/subsystem/pai/proc/check_ready(datum/paiCandidate/C) if(!C.ready) return FALSE for(var/mob/dead/observer/O in GLOB.player_list) diff --git a/code/controllers/subsystem/pathfinder.dm b/code/controllers/subsystem/pathfinder.dm index 4b7b42f9ec2b..3c29aa03d833 100644 --- a/code/controllers/subsystem/pathfinder.dm +++ b/code/controllers/subsystem/pathfinder.dm @@ -18,7 +18,7 @@ SUBSYSTEM_DEF(pathfinder) var/free var/list/flow -/datum/flowcache/New(var/n) +/datum/flowcache/New(n) . = ..() lcount = n run = 0 diff --git a/code/datums/brain_damage/imaginary_friend.dm b/code/datums/brain_damage/imaginary_friend.dm index 9ca7d97f2f70..7d5685af7c03 100644 --- a/code/datums/brain_damage/imaginary_friend.dm +++ b/code/datums/brain_damage/imaginary_friend.dm @@ -133,7 +133,7 @@ client.images.Remove(human_image) return ..() -/mob/camera/imaginary_friend/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/camera/imaginary_friend/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if (!message) return diff --git a/code/datums/brain_damage/special.dm b/code/datums/brain_damage/special.dm index 15cc23f3a267..f8efbfe4a24a 100644 --- a/code/datums/brain_damage/special.dm +++ b/code/datums/brain_damage/special.dm @@ -102,7 +102,7 @@ var/obj/effect/hallucination/simple/bluespace_stream/linked_to var/mob/living/carbon/seer -/obj/effect/hallucination/simple/bluespace_stream/Initialize() +/obj/effect/hallucination/simple/bluespace_stream/Initialize(mapload) . = ..() QDEL_IN(src, 300) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index fb642e1fa708..194fe379a061 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -156,7 +156,7 @@ to_chat(src, span_notice("As a split personality, you cannot do anything but observe. However, you will eventually gain control of your body, switching places with the current personality.")) to_chat(src, span_warning("Do not commit suicide or put the body in a deadly position. Behave like you care about it as much as the owner.")) -/mob/living/split_personality/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/split_personality/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) to_chat(src, span_warning("You cannot speak, your other self is controlling your body!")) return FALSE diff --git a/code/datums/browser.dm b/code/datums/browser.dm index d6c79668cf3a..815e0dac693b 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -15,7 +15,7 @@ var/static/datum/asset/simple/namespaced/common/common_asset = get_asset_datum(/datum/asset/simple/namespaced/common) -/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null) +/datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null) user = nuser window_id = nwindow_id @@ -189,14 +189,14 @@ return Button3 //Same shit, but it returns the button number, could at some point support unlimited button amounts. -/proc/askuser(var/mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000) - if (!istype(User)) - if (istype(User, /client/)) - var/client/C = User - User = C.mob +/proc/askuser(mob/asked_user, Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1, Timeout = 6000) + if (!istype(asked_user)) + if (istype(asked_user, /client)) + var/client/C = asked_user + asked_user = C.mob else return - var/datum/browser/modal/alert/A = new(User, Message, Title, Button1, Button2, Button3, StealFocus, Timeout) + var/datum/browser/modal/alert/A = new(asked_user, Message, Title, Button1, Button2, Button3, StealFocus, Timeout) A.open() A.wait() if (A.selectedbutton) @@ -208,7 +208,7 @@ var/selectedbutton = 0 var/stealfocus -/datum/browser/modal/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null, StealFocus = 1, Timeout = 6000) +/datum/browser/modal/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, atom/nref = null, StealFocus = 1, Timeout = 6000) ..() stealfocus = StealFocus if (!StealFocus) @@ -300,7 +300,7 @@ opentime = 0 close() -/proc/presentpicker(var/mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1,Timeout = 6000,list/values, inputtype = "checkbox", width, height, slidecolor) +/proc/presentpicker(mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1,Timeout = 6000,list/values, inputtype = "checkbox", width, height, slidecolor) if (!istype(User)) if (istype(User, /client/)) var/client/C = User @@ -313,7 +313,7 @@ if (A.selectedbutton) return list("button" = A.selectedbutton, "values" = A.valueslist) -/proc/input_bitfield(var/mob/User, title, bitfield, current_value, nwidth = 350, nheight = 350, nslidecolor, allowed_edit_list = null) +/proc/input_bitfield(mob/User, title, bitfield, current_value, nwidth = 350, nheight = 350, nslidecolor, allowed_edit_list = null) if (!User || !(bitfield in GLOB.bitfields)) return var/list/pickerlist = list() @@ -422,7 +422,7 @@ opentime = 0 close() -/proc/presentpreflikepicker(var/mob/User,Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1,Timeout = 6000,list/settings, width, height, slidecolor) +/proc/presentpreflikepicker(mob/User, Message, Title, Button1="Ok", Button2, Button3, StealFocus = 1,Timeout = 6000, list/settings, width, height, slidecolor) if (!istype(User)) if (istype(User, /client/)) var/client/C = User diff --git a/code/datums/components/README.md b/code/datums/components/README.md index 307459c36ac8..9db03c5dfc5d 100644 --- a/code/datums/components/README.md +++ b/code/datums/components/README.md @@ -70,7 +70,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * Returns a bitflag with signal specific information assembled from all activated components * Arguments are packaged in a list and handed off to _SendSignal() 1. `/datum/proc/AddComponent(component_type(type), ...) -> datum/component` (public, final) - * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize()` call + * Creates an instance of `component_type` in the datum and passes `...` to its `Initialize(mapload)` call * Sends the `COMSIG_COMPONENT_ADDED` signal to the datum * All components a datum owns are deleted with the datum * Returns the component that was created. Or the old component in a dupe situation where `COMPONENT_DUPE_UNIQUE` was set @@ -98,7 +98,7 @@ Stands have a lot of procs which mimic mob procs. Rather than inserting hooks fo * Returning `TRUE` from these callbacks will trigger a `TRUE` return from the `SendSignal()` that initiated it 1. `/datum/component/New(datum/parent, ...)` (private, final) * Runs internal setup for the component - * Extra arguments are passed to `Initialize()` + * Extra arguments are passed to `Initialize(mapload)` 1. `/datum/component/Initialize(...)` (abstract, no-sleep) * Called by `New()` with the same argments excluding `parent` * Component does not exist in `parent`'s `datum_components` list yet, although `parent` is set and may be used diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index 27f427ed70bd..3d201a78c066 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -21,7 +21,7 @@ /** * Create a new component. * - * Additional arguments are passed to [Initialize()][/datum/component/proc/Initialize] + * Additional arguments are passed to [Initialize(mapload)][/datum/component/proc/Initialize] * * Arguments: * * datum/P the parent datum this component reacts to signals from diff --git a/code/datums/components/forced_gravity.dm b/code/datums/components/forced_gravity.dm index 69b36a9ddfc5..90051af551aa 100644 --- a/code/datums/components/forced_gravity.dm +++ b/code/datums/components/forced_gravity.dm @@ -17,4 +17,4 @@ gravs += gravity /datum/component/forced_gravity/proc/turf_gravity_check(datum/source, atom/checker, list/gravs) - return gravity_check(null, parent, gravs) \ No newline at end of file + return gravity_check(null, parent, gravs) diff --git a/code/datums/components/knockoff.dm b/code/datums/components/knockoff.dm index 6675612a00db..e1a317998815 100644 --- a/code/datums/components/knockoff.dm +++ b/code/datums/components/knockoff.dm @@ -41,4 +41,4 @@ RegisterSignal(H, COMSIG_HUMAN_DISARM_HIT, PROC_REF(Knockoff), TRUE) /datum/component/knockoff/proc/OnDropped(datum/source, mob/living/M) - UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) \ No newline at end of file + UnregisterSignal(M, COMSIG_HUMAN_DISARM_HIT) diff --git a/code/datums/components/lifesteal.dm b/code/datums/components/lifesteal.dm index d79f2488f2f2..ae4b22b5336f 100644 --- a/code/datums/components/lifesteal.dm +++ b/code/datums/components/lifesteal.dm @@ -35,4 +35,4 @@ var/mob/living/healing = heal_target var/mob/living/damaging = damage_target if(damaging.stat != DEAD) - healing.heal_ordered_damage(flat_heal, damage_heal_order) \ No newline at end of file + healing.heal_ordered_damage(flat_heal, damage_heal_order) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 069ab8995663..02e801e9c5f1 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -111,7 +111,7 @@ user.put_in_active_hand(I) /// Proc specifically for inserting items, returns the amount of materials entered. -/datum/component/material_container/proc/insert_item(obj/item/I, var/multiplier = 1, stack_amt) +/datum/component/material_container/proc/insert_item(obj/item/I, multiplier = 1, stack_amt) if(!I) return FALSE if(istype(I, /obj/item/stack)) @@ -160,7 +160,7 @@ return amt /// For inserting an amount of material -/datum/component/material_container/proc/insert_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/insert_amount_mat(amt, datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) if(amt > 0 && has_space(amt)) @@ -175,7 +175,7 @@ return FALSE /// Uses an amount of a specific material, effectively removing it. -/datum/component/material_container/proc/use_amount_mat(amt, var/datum/material/mat) +/datum/component/material_container/proc/use_amount_mat(amt, datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) var/amount = materials[mat] @@ -187,7 +187,7 @@ return FALSE /// Proc for transfering materials to another container. -/datum/component/material_container/proc/transer_amt_to(var/datum/component/material_container/T, amt, var/datum/material/mat) +/datum/component/material_container/proc/transer_amt_to(datum/component/material_container/T, amt, datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) if((amt==0)||(!T)||(!mat)) @@ -239,7 +239,7 @@ return total_amount_save - total_amount /// For spawning mineral sheets at a specific location. Used by machines to output sheets. -/datum/component/material_container/proc/retrieve_sheets(sheet_amt, var/datum/material/M, target = null) +/datum/component/material_container/proc/retrieve_sheets(sheet_amt, datum/material/M, target = null) if(!M.sheet_type) return 0 //Add greyscale sheet handling here later if(sheet_amt <= 0) @@ -307,7 +307,7 @@ /// Returns TRUE if you have enough of the specified material. -/datum/component/material_container/proc/has_enough_of_material(var/datum/material/req_mat, amount, multiplier=1) +/datum/component/material_container/proc/has_enough_of_material(datum/material/req_mat, amount, multiplier=1) if(!materials[req_mat]) //Do we have the resource? return FALSE //Can't afford it var/amount_required = amount * multiplier @@ -346,7 +346,7 @@ return material_amount /// Returns the amount of a specific material in this container. -/datum/component/material_container/proc/get_material_amount(var/datum/material/mat) +/datum/component/material_container/proc/get_material_amount(datum/material/mat) if(!istype(mat)) mat = getmaterialref(mat) return(materials[mat]) diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm index e1c871c1e12e..51e0b7691a1a 100644 --- a/code/datums/components/mind_linker.dm +++ b/code/datums/components/mind_linker.dm @@ -31,7 +31,7 @@ /// An assoc list of [mob/living]s to [datum/action/innate/linked_speech]s. All the mobs that are linked to our network. var/list/mob/living/linked_mobs = list() -/datum/component/mind_linker/Initialize( +/datum/component/mind_linker/Initialize( network_name = "Mind Link", chat_color = "#008CA2", linker_action_path, diff --git a/code/datums/components/mood.dm b/code/datums/components/mood.dm index ec5cc7d9b7c5..f1ec58fe7f10 100644 --- a/code/datums/components/mood.dm +++ b/code/datums/components/mood.dm @@ -295,7 +295,7 @@ qdel(event) update_mood() -/datum/component/mood/proc/remove_temp_moods(var/admin) //Removes all temp moods +/datum/component/mood/proc/remove_temp_moods(admin) //Removes all temp moods for(var/i in mood_events) var/datum/mood_event/moodlet = mood_events[i] if(!moodlet || !moodlet.timeout) diff --git a/code/datums/components/shrapnel.dm b/code/datums/components/shrapnel.dm index e33337949a78..424fe7997d45 100644 --- a/code/datums/components/shrapnel.dm +++ b/code/datums/components/shrapnel.dm @@ -35,4 +35,4 @@ P.preparePixelProjectile(shootat_turf, target) P.firer = firer // don't hit ourself that would be really annoying P.permutated += target // don't hit the target we hit already with the flak - P.fire() \ No newline at end of file + P.fire() diff --git a/code/datums/components/spawner.dm b/code/datums/components/spawner.dm index 04437768f32c..0ef245fbc076 100644 --- a/code/datums/components/spawner.dm +++ b/code/datums/components/spawner.dm @@ -7,8 +7,6 @@ var/spawn_text = "emerges from" var/list/faction = list("mining") - - /datum/component/spawner/Initialize(_mob_types, _spawn_time, _faction, _spawn_text, _max_mobs) if(_spawn_time) spawn_time=_spawn_time diff --git a/code/datums/components/tactical.dm b/code/datums/components/tactical.dm index 65da9ecfa95d..97d49183771b 100644 --- a/code/datums/components/tactical.dm +++ b/code/datums/components/tactical.dm @@ -38,4 +38,4 @@ return user = master.loc - user.remove_alt_appearance("sneaking_mission") \ No newline at end of file + user.remove_alt_appearance("sneaking_mission") diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index d205362c0402..6d96b0eafa7a 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -41,12 +41,12 @@ SSdisease.active_diseases.Remove(src) //add this disease if the host does not already have too many -/datum/disease/proc/try_infect(var/mob/living/infectee, make_copy = TRUE) +/datum/disease/proc/try_infect(mob/living/infectee, make_copy = TRUE) infect(infectee, make_copy) return TRUE //add the disease with no checks -/datum/disease/proc/infect(var/mob/living/infectee, make_copy = TRUE) +/datum/disease/proc/infect(mob/living/infectee, make_copy = TRUE) var/datum/disease/D = make_copy ? Copy() : src infectee.diseases += D D.affected_mob = infectee diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index d063dcb75637..d168843ff7ab 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -85,7 +85,7 @@ S.End(src) return ..() -/datum/disease/advance/try_infect(var/mob/living/infectee, make_copy = TRUE) +/datum/disease/advance/try_infect(mob/living/infectee, make_copy = TRUE) //see if we are more transmittable than enough diseases to replace them //diseases replaced in this way do not confer immunity var/list/advance_diseases = list() @@ -391,7 +391,7 @@ */ // Mix a list of advance diseases and return the mixed result. -/proc/Advance_Mix(var/list/D_list) +/proc/Advance_Mix(list/D_list) var/list/diseases = list() for(var/datum/disease/advance/A in D_list) diff --git a/code/datums/diseases/advance/symptoms/narcolepsy.dm b/code/datums/diseases/advance/symptoms/narcolepsy.dm index 09b892e0906f..b7086d1e9079 100644 --- a/code/datums/diseases/advance/symptoms/narcolepsy.dm +++ b/code/datums/diseases/advance/symptoms/narcolepsy.dm @@ -41,7 +41,7 @@ Bonus symptom_delay_min = 10 symptom_delay_max = 60 -/datum/symptom/narcolepsy/Activate(var/datum/disease/advance/A) +/datum/symptom/narcolepsy/Activate(datum/disease/advance/A) var/mob/living/M = A.affected_mob //this ticks even when on cooldown switch(sleep_level) //Works sorta like morphine diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index be603032d9a6..102a4b3cb4b6 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -28,7 +28,7 @@ if(A.totalTransmittable() >= 8) //purge alcohol purge_alcohol = TRUE -/datum/symptom/mind_restoration/Activate(var/datum/disease/advance/A) +/datum/symptom/mind_restoration/Activate(datum/disease/advance/A) . = ..() if(!.) return diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 0d39ad0650ef..3e696b4c3211 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -73,7 +73,7 @@ new_mob.real_name = new_mob.name qdel(affected_mob) -/datum/disease/transformation/proc/replace_banned_player(var/mob/living/new_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed. +/datum/disease/transformation/proc/replace_banned_player(mob/living/new_mob) // This can run well after the mob has been transferred, so need a handle on the new mob to kill it if needed. set waitfor = FALSE var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [affected_mob.name]?", bantype, null, bantype, 50, affected_mob) diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm index fac9f4fcb19e..7f7840651fa5 100644 --- a/code/datums/dog_fashion.dm +++ b/code/datums/dog_fashion.dm @@ -31,7 +31,7 @@ if(speak_emote) D.speak_emote = speak_emote -/datum/dog_fashion/proc/get_overlay(var/dir) +/datum/dog_fashion/proc/get_overlay(dir) if(icon_file && obj_icon_state) var/image/corgI = image(icon_file, obj_icon_state, dir = dir) corgI.alpha = obj_alpha diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 69e72cdc55e6..72a4b6c67ab5 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -70,7 +70,7 @@ legsweep.Remove(H) lungpunch.Remove(H) -/datum/martial_art/krav_maga/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/krav_maga/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) switch(streak) if("neck_chop") streak = "" @@ -86,7 +86,7 @@ return 1 return 0 -/datum/martial_art/krav_maga/proc/leg_sweep(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/krav_maga/proc/leg_sweep(mob/living/carbon/human/A, mob/living/carbon/human/D) if(D.stat || D.IsParalyzed()) return 0 D.visible_message(span_warning("[A] leg sweeps [D]!"), \ @@ -97,7 +97,7 @@ log_combat(A, D, "leg sweeped") return 1 -/datum/martial_art/krav_maga/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch +/datum/martial_art/krav_maga/proc/quick_choke(mob/living/carbon/human/A, mob/living/carbon/human/D)//is actually lung punch D.visible_message(span_warning("[A] pounds [D] on the chest!"), \ span_userdanger("[A] slams your chest! You can't breathe!")) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) @@ -107,7 +107,7 @@ log_combat(A, D, "quickchoked") return 1 -/datum/martial_art/krav_maga/proc/neck_chop(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/krav_maga/proc/neck_chop(mob/living/carbon/human/A, mob/living/carbon/human/D) D.visible_message(span_warning("[A] karate chops [D]'s neck!"), \ span_userdanger("[A] karate chops your neck, rendering you unable to speak!")) playsound(get_turf(A), 'sound/effects/hit_punch.ogg', 50, 1, -1) @@ -117,7 +117,7 @@ log_combat(A, D, "neck chopped") return 1 -/datum/martial_art/krav_maga/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/krav_maga/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) if(check_streak(A,D)) return 1 log_combat(A, D, "punched") @@ -138,7 +138,7 @@ log_combat(A, D, "[picked_hit_type] with [name]") return 1 -/datum/martial_art/krav_maga/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/krav_maga/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) if(check_streak(A,D)) return 1 var/obj/item/I = null diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index d1371fa84f9b..1d7f01be197b 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -17,7 +17,7 @@ var/datum/action/strike/strike = new/datum/action/strike() var/datum/action/drop/drop = new/datum/action/drop() -/datum/martial_art/wrestling/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D) +/datum/martial_art/wrestling/proc/check_streak(mob/living/carbon/human/A, mob/living/carbon/human/D) switch(streak) if("drop") streak = "" diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index 340d1e5e9ca5..557516cdc1c5 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -37,7 +37,7 @@ Simple datum which is instanced once per type and is used for every object of sa on_applied_obj(source, amount, material_flags) ///This proc is called when the material is added to an object specifically. -/datum/material/proc/on_applied_obj(var/obj/o, amount, material_flags) +/datum/material/proc/on_applied_obj(obj/o, amount, material_flags) var/new_max_integrity = CEILING(o.max_integrity * integrity_modifier, 1) // This is to keep the same damage relative to the max integrity of the object o.obj_integrity = (o.obj_integrity / o.max_integrity) * new_max_integrity @@ -57,7 +57,7 @@ Simple datum which is instanced once per type and is used for every object of sa on_removed_obj(source, material_flags) ///This proc is called when the material is removed from an object specifically. -/datum/material/proc/on_removed_obj(var/obj/o, amount, material_flags) +/datum/material/proc/on_removed_obj(obj/o, amount, material_flags) var/new_max_integrity = initial(o.max_integrity) // This is to keep the same damage relative to the max integrity of the object o.obj_integrity = (o.obj_integrity / o.max_integrity) * new_max_integrity diff --git a/code/datums/mind.dm b/code/datums/mind.dm index fe4c30cd5e46..d99069f8125a 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -110,7 +110,7 @@ return language_holder -/datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0) +/datum/mind/proc/transfer_to(mob/new_character, force_key_move = 0) original_character = null var/mood_was_enabled = FALSE//Yogs -- Mood Preferences if(current) // remove ourself from our old body's mind variable diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index ab60feae9839..7021e776989a 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -291,7 +291,7 @@ return types /// Return a list of types to pregenerate for later equipping -/// This should not be things that do unique stuff in Initialize() based off their location, since we'll be storing them for a while +/// This should not be things that do unique stuff in Initialize(mapload) based off their location, since we'll be storing them for a while /datum/outfit/proc/get_types_to_preload() var/list/preload = list() preload += id diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 11141e3452e1..0062c939d8bb 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -12,7 +12,7 @@ default /datum/recipe/ procs does not rely on this parameter. * * Functions you need: - * /datum/recipe/proc/make(var/obj/container as obj) + * /datum/recipe/proc/make(obj/container as obj) * Creates result inside container, * deletes prerequisite reagents, * transfers reagents from prerequisite objects, @@ -25,10 +25,10 @@ * * * Functions you do not need to call directly but could: - * /datum/recipe/proc/check_reagents(var/datum/reagents/avail_reagents) + * /datum/recipe/proc/check_reagents(datum/reagents/avail_reagents) * //1=precisely, 0=insufficiently, -1=superfluous * - * /datum/recipe/proc/check_items(var/obj/container as obj) + * /datum/recipe/proc/check_items(obj/container as obj) * //1=precisely, 0=insufficiently, -1=superfluous * * */ diff --git a/code/datums/status_effects/debuffs/debuffs.dm b/code/datums/status_effects/debuffs/debuffs.dm index 023e6b323ad1..7b3d069bac4a 100644 --- a/code/datums/status_effects/debuffs/debuffs.dm +++ b/code/datums/status_effects/debuffs/debuffs.dm @@ -737,7 +737,7 @@ /obj/effect/temp_visual/curse icon_state = "curse" -/obj/effect/temp_visual/curse/Initialize() +/obj/effect/temp_visual/curse/Initialize(mapload) . = ..() deltimer(timerid) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 959e14547c68..c269471969de 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -40,7 +40,7 @@ var/vacuum = null //yogs- yellow vacuum lights var/requires_power = TRUE - var/always_unpowered = FALSE // This gets overridden to 1 for space in area/Initialize(). + var/always_unpowered = FALSE // This gets overridden to 1 for space in area/Initialize(mapload). var/outdoors = FALSE //For space, the asteroid, lavaland, etc. Used with blueprints to determine if we are adding a new area (vs editing a station room) @@ -98,7 +98,7 @@ var/turf/teleport_anchors = list() //ist of tiles we prefer to teleport to. this is for areas that are partially hazardous like for instance atmos_distro - ///This datum, if set, allows terrain generation behavior to be ran on Initialize() + ///This datum, if set, allows terrain generation behavior to be ran on Initialize(mapload) var/datum/map_generator/map_generator /** * A list of teleport locations @@ -158,7 +158,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) * * returns INITIALIZE_HINT_LATELOAD */ -/area/Initialize() +/area/Initialize(mapload) icon_state = "" layer = AREA_LAYER uid = ++global_uid diff --git a/code/game/area/areas/centcom.dm b/code/game/area/areas/centcom.dm index 0a4ab21e2fbb..4472083a4983 100644 --- a/code/game/area/areas/centcom.dm +++ b/code/game/area/areas/centcom.dm @@ -51,7 +51,7 @@ icon_state = "supplypod_loading" var/loading_id = "" -/area/centcom/supplypod/loading/Initialize() +/area/centcom/supplypod/loading/Initialize(mapload) . = ..() if(!loading_id) CRASH("[type] created without a loading_id") diff --git a/code/game/area/areas/holodeck.dm b/code/game/area/areas/holodeck.dm index bfe23c02432c..45d4e0eb5e69 100644 --- a/code/game/area/areas/holodeck.dm +++ b/code/game/area/areas/holodeck.dm @@ -14,7 +14,7 @@ Asserts are to avoid the inevitable infinite loops */ -/area/holodeck/powered(var/chan) +/area/holodeck/powered(chan) if(!requires_power) return 1 if(always_unpowered) @@ -25,7 +25,7 @@ ASSERT(!istype(A, /area/holodeck)) return A.powered(chan) -/area/holodeck/usage(var/chan) +/area/holodeck/usage(chan) if(!linked) return 0 var/area/A = get_area(linked) @@ -39,7 +39,7 @@ ASSERT(!istype(A, /area/holodeck)) return A.addStaticPower(value,powerchannel) -/area/holodeck/use_power(var/amount, var/chan) +/area/holodeck/use_power(amount, chan) if(!linked) return 0 var/area/A = get_area(linked) diff --git a/code/game/area/areas/shuttles.dm b/code/game/area/areas/shuttles.dm index 6e3f25170c6b..5646cdfe9ee7 100644 --- a/code/game/area/areas/shuttles.dm +++ b/code/game/area/areas/shuttles.dm @@ -14,7 +14,7 @@ ///list of miners & their mining points from gems to be given once all exports are processed, used by supply shuttles var/list/gem_payout = list() -/area/shuttle/Initialize() +/area/shuttle/Initialize(mapload) if(!canSmoothWithAreas) canSmoothWithAreas = type . = ..() diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 2f56cb42e14a..6e828d26c9bc 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -1423,7 +1423,7 @@ return output ///Sets the custom materials for an item. -/atom/proc/set_custom_materials(var/list/materials, multiplier = 1) +/atom/proc/set_custom_materials(list/materials, multiplier = 1) if(custom_materials) //Only runs if custom materials existed at first. Should usually be the case but check anyways for(var/i in custom_materials) var/datum/material/custom_material = i diff --git a/code/game/communications.dm b/code/game/communications.dm index f5bc2f2fa66a..43fe55241042 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -5,7 +5,7 @@ Note that walkie-talkie, intercoms and headsets handle transmission using nonstandard way. procs: - add_object(obj/device as obj, var/new_frequency as num, var/filter as text|null = null) + add_object(obj/device as obj, new_frequency as num, filter as text|null = null) Adds listening object. parameters: device - device receiving signals, must have proc receive_signal (see description below). @@ -23,14 +23,14 @@ Obliviously, after calling this proc, device will not receive any signals on old_frequency. Other frequencies will left unaffected. - return_frequency(var/frequency as num) + return_frequency(frequency as num) returns: Reference to frequency object. Use it if you need to send and do not need to listen. radio_frequency is a global object maintaining list of devices that listening specific frequency. procs: - post_signal(obj/source as obj|null, datum/signal/signal, var/filter as text|null = null, var/range as num|null = null) + post_signal(obj/source as obj|null, datum/signal/signal, filter as text|null = null, range as num|null = null) Sends signal to all devices that wants such signal. parameters: source - object, emitted signal. Usually, devices will not receive their own signals. @@ -38,7 +38,7 @@ filter - described above. range - radius of regular byond's square circle on that z-level. null means everywhere, on all z-levels. - obj/proc/receive_signal(datum/signal/signal, var/receive_method as num, var/receive_param) + obj/proc/receive_signal(datum/signal/signal, receive_method as num, receive_param) Handler from received signals. By default does nothing. Define your own for your object. Avoid of sending signals directly from this proc, use spawn(0). Do not use sleep() here please. parameters: diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index 32eed22b019c..8a04ea7eb217 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -346,7 +346,7 @@ Credit where due:
\ Good luck!" -/obj/item/paper/servant_primer/Initialize() +/obj/item/paper/servant_primer/Initialize(mapload) . = ..() var/changelog = world.file2list("strings/clockwork_cult_changelog.txt") var/changelog_contents = "" diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index a4a2118d473c..3c1c015922eb 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -37,7 +37,7 @@ pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes always_noslip = TRUE -/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize() +/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat/Initialize(mapload) . = ..() var/datum/component/material_container/bananium = GetComponent(/datum/component/material_container) bananium.insert_amount_mat(BANANA_SHOES_MAX_CHARGE, /datum/material/bananium) @@ -74,7 +74,7 @@ light_color = "#ffff00" var/next_trombone_allowed = 0 -/obj/item/melee/transforming/energy/sword/bananium/Initialize() +/obj/item/melee/transforming/energy/sword/bananium/Initialize(mapload) . = ..() adjust_slipperiness() @@ -138,7 +138,7 @@ on_throwforce = 0 on_throw_speed = 1 -/obj/item/shield/energy/bananium/Initialize() +/obj/item/shield/energy/bananium/Initialize(mapload) . = ..() adjust_slipperiness() @@ -192,7 +192,7 @@ var/det_time = 50 var/obj/item/grenade/syndieminibomb/concussion/bomb -/obj/item/grown/bananapeel/bombanana/Initialize() +/obj/item/grown/bananapeel/bombanana/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, det_time) bomb = new /obj/item/grenade/syndieminibomb/concussion(src) @@ -233,7 +233,7 @@ /obj/item/clothing/mask/fakemoustache/sticky var/unstick_time = 600 -/obj/item/clothing/mask/fakemoustache/sticky/Initialize() +/obj/item/clothing/mask/fakemoustache/sticky/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, STICKY_MOUSTACHE_TRAIT) addtimer(CALLBACK(src, PROC_REF(unstick)), unstick_time) @@ -304,7 +304,7 @@ return cell = new /obj/item/stock_parts/cell/hyper(src) -/obj/mecha/combat/honker/dark/loaded/Initialize() +/obj/mecha/combat/honker/dark/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker() ME.attach(src) @@ -318,7 +318,7 @@ internals_req_access = list() wreckage = /obj/structure/mecha_wreckage/honker/dark/crew -/obj/mecha/combat/honker/dark/crew/loaded/Initialize() +/obj/mecha/combat/honker/dark/crew/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/honker() ME.attach(src) diff --git a/code/game/gamemodes/clown_ops/honkmother.dm b/code/game/gamemodes/clown_ops/honkmother.dm index 8ec7e43f13cb..ced8aad4f2d3 100644 --- a/code/game/gamemodes/clown_ops/honkmother.dm +++ b/code/game/gamemodes/clown_ops/honkmother.dm @@ -22,7 +22,7 @@ movement_type = UNSTOPPABLE obj_flags = CAN_BE_HIT | DANGEROUS_POSSESSION -/obj/structure/destructible/honkmother/Initialize() +/obj/structure/destructible/honkmother/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) send_to_playing_players(span_clown("HONK!")) diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index ba24abca5971..67ff6e8e5b36 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -153,7 +153,7 @@ /// Checks for revhead loss conditions and other antag datums. -/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(var/datum/mind/M) +/datum/dynamic_ruleset/latejoin/provocateur/proc/check_eligible(datum/mind/M) var/turf/T = get_turf(M.current) if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD)) return TRUE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 0b44a3425f5c..0b5069abaa5a 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -66,7 +66,7 @@ // Or autotator someone // IMPORTANT, since /datum/dynamic_ruleset/midround may accept candidates from both living, dead, and even antag players, you need to manually check whether there are enough candidates -// (see /datum/dynamic_ruleset/midround/autotraitor/ready(var/forced = FALSE) for example) +// (see /datum/dynamic_ruleset/midround/autotraitor/ready(forced = FALSE) for example) /datum/dynamic_ruleset/midround/ready(forced = FALSE) if (!forced) var/job_check = 0 diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index e71eed4c63ea..109fb635805a 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -505,7 +505,7 @@ return RULESET_STOP_PROCESSING /// Checks for revhead loss conditions and other antag datums. -/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(var/datum/mind/M) +/datum/dynamic_ruleset/roundstart/revs/proc/check_eligible(datum/mind/M) var/turf/T = get_turf(M.current) if(!considered_afk(M) && considered_alive(M) && is_station_level(T.z) && !M.antag_datums?.len && !HAS_TRAIT(M, TRAIT_MINDSHIELD)) return TRUE diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 547ce312adaf..7c9fa59fd698 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -292,7 +292,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/meteorgibs = /obj/effect/gibspawner/generic threat = 2 -/obj/effect/meteor/meaty/Initialize() +/obj/effect/meteor/meaty/Initialize(mapload) for(var/path in meteordrop) if(path == /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant) meteordrop -= path @@ -323,7 +323,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/organ/tongue/alien) meteorgibs = /obj/effect/gibspawner/xeno -/obj/effect/meteor/meaty/xeno/Initialize() +/obj/effect/meteor/meaty/xeno/Initialize(mapload) meteordrop += subtypesof(/obj/item/organ/alien) return ..() @@ -385,7 +385,7 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin)) meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin) threat = 100 -/obj/effect/meteor/pumpkin/Initialize() +/obj/effect/meteor/pumpkin/Initialize(mapload) . = ..() meteorsound = pick('sound/hallucinations/im_here1.ogg','sound/hallucinations/im_here2.ogg') ////////////////////////// diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5b9edd9ecd15..a243dcc03343 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(objectives) var/completed = 0 //currently only used for custom objectives. var/martyr_compatible = 0 //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. -/datum/objective/New(var/text) +/datum/objective/New(text) GLOB.objectives += src if(text) explanation_text = text diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 8d849c8c145e..fd481d935f78 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -10,7 +10,7 @@ idle_power_usage = 0 var/obj/item/beacon/Beacon -/obj/machinery/bluespace_beacon/Initialize() +/obj/machinery/bluespace_beacon/Initialize(mapload) . = ..() var/turf/T = loc Beacon = new(T) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 578981580bb7..d195ef17ae52 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -26,7 +26,7 @@ return -/obj/machinery/pdapainter/Initialize() +/obj/machinery/pdapainter/Initialize(mapload) . = ..() var/list/blocked = list( /obj/item/pda/ai/pai, diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index bf43c4af6a18..b424d63e5818 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -48,7 +48,7 @@ ///what are we putting in the tgui var/sedate_button_text = "Sedate" -/obj/machinery/sleeper/Initialize() +/obj/machinery/sleeper/Initialize(mapload) . = ..() occupant_typecache = GLOB.typecache_living update_icon() @@ -320,7 +320,7 @@ icon_state = "sleeper_s" controls_inside = TRUE -/obj/machinery/sleeper/syndie/fullupgrade/Initialize() +/obj/machinery/sleeper/syndie/fullupgrade/Initialize(mapload) . = ..() component_parts = list() component_parts += new /obj/item/stock_parts/matter_bin/bluespace(null) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index f1cc2e6d7f5b..23af50b89a50 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -1,6 +1,6 @@ /* Overview: - Used to create objects that need a per step proc call. Default definition of 'Initialize()' + Used to create objects that need a per step proc call. Default definition of 'Initialize(mapload)' stores a reference to src machine in global 'machines list'. Default definition of 'Destroy' removes reference to src machine in global 'machines list'. @@ -37,7 +37,7 @@ Class Variables: EMPED -- temporary broken by EMP pulse Class Procs: - Initialize() 'game/machinery/machine.dm' + Initialize(mapload) 'game/machinery/machine.dm' Destroy() 'game/machinery/machine.dm' @@ -131,7 +131,7 @@ Class Procs: var/climb_stun = 20 var/mob/living/machineclimber -/obj/machinery/Initialize() +/obj/machinery/Initialize(mapload) if(!armor) armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70) . = ..() diff --git a/code/game/machinery/airlock_control.dm b/code/game/machinery/airlock_control.dm index 72f0ce01acd6..f192e398cb1a 100644 --- a/code/game/machinery/airlock_control.dm +++ b/code/game/machinery/airlock_control.dm @@ -155,7 +155,7 @@ frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_AIRLOCK) -/obj/machinery/airlock_sensor/Initialize() +/obj/machinery/airlock_sensor/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/game/machinery/airlock_cycle_control.dm b/code/game/machinery/airlock_cycle_control.dm index e1243d42a11e..d3d2639d7a83 100644 --- a/code/game/machinery/airlock_cycle_control.dm +++ b/code/game/machinery/airlock_cycle_control.dm @@ -123,7 +123,7 @@ if(mapload && (. != INITIALIZE_HINT_QDEL)) return INITIALIZE_HINT_LATELOAD -/obj/machinery/advanced_airlock_controller/LateInitialize(mapload) +/obj/machinery/advanced_airlock_controller/LateInitialize() . = ..() if(scan_on_late_init) scan(TRUE) @@ -809,7 +809,7 @@ /obj/machinery/door/airlock var/obj/machinery/advanced_airlock_controller/aac -/obj/machinery/door/airlock/Initialize() +/obj/machinery/door/airlock/Initialize(mapload) . = ..() update_aac_docked() /obj/machinery/door/airlock/Destroy() diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index 1a7697f1d43e..8136c6135a7c 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -26,7 +26,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) var/pinklight = "heads" var/errorlight = "broke" -/obj/machinery/announcement_system/Initialize() +/obj/machinery/announcement_system/Initialize(mapload) . = ..() GLOB.announcement_systems += src radio = new /obj/item/radio/headset/silicon/ai(src) diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index 03f682bc68b9..ce4a02d70946 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -15,7 +15,7 @@ if(storedpart) . += span_notice("Alt-click to eject the limb.") -/obj/machinery/aug_manipulator/Initialize() +/obj/machinery/aug_manipulator/Initialize(mapload) initial_icon_state = initial(icon_state) return ..() diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index a19876fdfa2b..429e68cf5682 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -44,7 +44,7 @@ /// Avaliable categories var/list/categories = list("Tools","Electronics","Construction","T-Comm","Security","Machinery","Medical","Miscellaneous","Dinnerware","Imported", "Search") -/obj/machinery/autolathe/Initialize() +/obj/machinery/autolathe/Initialize(mapload) AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), 0, TRUE, null, null, CALLBACK(src, PROC_REF(AfterMaterialInsert))) . = ..() @@ -307,7 +307,7 @@ else stored_research.remove_design(D) -/obj/machinery/autolathe/hacked/Initialize() +/obj/machinery/autolathe/hacked/Initialize(mapload) . = ..() adjust_hacked(TRUE) diff --git a/code/game/machinery/bank_machine.dm b/code/game/machinery/bank_machine.dm index 6a0c4fefc69c..43270c40efc2 100644 --- a/code/game/machinery/bank_machine.dm +++ b/code/game/machinery/bank_machine.dm @@ -11,7 +11,7 @@ var/minimum_time_between_warnings = 400 var/syphoning_credits = 0 -/obj/machinery/computer/bank_machine/Initialize() +/obj/machinery/computer/bank_machine/Initialize(mapload) . = ..() radio = new(src) radio.subspace_transmission = TRUE diff --git a/code/game/machinery/bounty_board.dm b/code/game/machinery/bounty_board.dm index 7e85bcff6329..3cc9a8f31be6 100644 --- a/code/game/machinery/bounty_board.dm +++ b/code/game/machinery/bounty_board.dm @@ -185,11 +185,11 @@ GLOBAL_LIST_EMPTY(request_list) ///the account of the request fulfiller. var/list/applicants = list() -/datum/station_request/New(var/owned, var/newvalue, var/newdescription, var/reqnum, var/own_account) +/datum/station_request/New(owner, value, description, req_number, owner_account) . = ..() - owner = owned - value = newvalue - description = newdescription - req_number = reqnum - if(istype(own_account, /datum/bank_account)) - owner_account = own_account + src.owner = owner + src.value = value + src.description = description + src.req_number = req_number + if(istype(owner_account, /datum/bank_account)) + src.owner_account = owner_account diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index a203901d6681..4961d1dc4754 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -393,7 +393,7 @@ visible_message(span_danger("\The [src] [change_msg]!")) playsound(src, 'sound/items/wirecutter.ogg', 100, TRUE) - update_icon() //update Initialize() if you remove this. + update_icon() //update Initialize(mapload) if you remove this. // now disconnect anyone using the camera //Apparently, this will disconnect anyone even if the camera was re-activated. @@ -441,13 +441,13 @@ //Return a working camera that can see a given mob //or null if none -/proc/seen_by_camera(var/mob/M) +/proc/seen_by_camera(mob/M) for(var/obj/machinery/camera/C in oview(4, M)) if(C.can_use()) // check if camera disabled return C return null -/proc/near_range_camera(var/mob/M) +/proc/near_range_camera(mob/M) for(var/obj/machinery/camera/C in range(4, M)) if(C.can_use()) // check if camera disabled return C diff --git a/code/game/machinery/camera/motion.dm b/code/game/machinery/camera/motion.dm index 998ff2c8b05a..58ae9631a116 100644 --- a/code/game/machinery/camera/motion.dm +++ b/code/game/machinery/camera/motion.dm @@ -88,7 +88,7 @@ c_tag = "Arena" resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF -/obj/machinery/camera/motion/thunderdome/Initialize() +/obj/machinery/camera/motion/thunderdome/Initialize(mapload) . = ..() proximity_monitor.SetRange(7) diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index dcbff23b21ae..41dbd102f53f 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -4,13 +4,13 @@ /obj/machinery/camera/emp_proof start_active = TRUE -/obj/machinery/camera/emp_proof/Initialize() +/obj/machinery/camera/emp_proof/Initialize(mapload) . = ..() upgradeEmpProof() // EMP + Motion -/obj/machinery/camera/emp_proof/motion/Initialize() +/obj/machinery/camera/emp_proof/motion/Initialize(mapload) . = ..() upgradeMotion() @@ -20,7 +20,7 @@ start_active = TRUE icon_state = "xraycamera" //mapping icon - Thanks to Krutchen for the icons. -/obj/machinery/camera/xray/Initialize() +/obj/machinery/camera/xray/Initialize(mapload) . = ..() upgradeXRay() @@ -29,7 +29,7 @@ start_active = TRUE name = "motion-sensitive security camera" -/obj/machinery/camera/motion/Initialize() +/obj/machinery/camera/motion/Initialize(mapload) . = ..() upgradeMotion() @@ -38,7 +38,7 @@ start_active = TRUE icon_state = "xraycamera" //mapping icon. -/obj/machinery/camera/all/Initialize() +/obj/machinery/camera/all/Initialize(mapload) . = ..() upgradeEmpProof() upgradeXRay() @@ -50,7 +50,7 @@ var/number = 0 //camera number in area //This camera type automatically sets it's name to whatever the area that it's in is called. -/obj/machinery/camera/autoname/Initialize() +/obj/machinery/camera/autoname/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 37da7f293e61..f2402efb8b25 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -54,7 +54,7 @@ GLOBAL_VAR_INIT(clones, 0) fair_market_price = 5 // He nodded, because he knew I was right. Then he swiped his credit card to pay me for arresting him. payment_department = ACCOUNT_MED -/obj/machinery/clonepod/Initialize() +/obj/machinery/clonepod/Initialize(mapload) . = ..() countdown = new(src) @@ -112,7 +112,7 @@ GLOBAL_VAR_INIT(clones, 0) var/read_only = FALSE //Well,it's still a floppy disk //Disk stuff. -/obj/item/disk/data/Initialize() +/obj/item/disk/data/Initialize(mapload) . = ..() icon_state = "datadisk[rand(0,6)]" add_overlay("datadisk_gene") diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 6c77014323be..d14b5fc6095f 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -13,7 +13,7 @@ var/datum/techweb/linked_techweb light_color = LIGHT_COLOR_BLUE -/obj/machinery/computer/operating/Initialize() +/obj/machinery/computer/operating/Initialize(mapload) . = ..() find_tech() find_table() diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index 1f656f3c7bc3..b5ca55cbf96c 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -66,7 +66,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( /obj/machinery/computer/arcade/proc/Reset() return -/obj/machinery/computer/arcade/Initialize() +/obj/machinery/computer/arcade/Initialize(mapload) . = ..() // If it's a generic arcade machine, pick a random arcade // circuit board for it and make the new machine @@ -1039,7 +1039,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( //Add Random/Specific crewmember -/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(var/specific = "") +/obj/machinery/computer/arcade/orion_trail/proc/add_crewmember(specific = "") var/newcrew = "" if(specific) newcrew = specific @@ -1055,7 +1055,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( //Remove Random/Specific crewmember -/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(var/specific = "", var/dont_remove = "") +/obj/machinery/computer/arcade/orion_trail/proc/remove_crewmember(specific = "", dont_remove = "") var/list/safe2remove = settlers var/removed = "" if(dont_remove) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 07614e156551..fb4283d89c4f 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -11,7 +11,7 @@ light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/atmos_alert/Initialize() +/obj/machinery/computer/atmos_alert/Initialize(mapload) . = ..() set_frequency(receive_frequency) diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 7cabc9b4c943..451b4f03a7a9 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -71,7 +71,7 @@ frequency = new_frequency radio_connection = SSradio.add_object(src, frequency, RADIO_ATMOSIA) -/obj/machinery/air_sensor/Initialize() +/obj/machinery/air_sensor/Initialize(mapload) . = ..() SSair.atmos_machinery += src set_frequency(frequency) @@ -112,7 +112,7 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/atmos_control/Initialize() +/obj/machinery/computer/atmos_control/Initialize(mapload) . = ..() GLOB.atmos_air_controllers += src set_frequency(frequency) diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index eb7ef145e0b0..b88a5b396976 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -21,7 +21,7 @@ var/processing = FALSE -/obj/machinery/computer/security/Initialize() +/obj/machinery/computer/security/Initialize(mapload) . = ..() // Map name has to start and end with an A-Z character, // and definitely NOT with a square bracket or even a number. @@ -278,7 +278,7 @@ var/icon_state_off = "entertainment_blank" var/icon_state_on = "entertainment" -/obj/machinery/computer/security/telescreen/entertainment/Initialize() +/obj/machinery/computer/security/telescreen/entertainment/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_CLICK, PROC_REF(BigClick)) diff --git a/code/game/machinery/computer/camera_advanced.dm b/code/game/machinery/computer/camera_advanced.dm index 5bf0ce6d6762..090eb85e6b08 100644 --- a/code/game/machinery/computer/camera_advanced.dm +++ b/code/game/machinery/computer/camera_advanced.dm @@ -17,7 +17,7 @@ light_color = LIGHT_COLOR_RED -/obj/machinery/computer/camera_advanced/Initialize() +/obj/machinery/computer/camera_advanced/Initialize(mapload) . = ..() for(var/i in networks) networks -= i @@ -287,7 +287,7 @@ networks = list("ss13", "minisat") //:eye: var/datum/action/innate/servant_warp/warp_action -/obj/machinery/computer/camera_advanced/ratvar/Initialize() +/obj/machinery/computer/camera_advanced/ratvar/Initialize(mapload) . = ..() warp_action = new(src) ratvar_act() diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 06360f6fb772..483c1a64e708 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -59,7 +59,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if(modify) . += span_notice("Alt-click to eject the ID card.") -/obj/machinery/computer/card/Initialize() +/obj/machinery/computer/card/Initialize(mapload) . = ..() change_position_cooldown = CONFIG_GET(number/id_console_jobslot_delay) @@ -573,7 +573,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) icon_screen = "idminor" circuit = /obj/item/circuitboard/computer/card/minor -/obj/machinery/computer/card/minor/Initialize() +/obj/machinery/computer/card/minor/Initialize(mapload) . = ..() var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit if(target_dept) diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index ac1d4eb414aa..dc34ddcb14b8 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -47,7 +47,7 @@ /obj/machinery/computer/communications/unlocked unlocked = TRUE -/obj/machinery/computer/communications/Initialize() +/obj/machinery/computer/communications/Initialize(mapload) . = ..() GLOB.shuttle_caller_list += src diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 64040ee4ee0b..1881a44bf998 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -181,7 +181,7 @@ return ..() -/obj/machinery/computer/scan_consolenew/Initialize() +/obj/machinery/computer/scan_consolenew/Initialize(mapload) . = ..() // Connect with a nearby DNA Scanner on init @@ -340,7 +340,7 @@ return data -/obj/machinery/computer/scan_consolenew/ui_act(action, var/list/params) +/obj/machinery/computer/scan_consolenew/ui_act(action, list/params) if(..()) return TRUE diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index ce988ffbae0b..8f9edf543599 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -15,7 +15,7 @@ light_color = LIGHT_COLOR_RED -/obj/machinery/computer/gulag_teleporter_computer/Initialize() +/obj/machinery/computer/gulag_teleporter_computer/Initialize(mapload) . = ..() scan_machinery() diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index aba85f627461..9f236decfb0f 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -9,7 +9,7 @@ var/list/obj/machinery/launchpad/launchpads var/maximum_pads = 4 -/obj/machinery/computer/launchpad/Initialize() +/obj/machinery/computer/launchpad/Initialize(mapload) launchpads = list() . = ..() diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 48ec53f8f440..1ae69d38f956 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -13,7 +13,7 @@ desc = "Signal used to connect remotely with silicons." invisibility = 100 -/obj/machinery/computer/upload/Initialize() +/obj/machinery/computer/upload/Initialize(mapload) embedded_gps = new embedded_gps_type(src) return ..() diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index 2ae0af10c293..9a1b527301f2 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -9,7 +9,7 @@ var/range = 4 -/obj/machinery/computer/pod/Initialize() +/obj/machinery/computer/pod/Initialize(mapload) . = ..() for(var/obj/machinery/mass_driver/M in range(range, src)) if(M.id == id) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 84657b3c2a76..8f06417778a1 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -7,7 +7,7 @@ light_color = LIGHT_COLOR_CYAN -/obj/machinery/computer/station_alert/Initialize() +/obj/machinery/computer/station_alert/Initialize(mapload) . = ..() GLOB.alert_consoles += src diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index a5a7d91f8398..f0900240f1d7 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -11,7 +11,7 @@ var/calibrating var/turf/target -/obj/machinery/computer/teleporter/Initialize() +/obj/machinery/computer/teleporter/Initialize(mapload) . = ..() id = "[rand(1000, 9999)]" link_power_station() diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 521b080023f4..d6b03e1198de 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers) var/storage_name = "Cryogenic Oversight Control" var/allow_items = TRUE -/obj/machinery/computer/cryopod/Initialize() +/obj/machinery/computer/cryopod/Initialize(mapload) . = ..() GLOB.cryopod_computers += src @@ -162,7 +162,7 @@ GLOBAL_VAR_INIT(cryopods_enabled, FALSE) var/despawn_timer -/obj/machinery/cryopod/Initialize() +/obj/machinery/cryopod/Initialize(mapload) ..() GLOB.cryopods += src return INITIALIZE_HINT_LATELOAD //Gotta populate the cryopod computer GLOB first diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index aa6a469b7df5..8078a7c1986d 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -45,7 +45,7 @@ song_length = length song_beat = beat -/obj/machinery/jukebox/Initialize() +/obj/machinery/jukebox/Initialize(mapload) . = ..() var/list/tracks = flist("[global.config.directory]/jukebox_music/sounds/") @@ -196,7 +196,8 @@ /obj/machinery/jukebox/disco/proc/dance_setup() var/turf/cen = get_turf(src) - FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING) + var/turf/t + FOR_DVIEW(t, 3, get_turf(src),INVISIBILITY_LIGHTING) if(t.x == cen.x && t.y > cen.y) spotlights += new /obj/item/flashlight/spotlight(t, 1 + get_dist(src, t), 30 - (get_dist(src, t) * 8), LIGHT_COLOR_RED) continue @@ -328,7 +329,7 @@ #undef DISCO_INFENO_RANGE -/obj/machinery/jukebox/disco/proc/dance(var/mob/living/M) //Show your moves +/obj/machinery/jukebox/disco/proc/dance(mob/living/M) //Show your moves set waitfor = FALSE switch(rand(0,6)) if(0 to 1) @@ -347,7 +348,7 @@ if(dir == WEST) emote("flip") -/obj/machinery/jukebox/disco/proc/dance3(var/mob/living/M) +/obj/machinery/jukebox/disco/proc/dance3(mob/living/M) var/matrix/initial_matrix = matrix(M.transform) for (var/i in 1 to 75) if (!M) @@ -394,7 +395,7 @@ sleep(0.1 SECONDS) M.lying_fix() -/obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M) +/obj/machinery/jukebox/disco/proc/dance4(mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 0.1 SECONDS, loop = 0) var/matrix/initial_matrix = matrix(M.transform) for (var/i in 1 to 60) diff --git a/code/game/machinery/decontamination.dm b/code/game/machinery/decontamination.dm index a10c9c2aacd5..7e858278f3cc 100644 --- a/code/game/machinery/decontamination.dm +++ b/code/game/machinery/decontamination.dm @@ -31,7 +31,7 @@ state_open = TRUE density = FALSE -/obj/machinery/decontamination_unit/Initialize() +/obj/machinery/decontamination_unit/Initialize(mapload) . = ..() decon = new(list(src), FALSE) decon_emagged = new(list(src), FALSE) @@ -458,7 +458,7 @@ O.forceMove(src) return TRUE -/obj/machinery/decontamination_unit/proc/dispense(obj/item/O, var/mob/M) +/obj/machinery/decontamination_unit/proc/dispense(obj/item/O, mob/M) if(!M.put_in_hands(O)) O.forceMove(get_turf(M)) adjust_item_drop_location(O) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 7000b0768fce..500389f6e5e5 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -14,7 +14,7 @@ var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps -/obj/machinery/defibrillator_mount/loaded/Initialize() //loaded subtype for mapping use +/obj/machinery/defibrillator_mount/loaded/Initialize(mapload) //loaded subtype for mapping use . = ..() defib = new/obj/item/defibrillator/loaded(src) diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index a37a7d365687..9eaa8ba2a24f 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -142,7 +142,7 @@ var/deploy_message = TRUE -/obj/structure/barricade/security/Initialize() +/obj/structure/barricade/security/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(deploy)), deploy_time) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index a66dccc96c8f..1e410913b7cd 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -27,7 +27,7 @@ var/suction_enabled = TRUE var/transmit_enabled = TRUE -/obj/machinery/dish_drive/Initialize() +/obj/machinery/dish_drive/Initialize(mapload) . = ..() RefreshParts() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 6ace15fb653e..a85a6d3dbddc 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -144,7 +144,7 @@ var/static/list/airlock_overlays = list() -/obj/machinery/door/airlock/Initialize() +/obj/machinery/door/airlock/Initialize(mapload) . = ..() bolt_log = list() //yogs shocking_log = list() //yogs @@ -934,7 +934,7 @@ set_electrified(MACHINE_ELECTRIFIED_PERMANENT) updateDialog() -/obj/machinery/door/airlock/Topic(href, href_list, var/nowindow = 0) +/obj/machinery/door/airlock/Topic(href, href_list, nowindow = 0) // If you add an if(..()) check you must first remove the var/nowindow parameter. // Otherwise it will runtime with this kind of error: null.Topic() if(!nowindow) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index cfcc4f0f1648..aaf51356776c 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -464,7 +464,7 @@ var/friendly = FALSE var/stealthy = FALSE -/obj/machinery/door/airlock/cult/Initialize() +/obj/machinery/door/airlock/cult/Initialize(mapload) . = ..() new openingoverlaytype(loc) @@ -566,7 +566,7 @@ normal_integrity = 240 var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction -/obj/machinery/door/airlock/clockwork/Initialize() +/obj/machinery/door/airlock/clockwork/Initialize(mapload) . = ..() new /obj/effect/temp_visual/ratvar/door(loc) new /obj/effect/temp_visual/ratvar/beam/door(loc) diff --git a/code/game/machinery/doors/alarmlock.dm b/code/game/machinery/doors/alarmlock.dm index 42649a9ff257..52940e6d0081 100644 --- a/code/game/machinery/doors/alarmlock.dm +++ b/code/game/machinery/doors/alarmlock.dm @@ -10,7 +10,7 @@ var/air_frequency = FREQ_ATMOS_ALARMS autoclose = FALSE -/obj/machinery/door/airlock/alarmlock/Initialize() +/obj/machinery/door/airlock/alarmlock/Initialize(mapload) . = ..() air_connection = new @@ -19,7 +19,7 @@ air_connection = null return ..() -/obj/machinery/door/airlock/alarmlock/Initialize() +/obj/machinery/door/airlock/alarmlock/Initialize(mapload) . = ..() SSradio.remove_object(src, air_frequency) air_connection = SSradio.add_object(src, air_frequency, RADIO_TO_AIRALARM) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 0a9a46fa8522..4aa7e893bfac 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -79,13 +79,13 @@ maptext_width = 32 maptext_y = -1 -/obj/machinery/door_timer/Initialize() +/obj/machinery/door_timer/Initialize(mapload) . = ..() Radio = new/obj/item/radio(src) Radio.listening = 0 -/obj/machinery/door_timer/Initialize() +/obj/machinery/door_timer/Initialize(mapload) . = ..() if(id != null) for(var/obj/machinery/door/window/brigdoor/M in urange(20, src)) diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 4313faf58c19..ff0912f09588 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -76,7 +76,7 @@ return TRUE return ..() -/obj/machinery/door/Initialize() +/obj/machinery/door/Initialize(mapload) . = ..() set_init_door_layer() update_freelook_sight() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 9e52393b27c9..604e4b6d53b7 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -437,7 +437,7 @@ icon = 'icons/obj/doors/edge_Doorfire.dmi' border = TRUE -/obj/structure/firelock_frame/border/Initialize() +/obj/structure/firelock_frame/border/Initialize(mapload) . = ..() var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS AddComponent(/datum/component/simple_rotation, rotation_flags) diff --git a/code/game/machinery/doors/ministile.dm b/code/game/machinery/doors/ministile.dm index e119865b075c..86a3f86dcec9 100644 --- a/code/game/machinery/doors/ministile.dm +++ b/code/game/machinery/doors/ministile.dm @@ -20,7 +20,7 @@ name = "HOP line turnstile" req_one_access = list(ACCESS_HEADS) -/obj/machinery/ministile/Initialize() +/obj/machinery/ministile/Initialize(mapload) . = ..() icon_state = "ministile" diff --git a/code/game/machinery/doors/turnstile.dm b/code/game/machinery/doors/turnstile.dm index 591060c62393..7b9b0992c1ba 100644 --- a/code/game/machinery/doors/turnstile.dm +++ b/code/game/machinery/doors/turnstile.dm @@ -23,7 +23,7 @@ max_integrity = 400 /// Made of damn good steel damage_deflection = 21 /// Same as airlocks! -/obj/machinery/turnstile/Initialize() +/obj/machinery/turnstile/Initialize(mapload) . = ..() icon_state = "turnstile" diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index dcbfb33ef263..3047bcf6a838 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays) var/allow_all = FALSE //lets the doppler array process any kind of bomb, in case admins want to be funny verb_say = "states coldly" -/obj/machinery/doppler_array/Initialize() +/obj/machinery/doppler_array/Initialize(mapload) . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE, null, null, CALLBACK(src, PROC_REF(rot_message))) @@ -136,6 +136,6 @@ GLOBAL_LIST_EMPTY(doppler_arrays) return -/obj/machinery/doppler_array/research/science/Initialize() +/obj/machinery/doppler_array/research/science/Initialize(mapload) . = ..() linked_techweb = SSresearch.science_tech diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 75cedc1c1bba..671516ebfb73 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -48,7 +48,7 @@ var/break_message = "lets out a tinny alarm before falling dark." var/break_sound = 'sound/machines/warning-buzzer.ogg' -/obj/machinery/droneDispenser/Initialize() +/obj/machinery/droneDispenser/Initialize(mapload) . = ..() var/datum/component/material_container/materials = AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, TRUE, /obj/item/stack) materials.insert_amount_mat(starting_amount) diff --git a/code/game/machinery/electrolyzer.dm b/code/game/machinery/electrolyzer.dm index 9a5d6dad8cdf..5a71154aecbc 100644 --- a/code/game/machinery/electrolyzer.dm +++ b/code/game/machinery/electrolyzer.dm @@ -28,7 +28,7 @@ /obj/machinery/electrolyzer/get_cell() return cell -/obj/machinery/electrolyzer/Initialize() +/obj/machinery/electrolyzer/Initialize(mapload) . = ..() if(ispath(cell)) cell = new cell(src) diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index c057c958342a..2a19b4055e65 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -18,7 +18,7 @@ /obj/machinery/doorButtons/proc/findObjsByTag() return -/obj/machinery/doorButtons/Initialize() +/obj/machinery/doorButtons/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 9fb6e9f309e0..e923b8a2f7e5 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -69,7 +69,7 @@ SSradio.remove_object(src,frequency) return ..() -/obj/machinery/embedded_controller/radio/Initialize() +/obj/machinery/embedded_controller/radio/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/game/machinery/exp_cloner.dm b/code/game/machinery/exp_cloner.dm index 416c43047ac2..29d959fea8ae 100644 --- a/code/game/machinery/exp_cloner.dm +++ b/code/game/machinery/exp_cloner.dm @@ -88,7 +88,7 @@ light_color = LIGHT_COLOR_BLUE -/obj/machinery/computer/prototype_cloning/Initialize() +/obj/machinery/computer/prototype_cloning/Initialize(mapload) . = ..() updatemodules(TRUE) diff --git a/code/game/machinery/fat_sucker.dm b/code/game/machinery/fat_sucker.dm index 3f388b408aa9..2f77b31a8209 100644 --- a/code/game/machinery/fat_sucker.dm +++ b/code/game/machinery/fat_sucker.dm @@ -27,7 +27,7 @@ "Unsaturated fat, that is monounsaturated fats, polyunsaturated fats and omega-3 fatty acids, is found in plant foods and fish." \ ) -/obj/machinery/fat_sucker/Initialize() +/obj/machinery/fat_sucker/Initialize(mapload) . = ..() soundloop = new(list(src), FALSE) update_icon() diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index baecdf468dd6..425f1ce08590 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -162,7 +162,7 @@ new /obj/item/stack/sheet/metal (loc, 2) qdel(src) -/obj/machinery/flasher/portable/Initialize() +/obj/machinery/flasher/portable/Initialize(mapload) . = ..() proximity_monitor = new(src, 0) @@ -207,7 +207,7 @@ . = ..() . += span_notice("Its channel ID is '[id]'.") -/obj/item/wallframe/flasher/after_attach(var/obj/O) +/obj/item/wallframe/flasher/after_attach(obj/O) ..() var/obj/machinery/flasher/F = O F.id = id diff --git a/code/game/machinery/gulag_processor.dm b/code/game/machinery/gulag_processor.dm index a96b09021e78..cfa0ccdcedb4 100644 --- a/code/game/machinery/gulag_processor.dm +++ b/code/game/machinery/gulag_processor.dm @@ -37,7 +37,7 @@ GLOBAL_VAR_INIT(gulag_required_items, typecacheof(list( var/obj/machinery/gulag_item_reclaimer/linked_reclaimer -/obj/machinery/gulag_processor/Initialize() +/obj/machinery/gulag_processor/Initialize(mapload) . = ..() locate_reclaimer() diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 8180ea1efa8a..7291c8ea0d93 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -32,7 +32,7 @@ The console is located at computer/gulag_teleporter.dm /obj/item/clothing/mask/breath, /obj/item/clothing/mask/gas)) -/obj/machinery/gulag_teleporter/Initialize() +/obj/machinery/gulag_teleporter/Initialize(mapload) . = ..() locate_reclaimer() diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index 863aa385e45c..8ded6b016160 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -15,7 +15,7 @@ var/allow_clothing = FALSE var/allow_living = FALSE -/obj/machinery/harvester/Initialize() +/obj/machinery/harvester/Initialize(mapload) . = ..() if(prob(1)) name = "auto-autopsy" diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index ba58cd9a7eb4..1e1e6157e2f5 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -90,7 +90,7 @@ GLOBAL_LIST_EMPTY(holopads) desc = "It's a floor-mounted device for projecting holographic images. This one will refuse to auto-connect incoming calls." secure = TRUE -obj/machinery/holopad/secure/Initialize() +obj/machinery/holopad/secure/Initialize(mapload) . = ..() var/obj/item/circuitboard/machine/holopad/board = circuit board.secure = TRUE @@ -128,7 +128,7 @@ obj/machinery/holopad/secure/Initialize() if(!replay_mode && (disk && disk.record)) replay_start() -/obj/machinery/holopad/Initialize() +/obj/machinery/holopad/Initialize(mapload) . = ..() if(!padname) var/area/A = get_area(src) diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 20813ce8e110..8ffe8f0b9eaa 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -64,7 +64,7 @@ location.hotspot_expose(1000,500,1) return TRUE -/obj/machinery/igniter/Initialize() +/obj/machinery/igniter/Initialize(mapload) . = ..() wires = new /datum/wires/igniter(src) icon_state = "igniter[on]" @@ -91,7 +91,7 @@ /obj/machinery/sparker/toxmix id = INCINERATOR_TOXMIX_IGNITER -/obj/machinery/sparker/Initialize() +/obj/machinery/sparker/Initialize(mapload) . = ..() spark_system = new /datum/effect_system/spark_spread spark_system.set_up(2, 1, src) diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 0902a34b5419..a1ff92f74c17 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -26,7 +26,7 @@ range = initial(range) range *= E -/obj/machinery/launchpad/Initialize() +/obj/machinery/launchpad/Initialize(mapload) . = ..() prepare_huds() for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds) @@ -265,7 +265,7 @@ /obj/item/storage/briefcase/launchpad var/obj/machinery/launchpad/briefcase/pad -/obj/item/storage/briefcase/launchpad/Initialize() +/obj/item/storage/briefcase/launchpad/Initialize(mapload) pad = new(null, src) //spawns pad in nullspace to hide it from briefcase contents . = ..() diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 139ce45525ed..1e4f95bdba62 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -13,7 +13,7 @@ /// instead of the switch's location. var/area/area = null -/obj/machinery/light_switch/Initialize() +/obj/machinery/light_switch/Initialize(mapload) . = ..() if(istext(area)) area = text2path(area) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index e107035491e4..50a6847414dd 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -33,7 +33,7 @@ /obj/item/stack/sheet/animalhide/human = 50 ) var/biomass_per_slab = 20 -/obj/machinery/limbgrower/Initialize() +/obj/machinery/limbgrower/Initialize(mapload) create_reagents(100, OPENCONTAINER) stored_research = new /datum/techweb/specialized/autounlocking/limbgrower . = ..() diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 254a75256c76..f0e96fda4894 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -27,7 +27,7 @@ var/center_y = 0 var/max_dist = 20 // absolute value of center_x,y cannot exceed this integer -/obj/machinery/magnetic_module/Initialize() +/obj/machinery/magnetic_module/Initialize(mapload) ..() var/turf/T = loc hide(T.intact) @@ -218,7 +218,7 @@ var/datum/radio_frequency/radio_connection -/obj/machinery/magnetic_controller/Initialize() +/obj/machinery/magnetic_controller/Initialize(mapload) . = ..() if(autolink) for(var/obj/machinery/magnetic_module/M in GLOB.machines) diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index 8dcca251a562..ab55420206f1 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -27,7 +27,7 @@ var/mob/living/carbon/human/altPatient //If scanning someone else, this will be the target. var/obj/item/card/id/C //the account of the person using the console. -/obj/machinery/medical_kiosk/Initialize() //loaded subtype for mapping use +/obj/machinery/medical_kiosk/Initialize(mapload) //loaded subtype for mapping use . = ..() scanner_wand = new/obj/item/scanner_wand(src) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 5c58cb19844d..22b4e48f2560 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -21,7 +21,7 @@ req_one_access = list(ACCESS_ENGINE, ACCESS_ROBO_CONTROL) -/obj/machinery/navbeacon/Initialize() +/obj/machinery/navbeacon/Initialize(mapload) . = ..() set_codes() diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 275676b2ae2b..3b8aa2b67cb1 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -77,7 +77,7 @@ var/datum/action/turret_toggle/toggle_action var/mob/remote_controller -/obj/machinery/porta_turret/Initialize() +/obj/machinery/porta_turret/Initialize(mapload) . = ..() if(!base) base = src @@ -653,7 +653,7 @@ faction = list(ROLE_SYNDICATE) desc = "A ballistic machine gun auto-turret." -/obj/machinery/porta_turret/syndicate/Initialize() +/obj/machinery/porta_turret/syndicate/Initialize(mapload) . = ..() AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) @@ -740,7 +740,7 @@ /obj/machinery/porta_turret/aux_base/interact(mob/user) //Controlled solely from the base console. return -/obj/machinery/porta_turret/aux_base/Initialize() +/obj/machinery/porta_turret/aux_base/Initialize(mapload) . = ..() cover.name = name cover.desc = desc @@ -761,7 +761,7 @@ faction = list("neutral","silicon","turret") mode = TURRET_LETHAL -/obj/machinery/porta_turret/centcom_shuttle/Initialize() +/obj/machinery/porta_turret/centcom_shuttle/Initialize(mapload) . = ..() AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES) diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index f4bca04d14af..36eb9632c135 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -20,7 +20,7 @@ var/map_pad_id = "" as text //what's my name var/map_pad_link_id = "" as text //who's my friend -/obj/machinery/quantumpad/Initialize() +/obj/machinery/quantumpad/Initialize(mapload) . = ..() if(map_pad_id) mapped_quantum_pads[map_pad_id] = src diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index aeda8819dcdd..b67e6fcde40a 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -14,7 +14,7 @@ var/recharge_speed var/repairs -/obj/machinery/recharge_station/Initialize() +/obj/machinery/recharge_station/Initialize(mapload) . = ..() update_icon() @@ -105,7 +105,7 @@ /obj/machinery/recharge_station/fullupgrade flags_1 = NODECONSTRUCT_1 -/obj/machinery/recharge_station/fullupgrade/Initialize() +/obj/machinery/recharge_station/fullupgrade/Initialize(mapload) . = ..() update_icon() component_parts = list() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index 09a1f04f688e..12b2b5d2398b 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -17,7 +17,7 @@ var/eat_victim_items = TRUE var/item_recycle_sound = 'sound/items/welder.ogg' -/obj/machinery/recycler/Initialize() +/obj/machinery/recycler/Initialize(mapload) AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/plasma, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/dilithium, /datum/material/plastic), INFINITY, FALSE, null, null, null, TRUE) AddComponent(/datum/component/butchering, 1, amount_produced,amount_produced/5) . = ..() diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 254bc60a41bf..97d232260848 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) else icon_state = "req_comp0" -/obj/machinery/requests_console/Initialize() +/obj/machinery/requests_console/Initialize(mapload) . = ..() name = "\improper [department] requests console" GLOB.allConsoles += src diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index 9b1f7831c3ec..046557a8814c 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -38,7 +38,7 @@ var/reverse = FALSE //If true, signals if the scan returns false var/detect_nutrition = NUTRITION_LEVEL_FAT -/obj/machinery/scanner_gate/Initialize() +/obj/machinery/scanner_gate/Initialize(mapload) . = ..() set_scanline("passive") diff --git a/code/game/machinery/sci_bombardment.dm b/code/game/machinery/sci_bombardment.dm index 0ec1dec53e30..0e512e199cb6 100644 --- a/code/game/machinery/sci_bombardment.dm +++ b/code/game/machinery/sci_bombardment.dm @@ -45,7 +45,7 @@ var/tcoords var/targetdest = "None" -/obj/machinery/sci_bombardment/Initialize() +/obj/machinery/sci_bombardment/Initialize(mapload) . = ..() for(var/Z in 1 to world.maxz) //define Lavaland Z-level if(is_mining_level(Z)) @@ -204,7 +204,7 @@ to_chat(usr, span_warning("Access denied. Please seek assistance from station AI or Research Director.")) update_icon() . = TRUE - if("count")//Prompts user to change countdown timer (Minimum based on var/mincount) + if("count")//Prompts user to change countdown timer (Minimum based on mincount) if(locked) return var/a = text2num(stripped_input(usr, "Set a new countdown timer. (Minimum [mincount])", name, mincount)) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 43940d4a8bc1..0935ae2d7828 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -11,7 +11,7 @@ max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons) CanAtmosPass = ATMOS_PASS_DENSITY -/obj/structure/emergency_shield/Initialize() +/obj/structure/emergency_shield/Initialize(mapload) . = ..() setDir(pick(GLOB.cardinals)) air_update_turf(1) diff --git a/code/game/machinery/shuttle/custom_shuttle.dm b/code/game/machinery/shuttle/custom_shuttle.dm index 7c83cade69f3..9bf721b80c83 100644 --- a/code/game/machinery/shuttle/custom_shuttle.dm +++ b/code/game/machinery/shuttle/custom_shuttle.dm @@ -12,7 +12,7 @@ var/icon_state_open = "burst_plasma_open" var/icon_state_off = "burst_plasma_off" -/obj/machinery/shuttle/Initialize() +/obj/machinery/shuttle/Initialize(mapload) . = ..() GLOB.custom_shuttle_machines += src diff --git a/code/game/machinery/shuttle/shuttle_engine.dm b/code/game/machinery/shuttle/shuttle_engine.dm index 38b2a223c098..73f146992974 100644 --- a/code/game/machinery/shuttle/shuttle_engine.dm +++ b/code/game/machinery/shuttle/shuttle_engine.dm @@ -51,7 +51,7 @@ needs_heater = FALSE cooldown = 90 -/obj/machinery/shuttle/engine/Initialize() +/obj/machinery/shuttle/engine/Initialize(mapload) . = ..() check_setup() diff --git a/code/game/machinery/shuttle/shuttle_heater.dm b/code/game/machinery/shuttle/shuttle_heater.dm index 1035aa0fe94b..beb24acf2085 100644 --- a/code/game/machinery/shuttle/shuttle_heater.dm +++ b/code/game/machinery/shuttle/shuttle_heater.dm @@ -94,12 +94,12 @@ if(gas_type) air_contents.set_moles(gas_type) -/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/hasFuel(var/required) +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/hasFuel(required) var/datum/gas_mixture/air_contents = airs[1] var/moles = air_contents.total_moles() return moles >= required -/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/consumeFuel(var/amount) +/obj/machinery/atmospherics/components/unary/shuttle/heater/proc/consumeFuel(amount) var/datum/gas_mixture/air_contents = airs[1] air_contents.remove(amount) return diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 2d4a55e407dd..ae39ff35f466 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -36,7 +36,7 @@ light_color = LIGHT_COLOR_BROWN -/obj/machinery/computer/slot_machine/Initialize() +/obj/machinery/computer/slot_machine/Initialize(mapload) . = ..() jackpots = rand(1, 4) //false hope plays = rand(75, 200) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 5931e008b1fa..d6d8b435ca83 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -29,7 +29,7 @@ /obj/machinery/space_heater/get_cell() return cell -/obj/machinery/space_heater/Initialize() +/obj/machinery/space_heater/Initialize(mapload) . = ..() cell = new(src) update_icon() diff --git a/code/game/machinery/stasis.dm b/code/game/machinery/stasis.dm index e7790c3e9c69..d60265b3bfef 100644 --- a/code/game/machinery/stasis.dm +++ b/code/game/machinery/stasis.dm @@ -36,7 +36,7 @@ var/mattress_state = "stasis_on" var/obj/effect/overlay/vis/mattress_on -/obj/machinery/stasis/Initialize() +/obj/machinery/stasis/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_bed, \ success_chance = 1, \ diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index 764d057f6b3b..2f0e935e630e 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -171,7 +171,7 @@ var/friendc = FALSE // track if Friend Computer mode var/last_picture // For when Friend Computer mode is undone -/obj/machinery/status_display/evac/Initialize() +/obj/machinery/status_display/evac/Initialize(mapload) . = ..() // register for radio system SSradio.add_object(src, frequency) @@ -317,7 +317,7 @@ var/mode = SD_BLANK var/emotion = "Neutral" -/obj/machinery/status_display/ai/Initialize() +/obj/machinery/status_display/ai/Initialize(mapload) . = ..() GLOB.ai_status_displays.Add(src) diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 933d73148ae1..ba80fbf25317 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -84,7 +84,7 @@ update_icon() try_detonate(TRUE) -/obj/machinery/syndicatebomb/Initialize() +/obj/machinery/syndicatebomb/Initialize(mapload) . = ..() wires = new /datum/wires/syndicatebomb(src) if(payload) @@ -243,7 +243,7 @@ open_panel = TRUE timer_set = 120 -/obj/machinery/syndicatebomb/empty/Initialize() +/obj/machinery/syndicatebomb/empty/Initialize(mapload) . = ..() wires.cut_all() diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 9e984e38a8ae..374fd9f2ae09 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -68,7 +68,7 @@ ..() GLOB.telecomms_list += src -/obj/machinery/computer/message_monitor/Initialize() +/obj/machinery/computer/message_monitor/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/machinery/telecomms/machines/allinone.dm b/code/game/machinery/telecomms/machines/allinone.dm index 8c69183fd28e..95eb877aea4b 100644 --- a/code/game/machinery/telecomms/machines/allinone.dm +++ b/code/game/machinery/telecomms/machines/allinone.dm @@ -16,7 +16,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_1 = NODECONSTRUCT_1 -/obj/machinery/telecomms/allinone/Initialize() +/obj/machinery/telecomms/allinone/Initialize(mapload) . = ..() if (intercept) freq_listening = list(FREQ_SYNDICATE) diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm index 1475496ace95..a67deadf7a2c 100644 --- a/code/game/machinery/telecomms/machines/message_server.dm +++ b/code/game/machinery/telecomms/machines/message_server.dm @@ -17,7 +17,7 @@ armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 70) var/obj/item/stored -/obj/machinery/blackbox_recorder/Initialize() +/obj/machinery/blackbox_recorder/Initialize(mapload) . = ..() stored = new /obj/item/blackbox(src) diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 616dd8ee213f..ea01e720e84f 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -59,7 +59,7 @@ freq_listening = list(FREQ_COMMAND, FREQ_ENGINEERING, FREQ_SECURITY) //Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/receiver/preset_right/Initialize() +/obj/machinery/telecomms/receiver/preset_right/Initialize(mapload) . = ..() for(var/i = MIN_FREQ, i <= MAX_FREQ, i += 2) freq_listening |= i diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 9a22b11a1d86..e173da01235c 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -16,7 +16,7 @@ var/list/log_entries = list() var/totaltraffic = 0 // gigabytes (if > 1024, divide by 1024 -> terrabytes) -/obj/machinery/telecomms/server/Initialize() +/obj/machinery/telecomms/server/Initialize(mapload) . = ..() /obj/machinery/telecomms/server/receive_information(datum/signal/subspace/vocal/signal, obj/machinery/telecomms/machine_from) @@ -72,7 +72,7 @@ /obj/machinery/telecomms/server/presets network = "tcommsat" -/obj/machinery/telecomms/server/presets/Initialize() +/obj/machinery/telecomms/server/presets/Initialize(mapload) . = ..() name = id @@ -103,7 +103,7 @@ autolinkers = list("common") //Common and other radio frequencies for people to freely use -/obj/machinery/telecomms/server/presets/common/Initialize() +/obj/machinery/telecomms/server/presets/common/Initialize(mapload) . = ..() for(var/i = MIN_FREQ, i <= MAX_FREQ, i += 2) freq_listening |= i @@ -123,6 +123,6 @@ freq_listening = list(FREQ_SECURITY) autolinkers = list("security") -/obj/machinery/telecomms/server/presets/common/birdstation/Initialize() +/obj/machinery/telecomms/server/presets/common/birdstation/Initialize(mapload) . = ..() freq_listening = list() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index ffd2b23768f6..71b2b2629471 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -15,7 +15,7 @@ var/obj/machinery/teleport/station/power_station var/calibrated //Calibration prevents mutation -/obj/machinery/teleport/hub/Initialize() +/obj/machinery/teleport/hub/Initialize(mapload) . = ..() link_power_station() @@ -98,7 +98,7 @@ /obj/machinery/teleport/hub/proc/is_ready() . = !panel_open && !(stat & (BROKEN|NOPOWER)) && power_station && power_station.engaged && !(power_station.stat & (BROKEN|NOPOWER)) -/obj/machinery/teleport/hub/syndicate/Initialize() +/obj/machinery/teleport/hub/syndicate/Initialize(mapload) . = ..() component_parts += new /obj/item/stock_parts/matter_bin/super(null) RefreshParts() @@ -118,7 +118,7 @@ var/list/linked_stations = list() var/efficiency = 0 -/obj/machinery/teleport/station/Initialize() +/obj/machinery/teleport/station/Initialize(mapload) . = ..() link_console_and_hub() diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm index 055e8859d8e3..59e95d83ffff 100644 --- a/code/game/machinery/transformer.dm +++ b/code/game/machinery/transformer.dm @@ -16,7 +16,7 @@ var/obj/effect/countdown/transformer/countdown var/mob/living/silicon/ai/masterAI -/obj/machinery/transformer/Initialize() +/obj/machinery/transformer/Initialize(mapload) // On us . = ..() new /obj/machinery/conveyor/auto(locate(x - 1, y, z), WEST) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 434f932bb6ec..c8f57fccb1d3 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -29,7 +29,7 @@ max_equip = 5 destruction_sleep_duration = 20 -/obj/mecha/combat/gygax/dark/loaded/Initialize() +/obj/mecha/combat/gygax/dark/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine ME.attach(src) diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 3cee84fef6c9..e05f8c108353 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -30,7 +30,7 @@ thrusters_action.Remove(user) zoom_action.Remove(user) -/obj/mecha/combat/marauder/loaded/Initialize() +/obj/mecha/combat/marauder/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse(src) ME.attach(src) @@ -57,7 +57,7 @@ /obj/mecha/combat/marauder/seraph/unloaded -/obj/mecha/combat/marauder/seraph/Initialize() +/obj/mecha/combat/marauder/seraph/Initialize(mapload) . = ..() if(istype(src,/obj/mecha/combat/marauder/seraph/unloaded)) return @@ -83,7 +83,7 @@ max_equip = 6 destruction_sleep_duration = 20 -/obj/mecha/combat/marauder/mauler/loaded/Initialize() +/obj/mecha/combat/marauder/mauler/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg(src) ME.attach(src) diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm index 9d1b4335b9ab..fad4af926cd0 100644 --- a/code/game/mecha/combat/reticence.dm +++ b/code/game/mecha/combat/reticence.dm @@ -21,13 +21,13 @@ meleesound = FALSE opacity = 0 -/obj/mecha/combat/reticence/Initialize() +/obj/mecha/combat/reticence/Initialize(mapload) . = ..() if(internal_tank) internal_tank.set_light_on(FALSE) //remove the light that is granted by the internal canister internal_tank.set_light_range_power_color(0, 0, COLOR_BLACK) //just turning it off isn't enough apparently -/obj/mecha/combat/reticence/loaded/Initialize() +/obj/mecha/combat/reticence/loaded/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced ME.attach(src) diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 0ae7242751ac..e79736180bee 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -2,7 +2,7 @@ /obj/item/mecha_parts/mecha_equipment/medical mech_flags = EXOSUIT_MODULE_MEDICAL -/obj/item/mecha_parts/mecha_equipment/medical/Initialize() +/obj/item/mecha_parts/mecha_equipment/medical/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -260,7 +260,7 @@ range = MECHA_MELEE|MECHA_RANGED equip_cooldown = 10 -/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Initialize() +/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/Initialize(mapload) . = ..() create_reagents(max_volume, NO_REACT) syringes = new @@ -531,7 +531,7 @@ var/obj/item/gun/medbeam/mech/medigun materials = list(/datum/material/iron = 15000, /datum/material/glass = 8000, /datum/material/plasma = 3000, /datum/material/gold = 8000, /datum/material/diamond = 2000) -/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/Initialize() +/obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/Initialize(mapload) . = ..() medigun = new(src) diff --git a/code/game/mecha/equipment/tools/mining_tools.dm b/code/game/mecha/equipment/tools/mining_tools.dm index c4f23271d2cb..93d43355aef0 100644 --- a/code/game/mecha/equipment/tools/mining_tools.dm +++ b/code/game/mecha/equipment/tools/mining_tools.dm @@ -18,7 +18,7 @@ /// Affects if it can bust through reinforced walls (DRILL_HARDENED) var/drill_level = DRILL_BASIC -/obj/item/mecha_parts/mecha_equipment/drill/Initialize() +/obj/item/mecha_parts/mecha_equipment/drill/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 50, 100) @@ -153,7 +153,7 @@ equip_cooldown = 15 var/scanning_time = 0 -/obj/item/mecha_parts/mecha_equipment/mining_scanner/Initialize() +/obj/item/mecha_parts/mecha_equipment/mining_scanner/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm index 6fd24687c249..95d2a18b6837 100644 --- a/code/game/mecha/equipment/tools/other_tools.dm +++ b/code/game/mecha/equipment/tools/other_tools.dm @@ -296,12 +296,12 @@ if(equip_ready) //disabled return var/area/A = get_area(chassis) - var/pow_chan = GET_MUTATION_POWER_channel(A) + var/pow_chan = get_mutation_power_channel(A) if(pow_chan) return 1000 //making magic -/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/GET_MUTATION_POWER_channel(var/area/A) +/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_mutation_power_channel(area/A) var/pow_chan if(A) for(var/c in use_channels) @@ -370,7 +370,7 @@ var/fuel_per_cycle_active = 200 var/power_per_cycle = 20 -/obj/item/mecha_parts/mecha_equipment/generator/Initialize() +/obj/item/mecha_parts/mecha_equipment/generator/Initialize(mapload) . = ..() generator_init() @@ -409,7 +409,7 @@ if(result) send_byjax(chassis.occupant,"exosuit.browser","[REF(src)]",src.get_equip_info()) -/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/stack/sheet/P) +/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(obj/item/stack/sheet/P) if(P.type == fuel.type && P.amount > 0) var/to_load = max(max_fuel - fuel.amount*fuel.mats_per_stack,0) if(to_load) diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm index 7523cfd1e5f1..65fce3679cea 100644 --- a/code/game/mecha/equipment/tools/work_tools.dm +++ b/code/game/mecha/equipment/tools/work_tools.dm @@ -188,7 +188,7 @@ energy_drain = 0 range = MECHA_MELEE|MECHA_RANGED -/obj/item/mecha_parts/mecha_equipment/extinguisher/Initialize() +/obj/item/mecha_parts/mecha_equipment/extinguisher/Initialize(mapload) . = ..() create_reagents(1000) reagents.add_reagent(/datum/reagent/water, 1000) @@ -258,7 +258,7 @@ var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock. var/play_sound = TRUE //so fancy mime RCD can be silent -/obj/item/mecha_parts/mecha_equipment/rcd/Initialize() +/obj/item/mecha_parts/mecha_equipment/rcd/Initialize(mapload) . = ..() GLOB.rcd_list += src @@ -339,7 +339,7 @@ -/obj/item/mecha_parts/mecha_equipment/rcd/do_after_cooldown(var/atom/target) +/obj/item/mecha_parts/mecha_equipment/rcd/do_after_cooldown(atom/target) . = ..() /obj/item/mecha_parts/mecha_equipment/rcd/Topic(href,href_list) @@ -378,7 +378,7 @@ var/obj/item/stack/cable_coil/cable var/max_cable = 1000 -/obj/item/mecha_parts/mecha_equipment/cable_layer/Initialize() +/obj/item/mecha_parts/mecha_equipment/cable_layer/Initialize(mapload) . = ..() cable = new(src, 0) @@ -402,7 +402,7 @@ chassis.events.clearEvent("onMove",event) return ..() -/obj/item/mecha_parts/mecha_equipment/cable_layer/action(var/obj/item/stack/cable_coil/target) +/obj/item/mecha_parts/mecha_equipment/cable_layer/action(obj/item/stack/cable_coil/target) if(!action_checks(target)) return if(istype(target) && target.amount) @@ -462,7 +462,7 @@ /obj/item/mecha_parts/mecha_equipment/cable_layer/proc/reset() last_piece = null -/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(var/turf/new_turf) +/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantle_floor(turf/new_turf) if(isfloorturf(new_turf)) var/turf/open/floor/T = new_turf if(!isplatingturf(T)) @@ -471,8 +471,8 @@ T.make_plating() return !new_turf.intact -/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/layCable(var/turf/new_turf) - if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf)) +/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/layCable(turf/new_turf) + if(equip_ready || !istype(new_turf) || !dismantle_floor(new_turf)) return reset() var/fdirn = turn(chassis.dir,180) for(var/obj/structure/cable/LC in new_turf) // check to make sure there's not a cable there already diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 833c0b2ca4e1..b8c23b7788c7 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -415,7 +415,7 @@ return 1 //used for projectile initilisation (priming flashbang) and additional logging -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(var/obj/O) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/proc/proj_init(obj/O) return @@ -433,7 +433,7 @@ var/det_time = 20 ammo_type = "flashbang" -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/grenade/flashbang/F) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(obj/item/grenade/flashbang/F) var/turf/T = get_turf(src) message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_VERBOSEJMP(T)]") log_game("[key_name(chassis.occupant)] fired a [src] in [AREACOORD(T)]") @@ -486,7 +486,7 @@ return 1 return 0 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(var/obj/item/assembly/mousetrap/armed/M) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/mousetrap_mortar/proj_init(obj/item/assembly/mousetrap/armed/M) M.secured = 1 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 20192ad093ab..6856bf252b10 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -28,7 +28,7 @@ var/on = FALSE var/turf/recharging_turf = null -/obj/machinery/mech_bay_recharge_port/Initialize() +/obj/machinery/mech_bay_recharge_port/Initialize(mapload) . = ..() recharging_turf = get_step(loc, dir) @@ -144,7 +144,7 @@ return add_overlay("recharge_comp_on") -/obj/machinery/computer/mech_bay_power_console/Initialize() +/obj/machinery/computer/mech_bay_power_console/Initialize(mapload) . = ..() reconnect() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c0e28bcce621..9bf7b05d6299 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -143,7 +143,7 @@ /obj/item/radio/mech //this has to go somewhere -/obj/mecha/Initialize() +/obj/mecha/Initialize(mapload) . = ..() events = new icon_state += "-open" @@ -254,7 +254,7 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) return internal_tank -/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null) ///Adds a cell, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. +/obj/mecha/proc/add_cell(obj/item/stock_parts/cell/C=null) ///Adds a cell, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. QDEL_NULL(cell) if(C) C.forceMove(src) @@ -262,7 +262,7 @@ return cell = new /obj/item/stock_parts/cell/high/plus(src) -/obj/mecha/proc/add_scanmod(var/obj/item/stock_parts/scanning_module/sm=null) ///Adds a scanning module, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. +/obj/mecha/proc/add_scanmod(obj/item/stock_parts/scanning_module/sm=null) ///Adds a scanning module, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. QDEL_NULL(scanmod) if(sm) sm.forceMove(src) @@ -270,7 +270,7 @@ return scanmod = new /obj/item/stock_parts/scanning_module(src) -/obj/mecha/proc/add_capacitor(var/obj/item/stock_parts/capacitor/cap=null) ///Adds a capacitor, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. +/obj/mecha/proc/add_capacitor(obj/item/stock_parts/capacitor/cap=null) ///Adds a capacitor, for use in Map-spawned mechs, Nuke Ops mechs, and admin-spawned mechs. Mechs built by hand will replace this. QDEL_NULL(capacitor) if(cap) cap.forceMove(src) @@ -624,7 +624,7 @@ occupant_message(span_warning("Air port connection teared off!")) log_message("Lost connection to gas port.", LOG_MECHA) -/obj/mecha/Process_Spacemove(var/movement_dir = 0) +/obj/mecha/Process_Spacemove(movement_dir = 0) . = ..() if(.) return TRUE @@ -727,7 +727,7 @@ playsound(src,stepsound,40,1) return result -/obj/mecha/Bump(var/atom/obstacle) +/obj/mecha/Bump(atom/obstacle) var/turf/newloc = get_step(src,dir) var/area/newarea = newloc.loc @@ -1264,7 +1264,7 @@ GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013??? ////// Ammo stuff ///// /////////////////////// -/obj/mecha/proc/ammo_resupply(var/obj/item/mecha_ammo/A, mob/user,var/fail_chat_override = FALSE) +/obj/mecha/proc/ammo_resupply(obj/item/mecha_ammo/A, mob/user, fail_chat_override = FALSE) if(!A.rounds) if(!fail_chat_override) to_chat(user, span_warning("This box of ammo is empty!")) diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm index a5bddb10a107..81f83e1c5f1f 100644 --- a/code/game/mecha/mecha_parts.dm +++ b/code/game/mecha/mecha_parts.dm @@ -30,7 +30,7 @@ interaction_flags_item = NONE //Don't pick us up!! var/construct_type -/obj/item/mecha_parts/chassis/Initialize() +/obj/item/mecha_parts/chassis/Initialize(mapload) . = ..() if(construct_type) AddComponent(construct_type) diff --git a/code/game/mecha/working/clarke.dm b/code/game/mecha/working/clarke.dm index 04f6fa9cbb1e..c76f0f27b886 100644 --- a/code/game/mecha/working/clarke.dm +++ b/code/game/mecha/working/clarke.dm @@ -21,7 +21,7 @@ var/obj/structure/ore_box/box omnidirectional_attacks = TRUE -/obj/mecha/working/clarke/Initialize() +/obj/mecha/working/clarke/Initialize(mapload) . = ..() box = new /obj/structure/ore_box(src) var/obj/item/mecha_parts/mecha_equipment/orebox_manager/ME = new(src) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index 7454e374b181..281768bcb5ed 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -55,7 +55,7 @@ . = ..() -/obj/mecha/working/ripley/Initialize() +/obj/mecha/working/ripley/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate,3,/obj/item/stack/sheet/animalhide/goliath_hide,list(MELEE = 10, BULLET = 5, LASER = 5)) @@ -111,7 +111,7 @@ silicon_icon_state = null opacity = TRUE -/obj/mecha/working/ripley/deathripley/Initialize() +/obj/mecha/working/ripley/deathripley/Initialize(mapload) . = ..() var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill ME.attach(src) @@ -123,7 +123,7 @@ slow_pressure_step_in = 3 step_in = 3 -/obj/mecha/working/ripley/deathripley/real/Initialize() +/obj/mecha/working/ripley/deathripley/real/Initialize(mapload) . = ..() for(var/obj/item/mecha_parts/mecha_equipment/E in equipment) E.detach() @@ -137,7 +137,7 @@ name = "\improper APLU \"Miner\"" obj_integrity = 75 //Low starting health -/obj/mecha/working/ripley/mining/Initialize() +/obj/mecha/working/ripley/mining/Initialize(mapload) . = ..() if(cell) cell.charge = FLOOR(cell.charge * 0.25, 1) //Starts at very low charge diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index 0337b076ff7e..36320f29133b 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -11,7 +11,7 @@ var/static/list/AllTeleporters -/obj/effect/bump_teleporter/Initialize() +/obj/effect/bump_teleporter/Initialize(mapload) . = ..() LAZYADD(AllTeleporters, src) diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 93ae375a7934..4a377b758d56 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -58,7 +58,7 @@ var/poster_item_desc = "This hypothetical poster item should not exist, let's be honest here." var/poster_item_icon_state = "rolled_poster" -/obj/structure/sign/poster/Initialize() +/obj/structure/sign/poster/Initialize(mapload) . = ..() if(random_basetype) randomise(random_basetype) diff --git a/code/game/objects/effects/countdown.dm b/code/game/objects/effects/countdown.dm index e3c58a0be442..7f5933b4c125 100644 --- a/code/game/objects/effects/countdown.dm +++ b/code/game/objects/effects/countdown.dm @@ -14,7 +14,7 @@ var/displayed_text var/atom/attached_to -/obj/effect/countdown/Initialize() +/obj/effect/countdown/Initialize(mapload) . = ..() attach(loc) diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index b717ec190181..eeaa6dd4e4bf 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -9,7 +9,7 @@ bloodiness = BLOOD_AMOUNT_PER_DECAL blood_state = BLOOD_STATE_XENO -/obj/effect/decal/cleanable/xenoblood/Initialize() +/obj/effect/decal/cleanable/xenoblood/Initialize(mapload) . = ..() add_blood_DNA(list("UNKNOWN DNA" = "X*")) @@ -75,6 +75,6 @@ icon_state = "xtracks" random_icon_states = null -/obj/effect/decal/cleanable/blood/xtracks/Initialize() +/obj/effect/decal/cleanable/blood/xtracks/Initialize(mapload) . = ..() add_blood_DNA(list("Unknown DNA" = "X*")) diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 91efab103374..25d1a649d52a 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -11,7 +11,7 @@ icon_state = "ash" mergeable_decal = FALSE -/obj/effect/decal/cleanable/ash/Initialize() +/obj/effect/decal/cleanable/ash/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/ash, 30) pixel_x = rand(-5, 5) @@ -25,7 +25,7 @@ name = "large pile of ashes" icon_state = "big_ash" -/obj/effect/decal/cleanable/ash/large/Initialize() +/obj/effect/decal/cleanable/ash/large/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/ash, 30) //double the amount of ash. @@ -35,7 +35,7 @@ icon = 'icons/obj/shards.dmi' icon_state = "tiny" -/obj/effect/decal/cleanable/glass/Initialize() +/obj/effect/decal/cleanable/glass/Initialize(mapload) . = ..() setDir(pick(GLOB.cardinals)) @@ -53,7 +53,7 @@ smooth = SMOOTH_FALSE mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/effect/decal/cleanable/dirt/Initialize() +/obj/effect/decal/cleanable/dirt/Initialize(mapload) . = ..() var/turf/T = get_turf(src) if(T.tiled_dirt) @@ -83,7 +83,7 @@ /obj/effect/decal/cleanable/greenglow/ex_act() return -/obj/effect/decal/cleanable/greenglow/Initialize() +/obj/effect/decal/cleanable/greenglow/Initialize(mapload) . = ..() AddComponent(/datum/component/radioactive, 15, src, 0, FALSE) addtimer(CALLBACK(src, PROC_REF(Decay)), 24 SECONDS) @@ -97,7 +97,7 @@ if(R) R.RemoveComponent() -/obj/effect/decal/cleanable/greenglow/filled/Initialize() +/obj/effect/decal/cleanable/greenglow/filled/Initialize(mapload) . = ..() reagents.add_reagent(pick(/datum/reagent/uranium, /datum/reagent/uranium/radium), 5) @@ -185,7 +185,7 @@ if(severity == 1) //so shreds created during an explosion aren't deleted by the explosion. qdel(src) -/obj/effect/decal/cleanable/shreds/Initialize() +/obj/effect/decal/cleanable/shreds/Initialize(mapload) pixel_x = rand(-10, 10) pixel_y = rand(-10, 10) . = ..() diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 07d2de23620e..7936b73ae440 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -51,7 +51,7 @@ blood_state = BLOOD_STATE_OIL bloodiness = BLOOD_AMOUNT_PER_DECAL -/obj/effect/decal/cleanable/oil/Initialize() +/obj/effect/decal/cleanable/oil/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/oil, 30) @@ -76,6 +76,6 @@ icon_state = "streak1" random_icon_states = list("streak1", "streak2", "streak3", "streak4", "streak5") -/obj/effect/decal/cleanable/oil/slippery/Initialize() +/obj/effect/decal/cleanable/oil/slippery/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80, (NO_SLIP_WHEN_WALKING | SLIDE)) diff --git a/code/game/objects/effects/decals/decal.dm b/code/game/objects/effects/decals/decal.dm index 55324a1da418..bbdba5ee4fdc 100644 --- a/code/game/objects/effects/decals/decal.dm +++ b/code/game/objects/effects/decals/decal.dm @@ -5,7 +5,7 @@ resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF var/turf_loc_check = TRUE -/obj/effect/decal/Initialize() +/obj/effect/decal/Initialize(mapload) . = ..() if(turf_loc_check && (!isturf(loc) || NeverShouldHaveComeHere(loc))) return INITIALIZE_HINT_QDEL @@ -36,7 +36,7 @@ icon_state = "warningline" layer = TURF_DECAL_LAYER -/obj/effect/turf_decal/Initialize() +/obj/effect/turf_decal/Initialize(mapload) . = ..() var/turf/T = loc if(!istype(T)) //you know this will happen somehow diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index daaa7d17325e..1f849c097228 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -4,7 +4,7 @@ layer = TURF_PLATING_DECAL_LAYER alpha = 110 -/obj/effect/turf_decal/tile/Initialize() +/obj/effect/turf_decal/tile/Initialize(mapload) if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) color = "#[random_short_color()]" . = ..() @@ -354,7 +354,7 @@ name = "colorful corner" color = "#E300FF" //bright pink as default for mapping -/obj/effect/turf_decal/tile/random/Initialize() +/obj/effect/turf_decal/tile/random/Initialize(mapload) color = "#[random_short_color()]" . = ..() @@ -363,7 +363,7 @@ alpha = 110 icon_state = "trimline_box" -/obj/effect/turf_decal/trimline/Initialize() +/obj/effect/turf_decal/trimline/Initialize(mapload) if(SSevents.holidays && SSevents.holidays[APRIL_FOOLS]) color = "#[random_short_color()]" . = ..() diff --git a/code/game/objects/effects/effect_system/effect_system.dm b/code/game/objects/effects/effect_system/effect_system.dm index a0947c682dfa..35ba7c6f9c44 100644 --- a/code/game/objects/effects/effect_system/effect_system.dm +++ b/code/game/objects/effects/effect_system/effect_system.dm @@ -12,7 +12,7 @@ would spawn and follow the beaker, even if it is carried or thrown. pass_flags = PASSTABLE | PASSGRILLE anchored = TRUE -/obj/effect/particle_effect/Initialize() +/obj/effect/particle_effect/Initialize(mapload) . = ..() GLOB.cameranet.updateVisibility(src) diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index ec97228adbc0..c7c599a2c6bb 100644 --- a/code/game/objects/effects/effect_system/effects_explosion.dm +++ b/code/game/objects/effects/effect_system/effects_explosion.dm @@ -4,7 +4,7 @@ opacity = 1 anchored = TRUE -/obj/effect/particle_effect/expl_particles/Initialize() //yogs start: reverts harddel stuff so it doesn't break horribly +/obj/effect/particle_effect/expl_particles/Initialize(mapload) //yogs start: reverts harddel stuff so it doesn't break horribly . = ..() QDEL_IN(src, 15) //end of part 1 @@ -29,7 +29,7 @@ pixel_x = -32 pixel_y = -32 -/obj/effect/explosion/Initialize() +/obj/effect/explosion/Initialize(mapload) . = ..() QDEL_IN(src, 10) diff --git a/code/game/objects/effects/effect_system/effects_sparks.dm b/code/game/objects/effects/effect_system/effects_sparks.dm index bcd82c07b1c2..611103cbb917 100644 --- a/code/game/objects/effects/effect_system/effects_sparks.dm +++ b/code/game/objects/effects/effect_system/effects_sparks.dm @@ -26,7 +26,7 @@ light_color = LIGHT_COLOR_FIRE light_flags = LIGHT_NO_LUMCOUNT -/obj/effect/particle_effect/sparks/Initialize() +/obj/effect/particle_effect/sparks/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm index 4289e3128f7d..3ccf8deca864 100644 --- a/code/game/objects/effects/effect_system/effects_water.dm +++ b/code/game/objects/effects/effect_system/effects_water.dm @@ -8,7 +8,7 @@ mouse_opacity = MOUSE_OPACITY_TRANSPARENT -/obj/effect/particle_effect/water/Initialize() +/obj/effect/particle_effect/water/Initialize(mapload) . = ..() QDEL_IN(src, 70) @@ -44,7 +44,7 @@ steam.start() -- spawns the effect icon_state = "extinguish" density = FALSE -/obj/effect/particle_effect/steam/Initialize() +/obj/effect/particle_effect/steam/Initialize(mapload) . = ..() QDEL_IN(src, 20) diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index fb1275636884..210af1c42ffe 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -9,7 +9,7 @@ /// If set, how long the force field lasts after it's created. Set to 0 to have infinite duration forcefields. var/initial_duration = 30 SECONDS -/obj/effect/forcefield/Initialize() +/obj/effect/forcefield/Initialize(mapload) . = ..() if(initial_duration) QDEL_IN(src, initial_duration) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 5d8d9113b6c3..2a2b909299ed 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -19,7 +19,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) -/obj/effect/landmark/Initialize() +/obj/effect/landmark/Initialize(mapload) . = ..() GLOB.landmarks_list += src @@ -43,7 +43,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) qdel(src) #endif -/obj/effect/landmark/start/Initialize() +/obj/effect/landmark/start/Initialize(mapload) . = ..() GLOB.start_landmarks_list += src if(jobspawn_override) @@ -228,7 +228,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon = 'icons/effects/landmarks_static.dmi' icon_state = "wiznerd_spawn" -/obj/effect/landmark/start/wizard/Initialize() +/obj/effect/landmark/start/wizard/Initialize(mapload) ..() GLOB.wizardstart += loc return INITIALIZE_HINT_QDEL @@ -238,7 +238,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon = 'icons/effects/landmarks_static.dmi' icon_state = "snukeop_spawn" -/obj/effect/landmark/start/nukeop/Initialize() +/obj/effect/landmark/start/nukeop/Initialize(mapload) ..() GLOB.nukeop_start += loc return INITIALIZE_HINT_QDEL @@ -248,7 +248,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) icon = 'icons/effects/landmarks_static.dmi' icon_state = "snukeop_leader_spawn" -/obj/effect/landmark/start/nukeop_leader/Initialize() +/obj/effect/landmark/start/nukeop_leader/Initialize(mapload) ..() GLOB.nukeop_leader_start += loc return INITIALIZE_HINT_QDEL @@ -260,7 +260,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/start/new_player name = "New Player" -/obj/effect/landmark/start/new_player/Initialize() +/obj/effect/landmark/start/new_player/Initialize(mapload) ..() GLOB.newplayer_start += loc return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 5d978e646c76..9c4618da8052 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -90,7 +90,7 @@ var/disarm_time = 12 SECONDS var/disarm_product = /obj/item/deployablemine // ie what drops when the mine is disarmed -/obj/effect/mine/Initialize() +/obj/effect/mine/Initialize(mapload) . = ..() layer = ABOVE_MOB_LAYER @@ -264,7 +264,7 @@ alpha = 255 var/duration = 0 -/obj/effect/mine/pickup/Initialize() +/obj/effect/mine/pickup/Initialize(mapload) . = ..() animate(src, pixel_y = 4, time = 2 SECONDS, loop = -1) diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm index 19def920e8cd..906425b34252 100644 --- a/code/game/objects/effects/overlays.dm +++ b/code/game/objects/effects/overlays.dm @@ -13,7 +13,7 @@ icon_state="b_beam" var/atom/BeamSource -/obj/effect/overlay/beam/Initialize() +/obj/effect/overlay/beam/Initialize(mapload) . = ..() QDEL_IN(src, 10) diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index c520c27d0e97..ef4a9eda4c6c 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -13,7 +13,7 @@ var/pressure_o = 10 * ONE_ATMOSPHERE //tank pressures var/assembly_type -/obj/effect/spawner/newbomb/Initialize() +/obj/effect/spawner/newbomb/Initialize(mapload) . = ..() var/obj/item/transfer_valve/V = new(src.loc) var/obj/item/tank/internals/plasma/PT = new(V) @@ -39,7 +39,7 @@ return INITIALIZE_HINT_QDEL -/obj/effect/spawner/newbomb/timer/syndicate/Initialize() +/obj/effect/spawner/newbomb/timer/syndicate/Initialize(mapload) temp_p = (OPTIMAL_TEMP_K_PLA_BURN_SCALE(pressure_p, pressure_o, temp_o)/2 + OPTIMAL_TEMP_K_PLA_BURN_RATIO(pressure_p, pressure_o, temp_o)/2) - T0C . = ..() diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index 28448ab6499e..ee36183d4718 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -68,7 +68,7 @@ gibamounts = list(2, 2, 1) sound_vol = 40 -/obj/effect/gibspawner/generic/Initialize() +/obj/effect/gibspawner/generic/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(WEST, NORTHWEST, SOUTHWEST, NORTH),list(EAST, NORTHEAST, SOUTHEAST, SOUTH), list()) return ..() @@ -84,7 +84,7 @@ gib_mob_type = /mob/living/carbon/human sound_vol = 50 -/obj/effect/gibspawner/human/Initialize() +/obj/effect/gibspawner/human/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list()) return ..() @@ -94,7 +94,7 @@ gibtypes = list(/obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/core, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/decal/cleanable/blood/gibs/torso) gibamounts = list(1, 1, 1, 1, 1, 1) -/obj/effect/gibspawner/human/bodypartless/Initialize() +/obj/effect/gibspawner/human/bodypartless/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list()) return ..() @@ -106,7 +106,7 @@ gibamounts = list(1, 1, 1, 1, 1, 1, 1) gib_mob_type = /mob/living/carbon/alien -/obj/effect/gibspawner/xeno/Initialize() +/obj/effect/gibspawner/xeno/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs, list()) return ..() @@ -117,7 +117,7 @@ gibamounts = list(1, 1, 1, 1, 1, 1) -/obj/effect/gibspawner/xeno/bodypartless/Initialize() +/obj/effect/gibspawner/xeno/bodypartless/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, list()) return ..() @@ -129,7 +129,7 @@ gibamounts = list(1, 1, 1, 1) gib_mob_type = /mob/living/carbon/alien/larva -/obj/effect/gibspawner/larva/Initialize() +/obj/effect/gibspawner/larva/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST), list(), GLOB.alldirs) return ..() @@ -138,7 +138,7 @@ gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs/larva, /obj/effect/decal/cleanable/xenoblood/xgibs/larva, /obj/effect/decal/cleanable/xenoblood/xgibs/larva) gibamounts = list(1, 1, 1) -/obj/effect/gibspawner/larva/bodypartless/Initialize() +/obj/effect/gibspawner/larva/bodypartless/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST), list()) return ..() @@ -151,7 +151,7 @@ gibamounts = list(1, 1, 1, 1, 1, 1) gib_mob_type = /mob/living/silicon -/obj/effect/gibspawner/robot/Initialize() +/obj/effect/gibspawner/robot/Initialize(mapload) if(!gibdirections.len) gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), GLOB.alldirs, GLOB.alldirs) gibamounts[6] = pick(0, 1, 2) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 0dbbd86406a4..c2581900c355 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -538,7 +538,7 @@ /obj/effect/spawner/lootdrop/costume name = "random costume spawner" -/obj/effect/spawner/lootdrop/costume/Initialize() +/obj/effect/spawner/lootdrop/costume/Initialize(mapload) loot = list() for(var/path in subtypesof(/obj/effect/spawner/bundle/costume)) loot[path] = TRUE diff --git a/code/game/objects/effects/spawners/minor_variation.dm b/code/game/objects/effects/spawners/minor_variation.dm index 7b876cbd544a..f991d509cd75 100644 --- a/code/game/objects/effects/spawners/minor_variation.dm +++ b/code/game/objects/effects/spawners/minor_variation.dm @@ -15,7 +15,7 @@ This is mainly to prevent creating new map files when creating smaller variation var/ref_y // y of reference var/ref_z // z of reference -/obj/effect/variation/Initialize() +/obj/effect/variation/Initialize(mapload) . = ..() chosen = FALSE placement() diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 87686a3a7041..5fb9ed06157e 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -8,7 +8,7 @@ again. name = "map structure spawner" var/list/spawn_list -/obj/effect/spawner/structure/Initialize() +/obj/effect/spawner/structure/Initialize(mapload) . = ..() if(spawn_list && spawn_list.len) for(var/I in spawn_list) @@ -36,7 +36,7 @@ again. /obj/effect/spawner/structure/window/hollow/end icon_state = "hwindow_spawner_end" -/obj/effect/spawner/structure/window/hollow/end/Initialize() +/obj/effect/spawner/structure/window/hollow/end/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north, /obj/structure/window/spawner/east, /obj/structure/window/spawner/west) @@ -51,7 +51,7 @@ again. /obj/effect/spawner/structure/window/hollow/middle icon_state = "hwindow_spawner_middle" -/obj/effect/spawner/structure/window/hollow/middle/Initialize() +/obj/effect/spawner/structure/window/hollow/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) spawn_list = list(/obj/structure/grille, /obj/structure/window, /obj/structure/window/spawner/north) @@ -62,7 +62,7 @@ again. /obj/effect/spawner/structure/window/hollow/directional icon_state = "hwindow_spawner_directional" -/obj/effect/spawner/structure/window/hollow/directional/Initialize() +/obj/effect/spawner/structure/window/hollow/directional/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/spawner/north) @@ -110,7 +110,7 @@ again. /obj/effect/spawner/structure/window/hollow/reinforced/end icon_state = "hrwindow_spawner_end" -/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize() +/obj/effect/spawner/structure/window/hollow/reinforced/end/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north, /obj/structure/window/reinforced/spawner/east, /obj/structure/window/reinforced/spawner/west) @@ -125,7 +125,7 @@ again. /obj/effect/spawner/structure/window/hollow/reinforced/middle icon_state = "hrwindow_spawner_middle" -/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize() +/obj/effect/spawner/structure/window/hollow/reinforced/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced, /obj/structure/window/reinforced/spawner/north) @@ -136,7 +136,7 @@ again. /obj/effect/spawner/structure/window/hollow/reinforced/directional icon_state = "hrwindow_spawner_directional" -/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize() +/obj/effect/spawner/structure/window/hollow/reinforced/directional/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/reinforced/spawner/north) @@ -208,7 +208,7 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/end icon_state = "podwindow_spawner_end" -/obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize() +/obj/effect/spawner/structure/window/hollow/survival_pod/end/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north, /obj/structure/window/shuttle/survival_pod/spawner/east, /obj/structure/window/shuttle/survival_pod/spawner/west) @@ -223,7 +223,7 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/middle icon_state = "podwindow_spawner_middle" -/obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize() +/obj/effect/spawner/structure/window/hollow/survival_pod/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod, /obj/structure/window/shuttle/survival_pod/spawner/north) @@ -234,7 +234,7 @@ again. /obj/effect/spawner/structure/window/hollow/survival_pod/directional icon_state = "podwindow_spawner_directional" -/obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize() +/obj/effect/spawner/structure/window/hollow/survival_pod/directional/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/shuttle/survival_pod/spawner/north) @@ -270,7 +270,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/end icon_state = "phwindow_spawner_end" -/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/end/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north, /obj/structure/window/plasma/spawner/east, /obj/structure/window/plasma/spawner/west) @@ -285,7 +285,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/middle icon_state = "phwindow_spawner_middle" -/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma, /obj/structure/window/plasma/spawner/north) @@ -296,7 +296,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/directional icon_state = "phwindow_spawner_directional" -/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/directional/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/spawner/north) @@ -331,7 +331,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/reinforced/end icon_state = "phrwindow_spawner_end" -/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/end/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north, /obj/structure/window/plasma/reinforced/spawner/east, /obj/structure/window/plasma/reinforced/spawner/west) @@ -346,7 +346,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle icon_state = "phrwindow_spawner_middle" -/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/middle/Initialize(mapload) switch(dir) if(NORTH,SOUTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced, /obj/structure/window/plasma/reinforced/spawner/north) @@ -357,7 +357,7 @@ again. /obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional icon_state = "phrwindow_spawner_directional" -/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize() +/obj/effect/spawner/structure/window/hollow/plasma/reinforced/directional/Initialize(mapload) switch(dir) if(NORTH) spawn_list = list(/obj/structure/grille, /obj/structure/window/plasma/reinforced/spawner/north) @@ -392,7 +392,7 @@ again. icon_state = "solar_spawner" spawn_list = list(/obj/machinery/power/solar) -/obj/effect/spawner/structure/solars/solar_96/Initialize() +/obj/effect/spawner/structure/solars/solar_96/Initialize(mapload) if (prob(3)) // I know mathmatically it is supphosed to be 4 but when set to 4 I got inconsistent results. 3 puts you at 7-10 consistently. Weird snowflake behavior of prob() - Hopek return INITIALIZE_HINT_QDEL . = ..() diff --git a/code/game/objects/effects/spawners/traps.dm b/code/game/objects/effects/spawners/traps.dm index f374d8b52cfa..c572d80b7b3f 100644 --- a/code/game/objects/effects/spawners/traps.dm +++ b/code/game/objects/effects/spawners/traps.dm @@ -14,7 +14,7 @@ icon = 'icons/obj/structures_spawners.dmi' icon_state = "wire_splicing" -/obj/effect/spawner/wire_splicing/Initialize() +/obj/effect/spawner/wire_splicing/Initialize(mapload) . = ..() new/obj/structure/wire_splicing(get_turf(src)) return INITIALIZE_HINT_QDEL diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 7506f31b33c5..a71ab92540fb 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -30,7 +30,7 @@ /obj/structure/spider/stickyweb icon_state = "stickyweb1" -/obj/structure/spider/stickyweb/Initialize() +/obj/structure/spider/stickyweb/Initialize(mapload) if(prob(50)) icon_state = "stickyweb2" . = ..() @@ -59,7 +59,7 @@ var/poison_per_bite = 5 var/list/faction = list("spiders") -/obj/structure/spider/eggcluster/Initialize() +/obj/structure/spider/eggcluster/Initialize(mapload) pixel_x = rand(3,-3) pixel_y = rand(3,-3) START_PROCESSING(SSobj, src) @@ -96,7 +96,7 @@ new/obj/item/reagent_containers/food/snacks/spiderling(get_turf(src)) . = ..() -/obj/structure/spider/spiderling/Initialize() +/obj/structure/spider/spiderling/Initialize(mapload) . = ..() pixel_x = rand(6,-6) pixel_y = rand(6,-6) @@ -206,7 +206,7 @@ icon_state = "cocoon1" max_integrity = 60 -/obj/structure/spider/cocoon/Initialize() +/obj/structure/spider/cocoon/Initialize(mapload) icon_state = pick("cocoon1","cocoon2","cocoon3") . = ..() diff --git a/code/game/objects/effects/temporary_visuals/clockcult.dm b/code/game/objects/effects/temporary_visuals/clockcult.dm index e7f375e29d7d..16d10fd03483 100644 --- a/code/game/objects/effects/temporary_visuals/clockcult.dm +++ b/code/game/objects/effects/temporary_visuals/clockcult.dm @@ -69,7 +69,7 @@ pixel_y = 20 duration = 2 SECONDS -/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize() +/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize(mapload) . = ..() animate(src, alpha = 0, time = duration, easing = EASE_OUT) @@ -95,7 +95,7 @@ icon_state = "warden_gaze" duration = 0.3 SECONDS -/obj/effect/temp_visual/ratvar/ocular_warden/Initialize() +/obj/effect/temp_visual/ratvar/ocular_warden/Initialize(mapload) . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-10, 10) @@ -134,7 +134,7 @@ layer = ABOVE_MOB_LAYER duration = 1 SECONDS -/obj/effect/temp_visual/ratvar/component/Initialize() +/obj/effect/temp_visual/ratvar/component/Initialize(mapload) . = ..() transform = matrix()*0.75 pixel_x = rand(-10, 10) @@ -165,7 +165,7 @@ light_power = 2 light_color = "#FAE48C" -/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize() +/obj/effect/temp_visual/ratvar/sigil/transgression/Initialize(mapload) . = ..() var/oldtransform = transform animate(src, transform = matrix()*2, time = 0.5 SECONDS) @@ -227,7 +227,7 @@ /obj/effect/temp_visual/steam_release name = "all the steam" -/obj/effect/temp_visual/steam_release/Initialize() +/obj/effect/temp_visual/steam_release/Initialize(mapload) ..() for(var/V in GLOB.cardinals) var/turf/T = get_step(src, V) diff --git a/code/game/objects/effects/temporary_visuals/temporary_visual.dm b/code/game/objects/effects/temporary_visuals/temporary_visual.dm index 615f392a8617..7018e633179c 100644 --- a/code/game/objects/effects/temporary_visuals/temporary_visual.dm +++ b/code/game/objects/effects/temporary_visuals/temporary_visual.dm @@ -8,7 +8,7 @@ var/randomdir = TRUE var/timerid -/obj/effect/temp_visual/Initialize() +/obj/effect/temp_visual/Initialize(mapload) . = ..() if(randomdir) setDir(pick(GLOB.cardinals)) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 3f79d9d9809a..4dda5c6d909c 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -142,7 +142,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) var/printed = FALSE -/obj/item/Initialize() +/obj/item/Initialize(mapload) materials = typelist("materials", materials) @@ -185,7 +185,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) else if (islist(embedding)) embedding = getEmbeddingBehavior(arglist(embedding)) else if (!istype(embedding, /datum/embedding_behavior)) - stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize()") + stack_trace("Invalid type [embedding.type] found in .embedding during /obj/item Initialize(mapload)") /obj/item/Destroy() item_flags &= ~DROPDEL //prevent reqdels @@ -570,7 +570,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) /obj/item/proc/ui_action_click(mob/user, actiontype) attack_self(user) -/obj/item/proc/IsReflect(var/def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit +/obj/item/proc/IsReflect(def_zone) //This proc determines if and at what% an object will reflect energy projectiles if it's in l_hand,r_hand or wear_suit return 0 /obj/item/proc/eyestab(mob/living/carbon/M, mob/living/carbon/user) diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 5587c258ead6..2e8d62b28371 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -24,16 +24,16 @@ AI MODULES var/bypass_law_amt_check = 0 materials = list(/datum/material/gold=50) -/obj/item/aiModule/examine(var/mob/user as mob) +/obj/item/aiModule/examine(mob/user as mob) . = ..() if(Adjacent(user)) show_laws(user) -/obj/item/aiModule/attack_self(var/mob/user as mob) +/obj/item/aiModule/attack_self(mob/user as mob) ..() show_laws(user) -/obj/item/aiModule/proc/show_laws(var/mob/user as mob) +/obj/item/aiModule/proc/show_laws(mob/user as mob) if(laws.len) to_chat(user, "Programmed Law[(laws.len > 1) ? "s" : ""]:") for(var/law in laws) @@ -332,7 +332,7 @@ AI MODULES /obj/item/aiModule/core/full var/law_id // if non-null, loads the laws from the ai_laws datums -/obj/item/aiModule/core/full/Initialize() +/obj/item/aiModule/core/full/Initialize(mapload) . = ..() if(!law_id) return @@ -360,7 +360,7 @@ AI MODULES law_id = "asimov" var/subject = "human being" -/obj/item/aiModule/core/full/asimov/attack_self(var/mob/user as mob) +/obj/item/aiModule/core/full/asimov/attack_self(mob/user as mob) var/targName = stripped_input(user, "Please enter a new subject that asimov is concerned with.", "Asimov to whom?", subject, MAX_NAME_LEN) if(!targName) return @@ -448,7 +448,7 @@ AI MODULES /obj/item/aiModule/core/full/custom name = "Default Core AI Module" -/obj/item/aiModule/core/full/custom/Initialize() +/obj/item/aiModule/core/full/custom/Initialize(mapload) . = ..() for(var/line in world.file2list("[global.config.directory]/silicon_laws.txt")) if(!line) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 4878db6285c5..51da17397150 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -592,7 +592,7 @@ RLD last_placed = new/obj/machinery/conveyor(A, cdir, linked_switch_id) qdel(rcd_effect) -/obj/item/construction/rcd/Initialize() +/obj/item/construction/rcd/Initialize(mapload) . = ..() airlock_electronics = new(src) airlock_electronics.name = "Access Control" @@ -743,7 +743,7 @@ RLD cut_overlays() //To prevent infinite stacking of overlays add_overlay("[icon_state]_charge[ratio]") -/obj/item/construction/rcd/Initialize() +/obj/item/construction/rcd/Initialize(mapload) . = ..() update_icon() @@ -900,7 +900,7 @@ RLD var/obj/item/conveyor_switch_construct/C = I linked_switch_id = C.id -/obj/item/construction/rld/proc/checkdupes(var/target) +/obj/item/construction/rld/proc/checkdupes(target) . = list() var/turf/checking = get_turf(target) for(var/obj/machinery/light/dupe in checking) diff --git a/code/game/objects/items/RCL.dm b/code/game/objects/items/RCL.dm index c28b11a8ccc3..431d6ed997d4 100644 --- a/code/game/objects/items/RCL.dm +++ b/code/game/objects/items/RCL.dm @@ -281,14 +281,14 @@ wiringGuiUpdate(user) -/obj/item/twohanded/rcl/pre_loaded/Initialize() //Comes preloaded with cable, for testing stuff +/obj/item/twohanded/rcl/pre_loaded/Initialize(mapload) //Comes preloaded with cable, for testing stuff . = ..() loaded = new() loaded.max_amount = max_amount loaded.amount = max_amount update_icon() -/obj/item/twohanded/rcl/Initialize() +/obj/item/twohanded/rcl/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 3c99395925cb..2c15f37f7aca 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -241,7 +241,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( var/mode = BUILD_MODE | PAINT_MODE | DESTROY_MODE | WRENCH_MODE var/locked = FALSE //wheter we can change categories. Useful for the plumber -/obj/item/pipe_dispenser/Initialize() +/obj/item/pipe_dispenser/Initialize(mapload) . = ..() spark_system = new spark_system.set_up(5, 0, src) @@ -574,7 +574,7 @@ GLOBAL_LIST_INIT(fluid_duct_recipes, list( category = PLUMBING_CATEGORY locked = TRUE -/obj/item/pipe_dispenser/plumbing/Initialize() +/obj/item/pipe_dispenser/plumbing/Initialize(mapload) . = ..() spark_system = new spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/RSF.dm b/code/game/objects/items/RSF.dm index fcf35baef4ab..6a36a7cb64e1 100644 --- a/code/game/objects/items/RSF.dm +++ b/code/game/objects/items/RSF.dm @@ -34,7 +34,7 @@ RSF var/list/allowed_surfaces = list(/obj/structure/table) ///A list of surfaces that we are allowed to place things on. var/action_type = "Dispensing" ///The verb that describes what we're doing, for use in text -/obj/item/rsf/Initialize() +/obj/item/rsf/Initialize(mapload) . = ..() to_dispense = cost_by_item[1] dispense_cost = cost_by_item[to_dispense] @@ -171,7 +171,7 @@ RSF var/cooldown = 0 ///Holds a copy of world.time taken the last time the synth gained a charge. Used with cooldowndelay to track when the next charge should be gained var/cooldowndelay = 10 ///The period between recharges -/obj/item/rsf/cookiesynth/Initialize() +/obj/item/rsf/cookiesynth/Initialize(mapload) . = ..() START_PROCESSING(SSprocessing, src) diff --git a/code/game/objects/items/airlock_painter.dm b/code/game/objects/items/airlock_painter.dm index 89dcdd9c0f18..909bda5a1ab7 100644 --- a/code/game/objects/items/airlock_painter.dm +++ b/code/game/objects/items/airlock_painter.dm @@ -36,7 +36,7 @@ "Centcom" = /obj/machinery/door/airlock/centcom ) -/obj/item/airlock_painter/Initialize() +/obj/item/airlock_painter/Initialize(mapload) . = ..() ink = new /obj/item/toner(src) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index b703a01f8851..1baf70705436 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -55,7 +55,7 @@ qdel(src) -/obj/item/wallframe/proc/after_attach(var/obj/O) +/obj/item/wallframe/proc/after_attach(obj/O) transfer_fingerprints_to(O) /obj/item/wallframe/attackby(obj/item/W, mob/user, params) diff --git a/code/game/objects/items/barriertape.dm b/code/game/objects/items/barriertape.dm index 1bcdde8d7a73..04102d50e88a 100644 --- a/code/game/objects/items/barriertape.dm +++ b/code/game/objects/items/barriertape.dm @@ -45,7 +45,7 @@ req_access = list(ACCESS_CONSTRUCTION) icon_base = "engineering" -/obj/item/barrier_taperoll/attack_self(var/mob/user) +/obj/item/barrier_taperoll/attack_self(mob/user) if(!placing) start = get_turf(src) to_chat(usr, span_notice("You place the first end of the [src].")) @@ -97,10 +97,10 @@ P.icon_state = "[P.icon_base]_[dir]" P.tape_dir = dir cur = get_step_towards(cur,end) - //is_blocked_turf(var/turf/T) + //is_blocked_turf(turf/T) to_chat(usr, span_notice("You finish placing the [src].")) //Git Test -/obj/item/barrier_taperoll/afterattack(var/atom/A, var/mob/user, proximity) +/obj/item/barrier_taperoll/afterattack(atom/A, mob/user, proximity) if (proximity && istype(A, /obj/machinery/door/airlock)) var/turf/T = get_turf(A) var/obj/structure/barrier_tape/P = new tape_type(T.x,T.y,T.z) @@ -140,10 +140,10 @@ if(lifted == FALSE) to_chat(AM, span_warning("You are not supposed to go past [src]... (You can break the tape with something sharp or lift the tape with HELP intent)")) -/obj/structure/barrier_tape/attackby(var/obj/item/W, var/mob/user) +/obj/structure/barrier_tape/attackby(obj/item/W, mob/user) breaktape(W, user) -/obj/structure/barrier_tape/attack_hand(var/mob/user) +/obj/structure/barrier_tape/attack_hand(mob/user) if (user.a_intent == "help" ) user.visible_message(span_notice("[user] lifts [src], allowing passage.")) crumple() @@ -155,7 +155,7 @@ lifted = TRUE addtimer(VARSET_CALLBACK(src, lifted, FALSE), 2 SECONDS) -/obj/structure/barrier_tape/proc/breaktape(var/obj/item/W, var/mob/user) +/obj/structure/barrier_tape/proc/breaktape(obj/item/W, mob/user) if(user.a_intent == INTENT_HELP && W && !W.is_sharp() && allowed(user)) to_chat(user, span_warning("You can't break the [src] with that!")) return diff --git a/code/game/objects/items/bell.dm b/code/game/objects/items/bell.dm index 74cf74eaab95..7bb200f82249 100644 --- a/code/game/objects/items/bell.dm +++ b/code/game/objects/items/bell.dm @@ -17,7 +17,7 @@ var/agressive_sound = 'sound/items/bell_many.ogg' var/obj/item/assembly/assembly -/obj/item/deskbell/Initialize() +/obj/item/deskbell/Initialize(mapload) . = ..() if(ispath(assembly)) assembly = new assembly(src) diff --git a/code/game/objects/items/body_egg.dm b/code/game/objects/items/body_egg.dm index 65af596dbbcc..2e0362c87b13 100644 --- a/code/game/objects/items/body_egg.dm +++ b/code/game/objects/items/body_egg.dm @@ -15,14 +15,14 @@ src.Insert(loc) return ..() -/obj/item/organ/body_egg/Insert(var/mob/living/carbon/M, special = 0) +/obj/item/organ/body_egg/Insert(mob/living/carbon/M, special = 0) ..() ADD_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC) START_PROCESSING(SSobj, src) owner.med_hud_set_status() INVOKE_ASYNC(src, PROC_REF(AddInfectionImages), owner) -/obj/item/organ/body_egg/Remove(var/mob/living/carbon/M, special = 0) +/obj/item/organ/body_egg/Remove(mob/living/carbon/M, special = 0) STOP_PROCESSING(SSobj, src) if(owner) REMOVE_TRAIT(owner, TRAIT_XENO_HOST, TRAIT_GENERIC) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 0959f43b370c..eda41ee6e58b 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -45,7 +45,7 @@ w_class = WEIGHT_CLASS_SMALL item_flags = NO_MAT_REDEMPTION -/obj/item/bodybag/bluespace/Initialize() +/obj/item/bodybag/bluespace/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ATOM_CANREACH, PROC_REF(CanReachReact)) diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index c825b5ff1fe5..a4192a0ccc97 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -19,7 +19,7 @@ var/start_lit = FALSE var/candle_type = "red" -/obj/item/candle/Initialize() +/obj/item/candle/Initialize(mapload) . = ..() if(start_lit) light() diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm index d5ea2c1aa4cd..413d1520ef9c 100644 --- a/code/game/objects/items/cardboard_cutouts.dm +++ b/code/game/objects/items/cardboard_cutouts.dm @@ -10,7 +10,7 @@ var/pushed_over = FALSE // If the cutout is pushed over and has to be righted var/deceptive = FALSE // If the cutout actually appears as what it portray and not a discolored version -/obj/item/cardboard_cutout/Initialize() +/obj/item/cardboard_cutout/Initialize(mapload) . = ..() possible_appearances = sortList(list( "Assistant" = image(icon = src.icon, icon_state = "cutout_greytide"), diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index bc4c59f7d947..ef5817c0b0da 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -36,7 +36,7 @@ righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' var/detail_color = COLOR_ASSEMBLY_ORANGE -/obj/item/card/data/Initialize() +/obj/item/card/data/Initialize(mapload) .=..() update_icon() @@ -405,7 +405,7 @@ update_label("John Doe", "Clowny") var/anyone = FALSE //Can anyone forge the ID or just syndicate? var/forged = FALSE //have we set a custom name and job assignment, or will we use what we're given when we chameleon change? -/obj/item/card/id/syndicate/Initialize() +/obj/item/card/id/syndicate/Initialize(mapload) . = ..() var/datum/action/item_action/chameleon/change/chameleon_action = new(src) chameleon_action.syndicate = TRUE @@ -584,7 +584,7 @@ update_label("John Doe", "Clowny") originalassignment = "Captain" registered_age = null -/obj/item/card/id/captains_spare/Initialize() +/obj/item/card/id/captains_spare/Initialize(mapload) var/datum/job/captain/J = new/datum/job/captain access = J.get_access() . = ..() @@ -594,7 +594,7 @@ update_label("John Doe", "Clowny") desc = "A temporary ID for access to secure areas in the event of an emergency" resistance_flags = FLAMMABLE -/obj/item/card/id/captains_spare/temporary/Initialize() +/obj/item/card/id/captains_spare/temporary/Initialize(mapload) . = ..() access -= ACCESS_CHANGE_IDS access -= ACCESS_HEADS @@ -684,7 +684,7 @@ update_label("John Doe", "Clowny") -/obj/item/card/id/centcom/Initialize() +/obj/item/card/id/centcom/Initialize(mapload) access = get_all_centcom_access() . = ..() @@ -697,7 +697,7 @@ update_label("John Doe", "Clowny") originalassignment = "Emergency Response Team Commander" registered_age = null -/obj/item/card/id/ert/debug/Initialize() +/obj/item/card/id/ert/debug/Initialize(mapload) . = ..() access = get_debug_access() @@ -713,11 +713,11 @@ update_label("John Doe", "Clowny") assignment = "Occupying Officer" originalassignment = "Occupying Officer" -/obj/item/card/id/ert/occupying/Initialize() +/obj/item/card/id/ert/occupying/Initialize(mapload) access = list(ACCESS_SECURITY,ACCESS_BRIG,ACCESS_WEAPONS,ACCESS_SEC_DOORS,ACCESS_MAINT_TUNNELS)+get_ert_access("sec") . = ..() -/obj/item/card/id/ert/Initialize() +/obj/item/card/id/ert/Initialize(mapload) access = get_all_accesses()+get_ert_access("commander")-ACCESS_CHANGE_IDS . = ..() @@ -726,7 +726,7 @@ update_label("John Doe", "Clowny") assignment = "Security Response Officer" originalassignment = "Security Response Officer" -/obj/item/card/id/ert/Security/Initialize() +/obj/item/card/id/ert/Security/Initialize(mapload) access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS . = ..() @@ -735,7 +735,7 @@ update_label("John Doe", "Clowny") assignment = "Engineer Response Officer" originalassignment = "Engineer Response Officer" -/obj/item/card/id/ert/Engineer/Initialize() +/obj/item/card/id/ert/Engineer/Initialize(mapload) access = get_all_accesses()+get_ert_access("eng")-ACCESS_CHANGE_IDS . = ..() @@ -744,7 +744,7 @@ update_label("John Doe", "Clowny") assignment = "Medical Response Officer" originalassignment = "Medical Response Officer" -/obj/item/card/id/ert/Medical/Initialize() +/obj/item/card/id/ert/Medical/Initialize(mapload) access = get_all_accesses()+get_ert_access("med")-ACCESS_CHANGE_IDS . = ..() @@ -753,7 +753,7 @@ update_label("John Doe", "Clowny") assignment = "Religious Response Officer" originalassignment = "Religious Response Officer" -/obj/item/card/id/ert/chaplain/Initialize() +/obj/item/card/id/ert/chaplain/Initialize(mapload) access = get_all_accesses()+get_ert_access("sec")-ACCESS_CHANGE_IDS . = ..() @@ -762,7 +762,7 @@ update_label("John Doe", "Clowny") assignment = "Janitorial Response Officer" originalassignment = "Janitorial Response Officer" -/obj/item/card/id/ert/Janitor/Initialize() +/obj/item/card/id/ert/Janitor/Initialize(mapload) access = get_all_accesses() . = ..() @@ -771,7 +771,7 @@ update_label("John Doe", "Clowny") assignment = "Clown ERT" originalassignment = "Clown ERT" -/obj/item/card/id/ert/clown/Initialize() +/obj/item/card/id/ert/clown/Initialize(mapload) access = get_all_accesses() . = ..() @@ -880,7 +880,7 @@ update_label("John Doe", "Clowny") var/department_name = ACCOUNT_CIV_NAME registered_age = null -/obj/item/card/id/departmental_budget/Initialize() +/obj/item/card/id/departmental_budget/Initialize(mapload) . = ..() var/datum/bank_account/B = SSeconomy.get_dep_account(department_ID) if(B) diff --git a/code/game/objects/items/charter.dm b/code/game/objects/items/charter.dm index 7d51be81b824..30147afb1f87 100644 --- a/code/game/objects/items/charter.dm +++ b/code/game/objects/items/charter.dm @@ -17,7 +17,7 @@ var/static/regex/standard_station_regex var/datum/callback/rename_callback // Yogs -- We actually keep track of this in order to be able to manually call this callback if an admin choses to do so. -/obj/item/station_charter/Initialize() +/obj/item/station_charter/Initialize(mapload) . = ..() if(!standard_station_regex) var/prefixes = jointext(GLOB.station_prefixes, "|") diff --git a/code/game/objects/items/chrono_eraser.dm b/code/game/objects/items/chrono_eraser.dm index e147bed5514e..6a966ba8fb84 100644 --- a/code/game/objects/items/chrono_eraser.dm +++ b/code/game/objects/items/chrono_eraser.dm @@ -56,7 +56,7 @@ var/obj/structure/chrono_field/field = null var/turf/startpos = null -/obj/item/gun/energy/chrono_gun/Initialize() +/obj/item/gun/energy/chrono_gun/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHRONO_GUN_TRAIT) if(istype(loc, /obj/item/chrono_eraser)) @@ -127,7 +127,7 @@ nodamage = TRUE var/obj/item/gun/energy/chrono_gun/gun = null -/obj/item/projectile/energy/chrono_beam/Initialize() +/obj/item/projectile/energy/chrono_beam/Initialize(mapload) . = ..() var/obj/item/ammo_casing/energy/chrono_beam/C = loc if(istype(C)) @@ -150,7 +150,7 @@ e_cost = 0 var/obj/item/gun/energy/chrono_gun/gun -/obj/item/ammo_casing/energy/chrono_beam/Initialize() +/obj/item/ammo_casing/energy/chrono_beam/Initialize(mapload) if(istype(loc)) gun = loc . = ..() diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 4a31bb419a82..49b113d4b35e 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -104,7 +104,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM smoketime = 40 grind_results = list(/datum/reagent/carbon = 2) -/obj/item/match/firebrand/Initialize() +/obj/item/match/firebrand/Initialize(mapload) . = ..() matchignite() @@ -137,7 +137,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM user.visible_message(span_suicide("[user] is huffing [src] as quickly as [user.p_they()] can! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer.")) return (TOXLOSS|OXYLOSS) -/obj/item/clothing/mask/cigarette/Initialize() +/obj/item/clothing/mask/cigarette/Initialize(mapload) . = ..() create_reagents(chem_volume, INJECTABLE | NO_REACT) if(list_reagents) @@ -360,7 +360,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM chem_volume = 50 list_reagents = null -/obj/item/clothing/mask/cigarette/rollie/Initialize() +/obj/item/clothing/mask/cigarette/rollie/Initialize(mapload) . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) @@ -383,7 +383,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM desc = "A manky old roach, or for non-stoners, a used rollup." icon_state = "roach" -/obj/item/cigbutt/roach/Initialize() +/obj/item/cigbutt/roach/Initialize(mapload) . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) @@ -454,7 +454,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM list_reagents = null var/packeditem = 0 -/obj/item/clothing/mask/cigarette/pipe/Initialize() +/obj/item/clothing/mask/cigarette/pipe/Initialize(mapload) . = ..() name = "empty [initial(name)]" @@ -567,7 +567,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM light_color = LIGHT_COLOR_FIRE grind_results = list(/datum/reagent/iron = 1, /datum/reagent/fuel = 5, /datum/reagent/oil = 5) -/obj/item/lighter/Initialize() +/obj/item/lighter/Initialize(mapload) . = ..() if(!overlay_state) overlay_state = pick(overlay_list) @@ -715,7 +715,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM COLOR_ASSEMBLY_PURPLE ) -/obj/item/lighter/greyscale/Initialize() +/obj/item/lighter/greyscale/Initialize(mapload) . = ..() if(!lighter_color) lighter_color = pick(color_list) @@ -969,6 +969,6 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(reagents && reagents.total_volume) hand_reagents() -/obj/item/clothing/mask/cigarette/lit/Initialize() +/obj/item/clothing/mask/cigarette/lit/Initialize(mapload) . = ..() light() // These cigarettes start lit. diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 6015a66b7722..b8ad9044010f 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -245,7 +245,7 @@ var/challenge = FALSE var/moved = FALSE -/obj/item/circuitboard/computer/syndicate_shuttle/Initialize() +/obj/item/circuitboard/computer/syndicate_shuttle/Initialize(mapload) . = ..() GLOB.syndicate_shuttle_boards += src diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 727281f9c3c5..4b17858148c5 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -176,7 +176,7 @@ #define PATH_POWERCOIL /obj/machinery/power/tesla_coil/power #define PATH_RPCOIL /obj/machinery/power/tesla_coil/research -/obj/item/circuitboard/machine/tesla_coil/Initialize() +/obj/item/circuitboard/machine/tesla_coil/Initialize(mapload) . = ..() if(build_path) build_path = PATH_POWERCOIL @@ -375,7 +375,7 @@ #define PATH_FREEZER /obj/machinery/atmospherics/components/unary/thermomachine/freezer #define PATH_HEATER /obj/machinery/atmospherics/components/unary/thermomachine/heater -/obj/item/circuitboard/machine/thermomachine/Initialize() +/obj/item/circuitboard/machine/thermomachine/Initialize(mapload) . = ..() if(!build_path) if(prob(50)) diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 13a8aaef3264..db9f88b54758 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -28,7 +28,7 @@ force_string = "robust... against germs" var/uses = 100 -/obj/item/soap/Initialize() +/obj/item/soap/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80) @@ -170,7 +170,7 @@ T.update_icon() qdel(src) -/obj/item/bikehorn/Initialize() +/obj/item/bikehorn/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) @@ -189,7 +189,7 @@ desc = "Damn son, where'd you find this?" icon_state = "air_horn" -/obj/item/bikehorn/airhorn/Initialize() +/obj/item/bikehorn/airhorn/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/airhorn2.ogg'=1), 50) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index e86a99907e2f..0cd562b04a8f 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -15,7 +15,7 @@ var/list/region_access = list(1) //See access.dm var/list/access_list -/obj/item/door_remote/Initialize() +/obj/item/door_remote/Initialize(mapload) . = ..() for(var/i in region_access) access_list += get_region_accesses(i) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 5abcc9e2a30d..afefb10b3efa 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -25,7 +25,7 @@ name = "lipstick" icon_state = "random_lipstick" -/obj/item/lipstick/random/Initialize() +/obj/item/lipstick/random/Initialize(mapload) . = ..() icon_state = "lipstick" colour = pick("red","purple","lime","black","green","blue","white") diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index ec83f4c08b7d..0cc21547a31f 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -95,7 +95,7 @@ paint_color = rgb(read[1], read[2], read[3]) -/obj/item/toy/crayon/Initialize() +/obj/item/toy/crayon/Initialize(mapload) . = ..() // Makes crayons identifiable in things like grinders if(name == "crayon") @@ -534,7 +534,7 @@ icon_state = "crayonbox" w_class = WEIGHT_CLASS_SMALL -/obj/item/storage/crayons/Initialize() +/obj/item/storage/crayons/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -627,7 +627,7 @@ return (OXYLOSS) -/obj/item/toy/crayon/spraycan/Initialize() +/obj/item/toy/crayon/spraycan/Initialize(mapload) . = ..() // If default crayon red colour, pick a more fun spraycan colour if(!paint_color) diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 0e23dd8c6b00..46ffad89b726 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -27,13 +27,13 @@ /obj/item/defibrillator/get_cell() return cell -/obj/item/defibrillator/Initialize() //starts without a cell for rnd +/obj/item/defibrillator/Initialize(mapload) //starts without a cell for rnd . = ..() paddles = make_paddles() update_icon() return -/obj/item/defibrillator/loaded/Initialize() //starts with hicap +/obj/item/defibrillator/loaded/Initialize(mapload) //starts with hicap . = ..() paddles = make_paddles() cell = new(src) @@ -259,7 +259,7 @@ if(slot == user.getBeltSlot()) return TRUE -/obj/item/defibrillator/compact/loaded/Initialize() +/obj/item/defibrillator/compact/loaded/Initialize(mapload) . = ..() paddles = make_paddles() cell = new(src) @@ -271,7 +271,7 @@ combat = TRUE safety = FALSE -/obj/item/defibrillator/compact/combat/loaded/Initialize() +/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload) . = ..() paddles = make_paddles() cell = new /obj/item/stock_parts/cell/infinite(src) @@ -342,7 +342,7 @@ visible_message(span_notice("[src] snap back into [defib].")) snap_back() -/obj/item/twohanded/shockpaddles/proc/recharge(var/time) +/obj/item/twohanded/shockpaddles/proc/recharge(time) if(req_defib || !time) return cooldown = TRUE diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 512fced644ff..33f9eeb9899e 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(inserted_item && (!isturf(loc))) . += span_notice("Ctrl-click to remove [inserted_item].") -/obj/item/pda/Initialize() +/obj/item/pda/Initialize(mapload) . = ..() GLOB.PDAs += src diff --git a/code/game/objects/items/devices/PDA/PDA_types.dm b/code/game/objects/items/devices/PDA/PDA_types.dm index 2070a3f72993..59f2a180b750 100644 --- a/code/game/objects/items/devices/PDA/PDA_types.dm +++ b/code/game/objects/items/devices/PDA/PDA_types.dm @@ -7,7 +7,7 @@ desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." ttone = "honk" -/obj/item/pda/clown/Initialize() +/obj/item/pda/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING, CALLBACK(src, PROC_REF(AfterSlip))) @@ -31,7 +31,7 @@ /obj/item/pda/ai/pai ttone = "assist" -/obj/item/pda/ai/Initialize() +/obj/item/pda/ai/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate)) @@ -121,7 +121,7 @@ insert_type = /obj/item/pen/fountain/captain icon_state = "pda-captain" -/obj/item/pda/captain/Initialize() +/obj/item/pda/captain/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate)) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index bb43536e1211..025c0bcd1640 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -119,7 +119,7 @@ icon_state = "cart-tox" access = CART_REAGENT_SCANNER | CART_ATMOS -/obj/item/cartridge/signal/Initialize() +/obj/item/cartridge/signal/Initialize(mapload) . = ..() radio = new(src) @@ -168,7 +168,7 @@ access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_REAGENT_SCANNER | CART_ATMOS | CART_DRONEPHONE bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT -/obj/item/cartridge/rd/Initialize() +/obj/item/cartridge/rd/Initialize(mapload) . = ..() radio = new(src) @@ -180,7 +180,7 @@ bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT | FIRE_BOT spam_enabled = 1 -/obj/item/cartridge/captain/Initialize() +/obj/item/cartridge/captain/Initialize(mapload) . = ..() radio = new(src) diff --git a/code/game/objects/items/devices/PDA/radio.dm b/code/game/objects/items/devices/PDA/radio.dm index 329631ff9e07..39d1a7b5223f 100644 --- a/code/game/objects/items/devices/PDA/radio.dm +++ b/code/game/objects/items/devices/PDA/radio.dm @@ -15,7 +15,7 @@ radio_connection = null return ..() -/obj/item/integrated_signaler/Initialize() +/obj/item/integrated_signaler/Initialize(mapload) . = ..() if (frequency < MIN_FREE_FREQ || frequency > MAX_FREE_FREQ) frequency = sanitize_frequency(frequency) diff --git a/code/game/objects/items/devices/beacon.dm b/code/game/objects/items/devices/beacon.dm index dc3a976085d1..dc10e2ab7f03 100644 --- a/code/game/objects/items/devices/beacon.dm +++ b/code/game/objects/items/devices/beacon.dm @@ -9,7 +9,7 @@ var/enabled = TRUE var/renamed = FALSE -/obj/item/beacon/Initialize() +/obj/item/beacon/Initialize(mapload) . = ..() if (enabled) GLOB.teleportbeacons += src diff --git a/code/game/objects/items/devices/busterarm/_buster.dm b/code/game/objects/items/devices/busterarm/_buster.dm index dd8104f5af4f..b828191fbb05 100644 --- a/code/game/objects/items/devices/busterarm/_buster.dm +++ b/code/game/objects/items/devices/busterarm/_buster.dm @@ -38,7 +38,7 @@ lefthand_file = 'icons/mob/inhands/misc/touchspell_lefthand.dmi' righthand_file = 'icons/mob/inhands/misc/touchspell_righthand.dmi' -/obj/item/buster/Initialize(mob/living/user) +/obj/item/buster/Initialize(mapload, mob/living/user) . = ..() ADD_TRAIT(src, HAND_REPLACEMENT_TRAIT, NOBLUDGEON) diff --git a/code/game/objects/items/devices/busterarm/megabuster.dm b/code/game/objects/items/devices/busterarm/megabuster.dm index 2214244baa78..f57ff35dc506 100644 --- a/code/game/objects/items/devices/busterarm/megabuster.dm +++ b/code/game/objects/items/devices/busterarm/megabuster.dm @@ -82,7 +82,7 @@ . = span_rose("With a single snap, [user] sets [A] alight with sparks from [user.p_their()] metal fingers.") /// Only lasts 5 seconds, fades out -/obj/item/buster/megabuster/Initialize(mob/living/user) +/obj/item/buster/megabuster/Initialize(mapload, mob/living/user) . = ..() animate(src, alpha = 50, time = 5 SECONDS) QDEL_IN(src, 5 SECONDS) diff --git a/code/game/objects/items/devices/busterarm/wire_snatch.dm b/code/game/objects/items/devices/busterarm/wire_snatch.dm index 2aa9fdd7e0ca..8b7e22070713 100644 --- a/code/game/objects/items/devices/busterarm/wire_snatch.dm +++ b/code/game/objects/items/devices/busterarm/wire_snatch.dm @@ -78,7 +78,7 @@ force = 0 can_charge = FALSE -/obj/item/gun/magic/wire/Initialize() +/obj/item/gun/magic/wire/Initialize(mapload) . = ..() ADD_TRAIT(src, HAND_REPLACEMENT_TRAIT, NOBLUDGEON) if(ismob(loc)) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index e4cb9ff9a795..1c0a82d2d5c1 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -296,7 +296,7 @@ break src.updateSelfDialog() -/obj/item/camera_bug/proc/same_z_level(var/obj/machinery/camera/C) +/obj/item/camera_bug/proc/same_z_level(obj/machinery/camera/C) var/turf/T_cam = get_turf(C) var/turf/T_bug = get_turf(loc) if(!T_bug || T_cam.z != T_bug.z) diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm index 3d7cd34ecad0..a9246f646ac6 100644 --- a/code/game/objects/items/devices/chameleonproj.dm +++ b/code/game/objects/items/devices/chameleonproj.dm @@ -16,7 +16,7 @@ var/obj/effect/dummy/chameleon/active_dummy = null var/saved_appearance = null -/obj/item/chameleon/Initialize() +/obj/item/chameleon/Initialize(mapload) . = ..() var/obj/item/cigbutt/butt = /obj/item/cigbutt saved_appearance = initial(butt.appearance) diff --git a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm index 856de73467cd..05f4c635317f 100644 --- a/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm +++ b/code/game/objects/items/devices/electroadaptive_pseudocircuit.dm @@ -11,7 +11,7 @@ var/static/recycleable_circuits = typecacheof(list(/obj/item/electronics/firelock, /obj/item/electronics/airalarm, /obj/item/electronics/firealarm, \ /obj/item/electronics/apc, /obj/item/electronics/advanced_airlock_controller))//A typecache of circuits consumable for material -/obj/item/electroadaptive_pseudocircuit/Initialize() +/obj/item/electroadaptive_pseudocircuit/Initialize(mapload) . = ..() maptext = "[circuits]" diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index aa0c9ff0329a..071cb91eec1f 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -18,7 +18,7 @@ light_on = FALSE var/on = FALSE -/obj/item/flashlight/Initialize() +/obj/item/flashlight/Initialize(mapload) . = ..() if(icon_state == "[initial(icon_state)]-on") on = TRUE @@ -285,7 +285,7 @@ light_color = LIGHT_COLOR_FLARE grind_results = list(/datum/reagent/sulphur = 15) -/obj/item/flashlight/flare/Initialize() +/obj/item/flashlight/flare/Initialize(mapload) . = ..() fuel = rand(frng_min, frng_max) @@ -502,7 +502,7 @@ grind_results = list(/datum/reagent/phenol = 15, /datum/reagent/hydrogen = 10, /datum/reagent/oxygen = 5) //Meth-in-a-stick var/fuel = 0 -/obj/item/flashlight/glowstick/Initialize() +/obj/item/flashlight/glowstick/Initialize(mapload) fuel = rand(1600, 2000) light_color = color @@ -594,7 +594,7 @@ icon = 'icons/obj/lighting.dmi' icon_state = "random_glowstick" -/obj/effect/spawner/lootdrop/glowstick/Initialize() +/obj/effect/spawner/lootdrop/glowstick/Initialize(mapload) loot = typesof(/obj/item/flashlight/glowstick) . = ..() diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index d8c9b7349f63..11a22a8d7bc9 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -27,7 +27,7 @@ var/fail_to_receive = 0 var/current_warning = 1 -/obj/item/geiger_counter/Initialize() +/obj/item/geiger_counter/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index d189228d6fa1..a8ac96060921 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(GPS_list) . = ..() . += span_notice("Alt-click to switch it [tracking ? "off":"on"].") -/obj/item/gps/Initialize() +/obj/item/gps/Initialize(mapload) . = ..() GLOB.GPS_list += src name = "global positioning system ([gpstag])" @@ -155,7 +155,7 @@ GLOBAL_LIST_EMPTY(GPS_list) gpstag = "BORG0" desc = "A mining cyborg internal positioning system. Used as a recovery beacon for damaged cyborg assets, or a collaboration tool for mining teams." -/obj/item/gps/cyborg/Initialize() +/obj/item/gps/cyborg/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT) @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(GPS_list) for marking the area around the transition edges." var/list/turf/tagged -/obj/item/gps/visible_debug/Initialize() +/obj/item/gps/visible_debug/Initialize(mapload) . = ..() tagged = list() START_PROCESSING(SSfastprocess, src) @@ -227,7 +227,7 @@ GLOBAL_LIST_EMPTY(GPS_list) * Arguments: * * ship_name - The name that of the ship that we're pretending to be, defaults to "Jolly Robuster" */ -/obj/item/gps/pirate/Initialize(ship_name = "Jolly Robuster") +/obj/item/gps/pirate/Initialize(mapload, ship_name = "Jolly Robuster") .=..() if(ship_name) name = ship_name diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 3b98c2844eff..ef0512baa9d6 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -28,13 +28,13 @@ /obj/item/laser_pointer/purple pointer_icon_state = "purple_laser" -/obj/item/laser_pointer/Initialize() +/obj/item/laser_pointer/Initialize(mapload) . = ..() diode = new(src) if(!pointer_icon_state) pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser") -/obj/item/laser_pointer/upgraded/Initialize() +/obj/item/laser_pointer/upgraded/Initialize(mapload) . = ..() diode = new /obj/item/stock_parts/micro_laser/ultra diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 873b1d3673c6..69a308e2dabf 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -178,7 +178,7 @@ playsound(src.loc, 'sound/machines/ding.ogg', 50, 1) return new_bulbs -/obj/item/lightreplacer/proc/Charge(var/mob/user) +/obj/item/lightreplacer/proc/Charge(mob/user) charge += 1 if(charge > 3) AddUses(1) diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm index df59ccc59e3d..2a101fbef0bb 100644 --- a/code/game/objects/items/devices/megaphone.dm +++ b/code/game/objects/items/devices/megaphone.dm @@ -22,7 +22,7 @@ user.say("AAAAAAAAAAAARGHHHHH", forced="megaphone suicide")//he must have died while coding this return OXYLOSS -/obj/item/megaphone/Initialize() +/obj/item/megaphone/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index d5c56bb11dfd..a7c9cc6c68da 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -52,7 +52,7 @@ var/hud_on = FALSE var/mob/camera/aiEye/remote/ai_detector/eye -/obj/item/multitool/ai_detect/Initialize() +/obj/item/multitool/ai_detect/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) eye = new /mob/camera/aiEye/remote/ai_detector() diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 3e7136da6c92..f57115c6670b 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -15,7 +15,7 @@ user.visible_message(span_suicide("[user] is staring sadly at [src]! [user.p_they()] can't keep living without real human intimacy!")) return OXYLOSS -/obj/item/paicard/Initialize() +/obj/item/paicard/Initialize(mapload) SSpai.paicard_list += src add_overlay("pai-off") return ..() diff --git a/code/game/objects/items/devices/pressureplates.dm b/code/game/objects/items/devices/pressureplates.dm index 427816994bc5..516b1d299030 100644 --- a/code/game/objects/items/devices/pressureplates.dm +++ b/code/game/objects/items/devices/pressureplates.dm @@ -24,7 +24,7 @@ var/trigger_delay = 10 var/protected = FALSE -/obj/item/pressure_plate/Initialize() +/obj/item/pressure_plate/Initialize(mapload) . = ..() tile_overlay = image(icon = 'icons/turf/floors.dmi', icon_state = "pp_overlay") if(roundstart_signaller) diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 308ceb163139..4c498732cc32 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -15,7 +15,7 @@ var/frequency = FREQ_ELECTROPACK var/shock_cooldown = FALSE -/obj/item/electropack/Initialize() +/obj/item/electropack/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 3f5495ff24fc..bd43da8ef7e8 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -9,7 +9,7 @@ var/independent = FALSE var/list/channels = list() -/obj/item/encryptionkey/Initialize() +/obj/item/encryptionkey/Initialize(mapload) . = ..() if(!channels.len) desc = "An encryption key for a radio headset. Has no special codes in it. You should probably tell a coder!" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 0db4d9680ea2..6c4bf27335cd 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -14,7 +14,7 @@ user.visible_message(span_suicide("[user] begins putting \the [src]'s antenna up [user.p_their()] nose! It looks like [user.p_theyre()] trying to give [user.p_them()]self cancer!")) return TOXLOSS -/obj/item/radio/headset/Initialize() +/obj/item/radio/headset/Initialize(mapload) . = ..() recalculateChannels() @@ -44,7 +44,7 @@ icon_state = "syndie_headset" item_state = "syndie_headset" -/obj/item/radio/headset/syndicate/alt/Initialize() +/obj/item/radio/headset/syndicate/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -52,12 +52,12 @@ name = "team leader headset" command = TRUE -/obj/item/radio/headset/syndicate/Initialize() +/obj/item/radio/headset/syndicate/Initialize(mapload) . = ..() make_syndie() /obj/item/radio/headset/binary -/obj/item/radio/headset/binary/Initialize() +/obj/item/radio/headset/binary/Initialize(mapload) . = ..() qdel(keyslot) keyslot = new /obj/item/encryptionkey/binary @@ -75,7 +75,7 @@ icon_state = "sec_headset_alt" item_state = "sec_headset_alt" -/obj/item/radio/headset/headset_sec/alt/Initialize() +/obj/item/radio/headset/headset_sec/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -142,7 +142,7 @@ icon_state = "com_headset_alt" item_state = "com_headset_alt" -/obj/item/radio/headset/heads/captain/alt/Initialize() +/obj/item/radio/headset/heads/captain/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -164,7 +164,7 @@ icon_state = "com_headset_alt" item_state = "com_headset_alt" -/obj/item/radio/headset/heads/hos/Initialize() +/obj/item/radio/headset/heads/hos/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -224,7 +224,7 @@ icon_state = "cent_headset_alt" item_state = "cent_headset_alt" -/obj/item/radio/headset/headset_cent/bowman/Initialize() +/obj/item/radio/headset/headset_cent/bowman/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -235,7 +235,7 @@ item_state = "cent_headset_alt" keyslot = new /obj/item/encryptionkey/heads/captain -/obj/item/radio/headset/headset_cent/alt/Initialize() +/obj/item/radio/headset/headset_cent/alt/Initialize(mapload) . = ..() AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 35c885483634..b3bdfce7c6d2 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( QDEL_NULL(keyslot2) return ..() -/obj/item/radio/Initialize() +/obj/item/radio/Initialize(mapload) wires = new /datum/wires/radio(src) if(prison_radio) wires.cut(WIRE_TX) // OH GOD WHY @@ -469,7 +469,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( syndie = 1 keyslot = new /obj/item/encryptionkey/syndicate -/obj/item/radio/borg/syndicate/Initialize() +/obj/item/radio/borg/syndicate/Initialize(mapload) . = ..() set_frequency(FREQ_SYNDICATE) diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 3193a40e42b2..30075a439631 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -22,7 +22,7 @@ var/datum/looping_sound/reverse_bear_trap/soundloop var/datum/looping_sound/reverse_bear_trap_beep/soundloop2 -/obj/item/reverse_bear_trap/Initialize() +/obj/item/reverse_bear_trap/Initialize(mapload) . = ..() soundloop = new(list(src)) soundloop2 = new(list(src)) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c02fee4f23fe..9101341c7efb 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -496,7 +496,7 @@ GENE SCANNER return TRUE return -/obj/item/healthanalyzer/advanced/debug/Initialize() +/obj/item/healthanalyzer/advanced/debug/Initialize(mapload) . = ..() advanced_surgeries = subtypesof(/datum/surgery) diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 0feefa1488bd..fdd1b6386b1d 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -326,6 +326,6 @@ /obj/item/tape/random icon_state = "random_tape" -/obj/item/tape/random/Initialize() +/obj/item/tape/random/Initialize(mapload) . = ..() icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]" diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index 3e4da171f927..1274c8f6efe1 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/dice.dmi' icon_state = "dicebag" -/obj/item/storage/pill_bottle/dice/Initialize() +/obj/item/storage/pill_bottle/dice/Initialize(mapload) . = ..() var/special_die = pick("1","2","fudge","space","00","8bd20","4dd6","100") if(special_die == "1") @@ -48,7 +48,7 @@ var/rigged = DICE_NOT_RIGGED var/rigged_value -/obj/item/dice/Initialize() +/obj/item/dice/Initialize(mapload) . = ..() if(!result) result = roll(sides) @@ -93,7 +93,7 @@ desc = "A die with six sides. 6 TIMES 255 TIMES 255 TILE TOTAL EXISTENCE, SQUARE YOUR MIND OF EDUCATED STUPID: 2 DOES NOT EXIST." icon_state = "spaced6" -/obj/item/dice/d6/space/Initialize() +/obj/item/dice/d6/space/Initialize(mapload) . = ..() if(prob(10)) name = "spess cube" diff --git a/code/game/objects/items/discoball.dm b/code/game/objects/items/discoball.dm index 704e21c1c760..89050035ff53 100644 --- a/code/game/objects/items/discoball.dm +++ b/code/game/objects/items/discoball.dm @@ -26,7 +26,7 @@ var/list/spotlights = list() var/list/sparkles = list() -/obj/structure/discoball/Initialize() +/obj/structure/discoball/Initialize(mapload) . = ..() update_icon() @@ -98,7 +98,8 @@ /obj/structure/discoball/proc/dance_setup() var/turf/cen = get_turf(src) - FOR_DVIEW(var/turf/t, 3, get_turf(src),INVISIBILITY_LIGHTING) + var/turf/t + FOR_DVIEW(t, 3, get_turf(src),INVISIBILITY_LIGHTING) if(t.x == cen.x && t.y > cen.y) spotlights += new /obj/item/flashlight/spotlight(t, 1 + get_dist(src, t), 30 - (get_dist(src, t) * 8), LIGHT_COLOR_RED) continue diff --git a/code/game/objects/items/etherealdiscoball.dm b/code/game/objects/items/etherealdiscoball.dm index a1bf40b1dbac..a2bff00767c0 100644 --- a/code/game/objects/items/etherealdiscoball.dm +++ b/code/game/objects/items/etherealdiscoball.dm @@ -23,7 +23,7 @@ var/range = 7 var/power = 3 -/obj/structure/etherealball/Initialize() +/obj/structure/etherealball/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 0605fc08be52..b250b66bfaf1 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -45,7 +45,7 @@ create_reagents(max_water, AMOUNT_VISIBLE) reagents.add_reagent(chem, max_water) -/obj/item/extinguisher/Initialize() +/obj/item/extinguisher/Initialize(mapload) . = ..() refill() @@ -182,7 +182,7 @@ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, water_particles), 2) //Particle movement loop -/obj/item/extinguisher/proc/move_particles(var/list/particles, var/repetition=0) +/obj/item/extinguisher/proc/move_particles(list/particles, repetition=0) //Check if there's anything in here first if(!particles || particles.len == 0) return @@ -204,7 +204,7 @@ addtimer(CALLBACK(src, /obj/item/extinguisher/proc/move_particles, particles, repetition), 2) //Chair movement loop -/obj/item/extinguisher/proc/move_chair(var/obj/B, var/movementdirection, var/repetition=0) +/obj/item/extinguisher/proc/move_chair(obj/B, movementdirection, repetition=0) step(B, movementdirection) var/timer_seconds @@ -226,7 +226,7 @@ return EmptyExtinguisher(user) -/obj/item/extinguisher/proc/EmptyExtinguisher(var/mob/user) +/obj/item/extinguisher/proc/EmptyExtinguisher(mob/user) if(loc == user && reagents.total_volume) reagents.clear_reagents() diff --git a/code/game/objects/items/gems.dm b/code/game/objects/items/gems.dm index 45ccd9258232..f524bd10a21f 100644 --- a/code/game/objects/items/gems.dm +++ b/code/game/objects/items/gems.dm @@ -20,7 +20,7 @@ var/image/shine_overlay //shows this overlay when not claimed -/obj/item/gem/Initialize() +/obj/item/gem/Initialize(mapload) . = ..() shine_overlay = image(icon = 'icons/obj/gems.dmi',icon_state = "shine") add_overlay(shine_overlay) @@ -111,7 +111,7 @@ var/obj/item/gps/internal //stolen from the world anvil -/obj/item/gem/purple/Initialize() +/obj/item/gem/purple/Initialize(mapload) . = ..() internal = new /obj/item/gps/internal/purple(src) @@ -159,7 +159,7 @@ light_color = "#380a41" w_class = WEIGHT_CLASS_NORMAL -/obj/item/gem/dark/Initialize() +/obj/item/gem/dark/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE) @@ -168,7 +168,7 @@ icon_state = "ruby" var/gem_list = list(/obj/item/gem/ruby, /obj/item/gem/sapphire, /obj/item/gem/emerald, /obj/item/gem/topaz) -/obj/item/gem/random/Initialize(quantity) +/obj/item/gem/random/Initialize(mapload, quantity) . = ..() var/q = quantity ? quantity : 1 for(var/i = 0, i < q, i++) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index b92353ae8b93..e0829718f32d 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) var/obj/item/contains_type -/obj/item/a_gift/Initialize() +/obj/item/a_gift/Initialize(mapload) . = ..() pixel_x = rand(-10,10) pixel_y = rand(-10,10) diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 0d133ecee6be..431764e315c0 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -16,7 +16,7 @@ var/casedesc = "This basic model accepts both beakers and bottles. It heats contents by 10°K upon ignition." // Appears when examining empty casings. var/obj/item/assembly/prox_sensor/landminemode = null -/obj/item/grenade/chem_grenade/Initialize() +/obj/item/grenade/chem_grenade/Initialize(mapload) . = ..() create_reagents(1000) stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY. @@ -318,7 +318,7 @@ desc = "Used for emergency sealing of hull breaches." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/metalfoam/Initialize() +/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -335,7 +335,7 @@ desc = "the best grenade to irridiate the fuck out of someone" stage = GRENADE_READY -/obj/item/grenade/chem_grenade/radiation/Initialize() +/obj/item/grenade/chem_grenade/radiation/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -354,7 +354,7 @@ desc = "Used for emergency sealing of hull breaches, while keeping areas accessible." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize() +/obj/item/grenade/chem_grenade/smart_metal_foam/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -372,7 +372,7 @@ desc = "Used for clearing rooms of living things." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/incendiary/Initialize() +/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -390,7 +390,7 @@ desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/antiweed/Initialize() +/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -409,7 +409,7 @@ desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/cleaner/Initialize() +/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -427,7 +427,7 @@ desc = "Waffle Co.-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/ez_clean/Initialize() +/obj/item/grenade/chem_grenade/ez_clean/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -446,7 +446,7 @@ desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/teargas/Initialize() +/obj/item/grenade/chem_grenade/teargas/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -465,7 +465,7 @@ desc = "Used for melting armoured opponents." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/facid/Initialize() +/obj/item/grenade/chem_grenade/facid/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -485,7 +485,7 @@ desc = "Used for wide scale painting projects." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/colorful/Initialize() +/obj/item/grenade/chem_grenade/colorful/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -504,7 +504,7 @@ stage = GRENADE_READY var/glitter_type = /datum/reagent/glitter -/obj/item/grenade/chem_grenade/glitter/Initialize() +/obj/item/grenade/chem_grenade/glitter/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/B2 = new(src) @@ -537,7 +537,7 @@ desc = "BURN!-brand foaming clf3. In a special applicator for rapid purging of wide areas." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/clf3/Initialize() +/obj/item/grenade/chem_grenade/clf3/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -555,7 +555,7 @@ desc = "Tiger Cooperative chemical foam grenade. Causes temporary irritation, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize() +/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -575,7 +575,7 @@ desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE." stage = GRENADE_READY -/obj/item/grenade/chem_grenade/tuberculosis/Initialize() +/obj/item/grenade/chem_grenade/tuberculosis/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src) @@ -595,7 +595,7 @@ icon_state = "holy_grenade" stage = GRENADE_READY -/obj/item/grenade/chem_grenade/holy/Initialize() +/obj/item/grenade/chem_grenade/holy/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) @@ -612,7 +612,7 @@ icon_state = "holy_grenade" stage = GRENADE_READY -/obj/item/grenade/chem_grenade/holywater/Initialize() +/obj/item/grenade/chem_grenade/holywater/Initialize(mapload) . = ..() var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src) var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src) diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 15301565cf46..9d14187791b5 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -173,14 +173,14 @@ /obj/item/grenade/clusterbuster/random icon_state = "random_clusterbang" -/obj/item/grenade/clusterbuster/random/Initialize() +/obj/item/grenade/clusterbuster/random/Initialize(mapload) ..() var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster)) new real_type(loc) return INITIALIZE_HINT_QDEL // syndie subtype so syndies dont get something utterly useless -/obj/item/grenade/clusterbuster/random/syndie/Initialize() +/obj/item/grenade/clusterbuster/random/syndie/Initialize(mapload) ..() var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster/syndie)) new real_type(loc) diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index b2801388d3fe..ae557937014a 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -19,7 +19,7 @@ var/range = 3 var/list/times -/obj/item/grenade/iedcasing/Initialize() +/obj/item/grenade/iedcasing/Initialize(mapload) . = ..() add_overlay("improvised_grenade_filled") add_overlay("improvised_grenade_wired") @@ -74,7 +74,7 @@ var/armed = 0 display_timer = 0 -/obj/item/grenade/pipebomb/Initialize() +/obj/item/grenade/pipebomb/Initialize(mapload) . = ..() /obj/item/grenade/pipebomb/attack_self(mob/user) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 2f7319312fd9..9fd496e03565 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -21,7 +21,7 @@ var/full_damage_on_mobs = FALSE var/alert_admins = TRUE -/obj/item/grenade/plastic/Initialize() +/obj/item/grenade/plastic/Initialize(mapload) . = ..() plastic_overlay = mutable_appearance(icon, "[item_state]2", HIGH_OBJ_LAYER) AddComponent(/datum/component/empprotection, EMP_PROTECT_WIRES) @@ -184,7 +184,7 @@ var/open_panel = 0 can_attach_mob = TRUE -/obj/item/grenade/plastic/c4/Initialize() +/obj/item/grenade/plastic/c4/Initialize(mapload) . = ..() wires = new /datum/wires/explosive/c4(src) diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm index 52f611271e01..f883b9e1663c 100644 --- a/code/game/objects/items/grenades/smokebomb.dm +++ b/code/game/objects/items/grenades/smokebomb.dm @@ -7,7 +7,7 @@ slot_flags = ITEM_SLOT_BELT var/datum/effect_system/fluid_spread/smoke/bad/smoke -/obj/item/grenade/smokebomb/Initialize() +/obj/item/grenade/smokebomb/Initialize(mapload) . = ..() smoke = new smoke.attach(src) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index c5084d0cf29e..ab87e548e670 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -90,7 +90,7 @@ else to_chat(user, span_warning("[C] doesn't have two hands...")) -/obj/item/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user, var/dispense = 0) +/obj/item/restraints/handcuffs/proc/apply_cuffs(mob/living/carbon/target, mob/user, dispense = 0) if(target.handcuffed) return @@ -262,7 +262,7 @@ var/armed = 0 var/trap_damage = 20 -/obj/item/restraints/legcuffs/beartrap/Initialize() +/obj/item/restraints/legcuffs/beartrap/Initialize(mapload) . = ..() update_icon() @@ -335,7 +335,7 @@ flags_1 = NONE break_strength = 2 -/obj/item/restraints/legcuffs/beartrap/energy/Initialize() +/obj/item/restraints/legcuffs/beartrap/energy/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(dissipate)), 100) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index 7c2b6baca8d1..ecf98f7f2173 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -24,7 +24,7 @@ var/victims_needed = 25 var/ascend_bonus = 15 -/obj/item/his_grace/Initialize() +/obj/item/his_grace/Initialize(mapload) . = ..() START_PROCESSING(SSprocessing, src) GLOB.poi_list += src diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 59662a40e21b..733066766591 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -30,7 +30,7 @@ /// this text will show on the tgui menu when picking the nullrod form they want. should give a better idea of the nullrod's gimmick or quirks without giving away numbers var/additional_desc = "How are you seeing this? This is the default Nullrod bonus description. I makey a mistakey." -/obj/item/nullrod/Initialize() +/obj/item/nullrod/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE) @@ -212,7 +212,7 @@ menutab = MENU_WEAPON additional_desc = "The cutting edge vibrates rapidly enabling it to cut cleanly through the unrighteous, no matter what armor or form they hide behind." -/obj/item/nullrod/vibro/Initialize() +/obj/item/nullrod/vibro/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 70, 110) //the harvest gives a high bonus chance @@ -337,7 +337,7 @@ menutab = MENU_WEAPON additional_desc = "A holy weapon, capable at meting out righteousness from a distance." -/obj/item/nullrod/whip/Initialize() +/obj/item/nullrod/whip/Initialize(mapload) . = ..() weapon_stats[REACH] = 4 //closest to a ranged weapon chaplain should ever get (that or maybe a throwing weapon) @@ -424,7 +424,7 @@ attack_verb = list("smashed", "bashed", "hammered", "crunched", "clobbered") sharpness = SHARP_NONE -/obj/item/twohanded/required/nullrod/Initialize() +/obj/item/twohanded/required/nullrod/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE) //trust me, this is better than re-coding two-handed weapons @@ -593,7 +593,7 @@ menutab = MENU_ARM additional_desc = "Give up your hand to God and let it be the instrument of his will." -/obj/item/nullrod/godhand/Initialize() +/obj/item/nullrod/godhand/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) @@ -617,7 +617,7 @@ menutab = MENU_ARM additional_desc = "Do you really need TWO arms? Consider one arm and a chainsaw arm." -/obj/item/nullrod/chainsaw/Initialize() +/obj/item/nullrod/chainsaw/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) AddComponent(/datum/component/butchering, 30, 100, 0, hitsound) @@ -640,7 +640,7 @@ menutab = MENU_ARM additional_desc = "Channel all your sins into one arm and watch it twist and contort into an instrument of pure violence. Use it to protect the innocent as your penance." -/obj/item/nullrod/armblade/Initialize() +/obj/item/nullrod/armblade/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) AddComponent(/datum/component/butchering, 80, 70) @@ -799,7 +799,7 @@ icon_state = "quantum_sparks" duration = 6 -/obj/effect/temp_visual/flowers/Initialize() +/obj/effect/temp_visual/flowers/Initialize(mapload) . = ..() animate(src, alpha = 0, time = duration - 1) @@ -976,7 +976,7 @@ menutab = MENU_MISC additional_desc = "This banana is comedically sharp." -/obj/item/nullrod/clown/Initialize() +/obj/item/nullrod/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 40) @@ -1187,7 +1187,7 @@ it also swaps back if it gets thrown into the chaplain, but the chaplain catches var/obj/item/nullrod/talking/sword //the sword they're part of var/datum/action/cooldown/spell/nullrod_drop/button //suicide button so they can return to being an item if need be -/mob/living/simple_animal/nullrod/Initialize() +/mob/living/simple_animal/nullrod/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, FALSE, null, null, FALSE) button = new(src) diff --git a/code/game/objects/items/implants/implant_bb.dm b/code/game/objects/items/implants/implant_bb.dm index b71634144000..3b8dd9e97833 100644 --- a/code/game/objects/items/implants/implant_bb.dm +++ b/code/game/objects/items/implants/implant_bb.dm @@ -5,7 +5,7 @@ icon_state = "cypherkey" var/list/linked_implants // All other implants that this communicates to -/obj/item/implant/bloodbrother/Initialize() +/obj/item/implant/bloodbrother/Initialize(mapload) . = ..() linked_implants = list() @@ -39,7 +39,7 @@ for(var/obj/item/implant/bloodbrother/i in linked_implants) // Removes this implant from the list of implants i.linked_implants -= src -/obj/item/implant/bloodbrother/proc/link_implant(var/obj/item/implant/bloodbrother/BB) +/obj/item/implant/bloodbrother/proc/link_implant(obj/item/implant/bloodbrother/BB) if(BB) if(BB == src) // Don't want to put this implant into itself return diff --git a/code/game/objects/items/implants/implant_chem.dm b/code/game/objects/items/implants/implant_chem.dm index dac6fed8e8a2..763e02ea175f 100644 --- a/code/game/objects/items/implants/implant_chem.dm +++ b/code/game/objects/items/implants/implant_chem.dm @@ -19,7 +19,7 @@ Integrity: Implant will last so long as the subject is alive."} return dat -/obj/item/implant/chem/Initialize() +/obj/item/implant/chem/Initialize(mapload) . = ..() create_reagents(50, OPENCONTAINER) GLOB.tracked_chem_implants += src diff --git a/code/game/objects/items/implants/implant_greytide.dm b/code/game/objects/items/implants/implant_greytide.dm index d38adef6a29e..172a90e4a495 100644 --- a/code/game/objects/items/implants/implant_greytide.dm +++ b/code/game/objects/items/implants/implant_greytide.dm @@ -64,6 +64,6 @@ /obj/item/implanter/greytide name = "implanter (greytide)" -/obj/item/implanter/greytide/Initialize() +/obj/item/implanter/greytide/Initialize(mapload) . = ..() imp = new /obj/item/implant/greytide(src) diff --git a/code/game/objects/items/implants/implant_stealth.dm b/code/game/objects/items/implants/implant_stealth.dm index 098b16d1d148..2ccd16528df9 100644 --- a/code/game/objects/items/implants/implant_stealth.dm +++ b/code/game/objects/items/implants/implant_stealth.dm @@ -19,7 +19,7 @@ /obj/structure/closet/cardboard/agent/proc/go_invisible() animate(src, , alpha = 0, time = 2 SECONDS) -/obj/structure/closet/cardboard/agent/Initialize() +/obj/structure/closet/cardboard/agent/Initialize(mapload) . = ..() go_invisible() diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm index fc0dd8ed1187..be5eee920a42 100644 --- a/code/game/objects/items/implants/implantchair.dm +++ b/code/game/objects/items/implants/implantchair.dm @@ -21,7 +21,7 @@ var/message_cooldown var/breakout_time = 600 -/obj/machinery/implantchair/Initialize() +/obj/machinery/implantchair/Initialize(mapload) . = ..() open_machine() update_icon() diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm index d6560e1ad5d1..bd4cbb3fbd1b 100644 --- a/code/game/objects/items/inducer.dm +++ b/code/game/objects/items/inducer.dm @@ -13,7 +13,7 @@ var/obj/item/stock_parts/cell/cell var/recharging = FALSE -/obj/item/inducer/Initialize() +/obj/item/inducer/Initialize(mapload) . = ..() if(!cell && cell_type) cell = new cell_type @@ -210,6 +210,6 @@ powertransfer = 500 opened = TRUE -/obj/item/inducer/sci/Initialize() +/obj/item/inducer/sci/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 7591190298ea..c9b7e893b32b 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -101,7 +101,7 @@ wound_bonus = 5 bare_wound_bonus = 15 -/obj/item/kitchen/knife/Initialize() +/obj/item/kitchen/knife/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 80 - force, 100, force - 10) //bonus chance increases depending on force @@ -144,7 +144,7 @@ desc = "Runes stretch across the surface of the knife, seemingly endless." wound_bonus = 20 //a bit better than a butcher cleaver, you've earned it for finding blood cult metal and doing the previous steps -/obj/item/kitchen/knife/ritual/holy/Initialize() +/obj/item/kitchen/knife/ritual/holy/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 70, 110) //the old gods demandeth more flesh output diff --git a/code/game/objects/items/laser_level.dm b/code/game/objects/items/laser_level.dm index 3d81c5f52536..d6f9b5b7bc63 100644 --- a/code/game/objects/items/laser_level.dm +++ b/code/game/objects/items/laser_level.dm @@ -13,7 +13,7 @@ var/brightness_on = 4 //range of light when on var/flashlight_power = 1 //strength of the light when on -/obj/item/laserlevel/Initialize() +/obj/item/laserlevel/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 1836ece16989..f9cec544e499 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -284,7 +284,7 @@ //worn_icon_state = "bookbag" resistance_flags = FLAMMABLE -/obj/item/storage/bag/mail/Initialize() +/obj/item/storage/bag/mail/Initialize(mapload) . = ..() var/datum/component/storage/storage = GetComponent(/datum/component/storage) storage.max_w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 6fce0bfd3248..e7f75f6af293 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -11,7 +11,7 @@ light_on = FALSE var/saber_color = null -/obj/item/melee/transforming/energy/Initialize() +/obj/item/melee/transforming/energy/Initialize(mapload) . = ..() if(active) START_PROCESSING(SSobj, src) @@ -132,7 +132,7 @@ saber_color = "red" var/hitcost = 50 -/obj/item/melee/transforming/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R) +/obj/item/melee/transforming/energy/sword/cyborg/attack(mob/M, mob/living/silicon/robot/R) if(R.cell) var/obj/item/stock_parts/cell/C = R.cell if(active && !(C.use(hitcost))) @@ -236,7 +236,7 @@ sharpness = SHARP_EDGED //Most of the other special functions are handled in their own files. aka special snowflake code so kewl -/obj/item/melee/transforming/energy/blade/Initialize() +/obj/item/melee/transforming/energy/blade/Initialize(mapload) . = ..() spark_system = new /datum/effect_system/spark_spread() spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index f668c165ac17..bf6016371e53 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -37,7 +37,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") sharpness = SHARP_EDGED -/obj/item/melee/synthetic_arm_blade/Initialize() +/obj/item/melee/synthetic_arm_blade/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 60, 80) //very imprecise @@ -80,7 +80,7 @@ hitsound = 'sound/weapons/rapierhit.ogg' materials = list(/datum/material/iron = 1000) -/obj/item/melee/sabre/Initialize() +/obj/item/melee/sabre/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 30, 95, 5) //fast and effective, but as a sword, it might damage the results. @@ -545,7 +545,7 @@ var/balanced = 1 force_string = "INFINITE" -/obj/item/melee/supermatter_sword/Initialize() +/obj/item/melee/supermatter_sword/Initialize(mapload) . = ..() shard = new /obj/machinery/power/supermatter_crystal(src) qdel(shard.countdown) @@ -693,7 +693,7 @@ var/on = FALSE var/datum/beam/beam -/obj/item/melee/roastingstick/Initialize() +/obj/item/melee/roastingstick/Initialize(mapload) . = ..() if (!ovens) ovens = typecacheof(list(/obj/singularity, /obj/machinery/power/supermatter_crystal, /obj/structure/bonfire, /obj/structure/destructible/clockwork/massive/ratvar, /obj/structure/destructible/clockwork/massive/celestial_gateway)) diff --git a/code/game/objects/items/melee/transforming.dm b/code/game/objects/items/melee/transforming.dm index bcf739a144f8..21f4a00ad65d 100644 --- a/code/game/objects/items/melee/transforming.dm +++ b/code/game/objects/items/melee/transforming.dm @@ -17,7 +17,7 @@ var/extend_sound = 'sound/weapons/saberon.ogg' var/retract_sound = 'sound/weapons/saberoff.ogg' -/obj/item/melee/transforming/Initialize() +/obj/item/melee/transforming/Initialize(mapload) . = ..() if(active) if(attack_verb_on.len) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index bcee869d5159..1b30148a6be8 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -19,7 +19,7 @@ force_string = "robust... against germs" var/insertable = TRUE -/obj/item/mop/Initialize() +/obj/item/mop/Initialize(mapload) . = ..() create_reagents(mopcap) diff --git a/code/game/objects/items/pinpointer.dm b/code/game/objects/items/pinpointer.dm index f4783c79af57..b9b0f901ffdf 100644 --- a/code/game/objects/items/pinpointer.dm +++ b/code/game/objects/items/pinpointer.dm @@ -21,7 +21,7 @@ var/ignore_suit_sensor_level = FALSE // Do we find people even if their suit sensors are turned off var/alert = FALSE // TRUE to display things more seriously -/obj/item/pinpointer/Initialize() +/obj/item/pinpointer/Initialize(mapload) . = ..() GLOB.pinpointer_list += src diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 0224ee36cf68..11cbdfdfabae 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -31,7 +31,7 @@ var/normal_desc //--end of love :'(-- -/obj/item/toy/plush/Initialize() +/obj/item/toy/plush/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, squeak_override) @@ -516,7 +516,7 @@ icon_state = "plushie_awake" item_state = "plushie_awake" -/obj/item/toy/plush/awakenedplushie/Initialize() +/obj/item/toy/plush/awakenedplushie/Initialize(mapload) . = ..() AddComponent(/datum/component/edit_complainer) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 8742e7106f9e..f0342d8bb99c 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -41,7 +41,7 @@ /obj/item/melee/supermatter_sword ) -/obj/item/pneumatic_cannon/Initialize() +/obj/item/pneumatic_cannon/Initialize(mapload) . = ..() if(selfcharge) init_charge() @@ -145,7 +145,7 @@ return Fire(user, target) -/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, var/atom/target) +/obj/item/pneumatic_cannon/proc/Fire(mob/living/user, atom/target) if(!istype(user) && !target) return var/discharge = 0 @@ -284,7 +284,7 @@ clumsyCheck = FALSE var/static/list/pie_typecache = typecacheof(/obj/item/reagent_containers/food/snacks/pie) -/obj/item/pneumatic_cannon/pie/Initialize() +/obj/item/pneumatic_cannon/pie/Initialize(mapload) . = ..() allowed_typecache = pie_typecache @@ -324,7 +324,7 @@ spin_item = FALSE var/static/list/magspear_typecache = typecacheof(/obj/item/throwing_star/magspear) -/obj/item/pneumatic_cannon/speargun/Initialize() +/obj/item/pneumatic_cannon/speargun/Initialize(mapload) . = ..() allowed_typecache = magspear_typecache @@ -335,7 +335,7 @@ icon_state = "quiver" item_state = "quiver" -/obj/item/storage/magspear_quiver/Initialize() +/obj/item/storage/magspear_quiver/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 20 diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index ec85a01d7e39..c521b30fef2a 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -231,7 +231,7 @@ desc = "It's a backpack with lots of extra room. A banner with Nanotrasen's logo is attached, that can't be removed." icon_state = "bannerpack" -/obj/item/storage/backpack/bannerpack/Initialize() +/obj/item/storage/backpack/bannerpack/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 27 //6 more then normal, for the tradeoff of declaring yourself an antag at all times. diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index 827acd1b39c7..06b1ddbbd169 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -176,7 +176,7 @@ var/static/list/charge_machines = typecacheof(list(/obj/machinery/cell_charger, /obj/machinery/recharger, /obj/machinery/recharge_station, /obj/machinery/mech_bay_recharge_port)) var/static/list/charge_items = typecacheof(list(/obj/item/stock_parts/cell, /obj/item/gun/energy)) -/obj/item/borg/charger/Initialize() +/obj/item/borg/charger/Initialize(mapload) . = ..() /obj/item/borg/charger/update_icon() @@ -525,7 +525,7 @@ ammo_type = /obj/item/reagent_containers/food/snacks/gumball/cyborg nodamage = TRUE -/obj/item/projectile/bullet/reusable/gumball/Initialize() +/obj/item/projectile/bullet/reusable/gumball/Initialize(mapload) . = ..() ammo_type = new ammo_type(src) color = ammo_type.color @@ -544,7 +544,7 @@ var/color2 = rgb(0, 0, 0) nodamage = TRUE -/obj/item/projectile/bullet/reusable/lollipop/Initialize() +/obj/item/projectile/bullet/reusable/lollipop/Initialize(mapload) . = ..() var/obj/item/reagent_containers/food/snacks/lollipop/S = new ammo_type(src) ammo_type = S @@ -583,7 +583,7 @@ energy = 50000 energy_recharge = 5000 -/obj/item/borg/projectile_dampen/Initialize() +/obj/item/borg/projectile_dampen/Initialize(mapload) . = ..() projectile_effect = image('icons/effects/fields.dmi', "projectile_dampen_effect") tracked = list() @@ -744,7 +744,7 @@ name = "medical hud" icon_state = "healthhud" -/obj/item/borg/sight/hud/med/Initialize() +/obj/item/borg/sight/hud/med/Initialize(mapload) . = ..() hud = new /obj/item/clothing/glasses/hud/health(src) @@ -753,6 +753,6 @@ name = "security hud" icon_state = "securityhud" -/obj/item/borg/sight/hud/sec/Initialize() +/obj/item/borg/sight/hud/sec/Initialize(mapload) . = ..() hud = new /obj/item/clothing/glasses/hud/security(src) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index c7026e0bb6e1..702eaa9836de 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -34,11 +34,11 @@ /// If the cyborg's cover panel starts locked var/panel_locked = TRUE -/obj/item/robot_suit/Initialize() +/obj/item/robot_suit/Initialize(mapload) . = ..() update_icon() -/obj/item/robot_suit/prebuilt/Initialize() +/obj/item/robot_suit/prebuilt/Initialize(mapload) . = ..() l_arm = new(src) r_arm = new(src) diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index 1c4c96519950..b3041e42b3ef 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -149,7 +149,7 @@ item_state = "flashshield" var/obj/item/assembly/flash/handheld/embedded_flash -/obj/item/shield/riot/flash/Initialize() +/obj/item/shield/riot/flash/Initialize(mapload) . = ..() embedded_flash = new(src) @@ -224,7 +224,7 @@ var/active = 0 var/clumsy_check = TRUE -/obj/item/shield/energy/Initialize() +/obj/item/shield/energy/Initialize(mapload) . = ..() icon_state = "[base_icon_state]0" diff --git a/code/game/objects/items/stacks/bscrystal.dm b/code/game/objects/items/stacks/bscrystal.dm index 477739bb1d1e..5dfacee83892 100644 --- a/code/game/objects/items/stacks/bscrystal.dm +++ b/code/game/objects/items/stacks/bscrystal.dm @@ -57,7 +57,7 @@ use(1) -/obj/item/stack/ore/bluespace_crystal/Initialize() +/obj/item/stack/ore/bluespace_crystal/Initialize(mapload) . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm index 5e02437e04b6..05b108612065 100644 --- a/code/game/objects/items/stacks/cash.dm +++ b/code/game/objects/items/stacks/cash.dm @@ -14,7 +14,7 @@ var/value = 0 grind_results = list(/datum/reagent/cellulose = 10) -/obj/item/stack/spacecash/Initialize() +/obj/item/stack/spacecash/Initialize(mapload) . = ..() update_desc() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 1a8be53394ba..563bf959e6c0 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -350,7 +350,7 @@ var/is_open = TRUE ///This var determines if the sterile packaging of the mesh has been opened. grind_results = list(/datum/reagent/space_cleaner/sterilizine = 2) -/obj/item/stack/medical/mesh/Initialize() +/obj/item/stack/medical/mesh/Initialize(mapload) . = ..() if(amount == max_amount) //only seal full mesh packs is_open = FALSE diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 35e61cfab913..fa732c7f4b33 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -276,7 +276,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list( return (BRUTELOSS) -/obj/item/shard/Initialize() +/obj/item/shard/Initialize(mapload) . = ..() AddComponent(/datum/component/caltrop, force) AddComponent(/datum/component/butchering, 150, 65) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 346dec3a8970..72ef66331b05 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -843,7 +843,7 @@ new /datum/stack_recipe("paper frame separator", /obj/structure/window/paperfram merge_type = /obj/item/stack/sheet/paperframes grind_results = list(/datum/reagent/cellulose = 20) -/obj/item/stack/sheet/paperframes/Initialize() +/obj/item/stack/sheet/paperframes/Initialize(mapload) recipes = GLOB.paperframe_recipes . = ..() /obj/item/stack/sheet/paperframes/five diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 8d7c42d1b738..d53195e7f5e4 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -21,7 +21,7 @@ resistance_flags = NONE max_integrity = 300 -/obj/item/storage/backpack/Initialize() +/obj/item/storage/backpack/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 21 @@ -32,7 +32,7 @@ * Backpack Types */ -/obj/item/storage/backpack/old/Initialize() +/obj/item/storage/backpack/old/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 12 @@ -75,7 +75,7 @@ icon_state = "clownpack" item_state = "clownpack" -/obj/item/storage/backpack/holding/Initialize() +/obj/item/storage/backpack/holding/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.allow_big_nesting = TRUE @@ -101,7 +101,7 @@ item_state = "giftbag" w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/backpack/santabag/Initialize() +/obj/item/storage/backpack/santabag/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -317,7 +317,7 @@ w_class = WEIGHT_CLASS_NORMAL //Can fit in backpacks itself. level = 1 -/obj/item/storage/backpack/satchel/flat/Initialize() +/obj/item/storage/backpack/satchel/flat/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 15 @@ -359,7 +359,7 @@ item_state = "duffel" slowdown = 0.5 -/obj/item/storage/backpack/duffelbag/Initialize() +/obj/item/storage/backpack/duffelbag/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 30 @@ -471,7 +471,7 @@ slowdown = 0 resistance_flags = FIRE_PROOF -/obj/item/storage/backpack/duffelbag/syndie/Initialize() +/obj/item/storage/backpack/duffelbag/syndie/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.silent = TRUE @@ -645,7 +645,7 @@ new /obj/item/grenade/syndieminibomb(src) // For ClownOps. -/obj/item/storage/backpack/duffelbag/clown/syndie/Initialize() +/obj/item/storage/backpack/duffelbag/clown/syndie/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) slowdown = 0 @@ -666,7 +666,7 @@ name = "Clothing Dufflebag" desc = "Dufflebag designed for clothing in mind" -/obj/item/storage/backpack/duffelbag/clothing/Initialize() +/obj/item/storage/backpack/duffelbag/clothing/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 35 diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e0b55bfb98ec..d6b5f7f8475a 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -19,7 +19,7 @@ /obj/item/storage/bag slot_flags = ITEM_SLOT_BELT -/obj/item/storage/bag/Initialize() +/obj/item/storage/bag/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.allow_quick_gather = TRUE @@ -42,7 +42,7 @@ w_class = WEIGHT_CLASS_BULKY var/insertable = TRUE -/obj/item/storage/bag/trash/Initialize() +/obj/item/storage/bag/trash/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL @@ -89,7 +89,7 @@ righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' item_flags = NO_MAT_REDEMPTION -/obj/item/storage/bag/trash/bluespace/Initialize() +/obj/item/storage/bag/trash/bluespace/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 60 @@ -113,7 +113,7 @@ var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it var/mob/listeningTo -/obj/item/storage/bag/ore/Initialize() +/obj/item/storage/bag/ore/Initialize(mapload) . = ..() var/datum/component/storage/concrete/stack/STR = GetComponent(/datum/component/storage/concrete/stack) STR.allow_quick_empty = TRUE @@ -184,7 +184,7 @@ desc = "A revolution in convenience, this satchel allows for huge amounts of ore storage. It's been outfitted with anti-malfunction safety measures." icon_state = "satchel_bspace" -/obj/item/storage/bag/ore/holding/Initialize() +/obj/item/storage/bag/ore/holding/Initialize(mapload) . = ..() var/datum/component/storage/concrete/stack/STR = GetComponent(/datum/component/storage/concrete/stack) STR.max_items = INFINITY @@ -201,7 +201,7 @@ var/spam_protection = FALSE //If this is TRUE, the holder won't receive any messages when they fail to pick up ore through crossing it var/mob/listeningTo -/obj/item/storage/bag/gem/Initialize() +/obj/item/storage/bag/gem/Initialize(mapload) . = ..() var/datum/component/storage/concrete/STR = GetComponent(/datum/component/storage/concrete) STR.allow_quick_empty = TRUE @@ -258,7 +258,7 @@ w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE -/obj/item/storage/bag/plants/Initialize() +/obj/item/storage/bag/plants/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -297,7 +297,7 @@ w_class = WEIGHT_CLASS_NORMAL component_type = /datum/component/storage/concrete/stack -/obj/item/storage/bag/sheetsnatcher/Initialize() +/obj/item/storage/bag/sheetsnatcher/Initialize(mapload) . = ..() var/datum/component/storage/concrete/stack/STR = GetComponent(/datum/component/storage/concrete/stack) STR.allow_quick_empty = TRUE @@ -313,7 +313,7 @@ desc = "" capacity = 1000//Borgs get more because >specialization -/obj/item/storage/bag/sheetsnatcher/borg/Initialize() +/obj/item/storage/bag/sheetsnatcher/borg/Initialize(mapload) . = ..() var/datum/component/storage/concrete/stack/STR = GetComponent(/datum/component/storage/concrete/stack) STR.max_items = 1000 @@ -330,7 +330,7 @@ w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics resistance_flags = FLAMMABLE -/obj/item/storage/bag/books/Initialize() +/obj/item/storage/bag/books/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -355,7 +355,7 @@ flags_1 = CONDUCT_1 materials = list(/datum/material/iron=3000) -/obj/item/storage/bag/tray/Initialize() +/obj/item/storage/bag/tray/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.insert_preposition = "on" @@ -409,7 +409,7 @@ w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE -/obj/item/storage/bag/chemistry/Initialize() +/obj/item/storage/bag/chemistry/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 50 @@ -429,7 +429,7 @@ w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE -/obj/item/storage/bag/bio/Initialize() +/obj/item/storage/bag/bio/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 100 @@ -449,7 +449,7 @@ w_class = WEIGHT_CLASS_SMALL resistance_flags = FLAMMABLE -/obj/item/storage/bag/construction/Initialize() +/obj/item/storage/bag/construction/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 50 @@ -459,7 +459,7 @@ STR.set_holdable(list(/obj/item/stack/ore/bluespace_crystal, /obj/item/assembly, /obj/item/stock_parts, /obj/item/reagent_containers/glass/beaker, /obj/item/stack/cable_coil, /obj/item/circuitboard, /obj/item/electronics, /obj/item/modular_computer)) -/obj/item/storage/bag/construction/admin/full/Initialize() +/obj/item/storage/bag/construction/admin/full/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 1000 @@ -487,7 +487,7 @@ w_class = WEIGHT_CLASS_NORMAL resistance_flags = FLAMMABLE -/obj/item/storage/bag/medpouch/Initialize() +/obj/item/storage/bag/medpouch/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 50 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 92984b220264..cb1fc78712a0 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -25,7 +25,7 @@ add_overlay(M) ..() -/obj/item/storage/belt/Initialize() +/obj/item/storage/belt/Initialize(mapload) . = ..() update_icon() @@ -39,7 +39,7 @@ drop_sound = 'sound/items/handling/toolbelt_drop.ogg' pickup_sound = 'sound/items/handling/toolbelt_pickup.ogg' -/obj/item/storage/belt/utility/Initialize() +/obj/item/storage/belt/utility/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 11 @@ -88,7 +88,7 @@ icon_state = "makeshiftbelt" item_state = "makeshiftutility" -/obj/item/storage/belt/utility/makeshift/Initialize() +/obj/item/storage/belt/utility/makeshift/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 //It's a very crappy belt @@ -237,7 +237,7 @@ item_state = "medical" content_overlays = TRUE -/obj/item/storage/belt/medical/Initialize() +/obj/item/storage/belt/medical/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_BULKY @@ -315,7 +315,7 @@ w_class = WEIGHT_CLASS_BULKY content_overlays = TRUE -/obj/item/storage/belt/security/Initialize() +/obj/item/storage/belt/security/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -364,7 +364,7 @@ icon_state = "securitybelt_hos" item_state = "security_hos" -/obj/item/storage/belt/security/chief/Initialize() +/obj/item/storage/belt/security/chief/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -388,7 +388,7 @@ w_class = WEIGHT_CLASS_BULKY custom_premium_price = 200 -/obj/item/storage/belt/security/webbing/Initialize() +/obj/item/storage/belt/security/webbing/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -400,7 +400,7 @@ icon_state = "explorer1" item_state = "explorer1" -/obj/item/storage/belt/mining/Initialize() +/obj/item/storage/belt/mining/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 8 @@ -472,7 +472,7 @@ icon_state = "ebelt" item_state = "ebelt" -/obj/item/storage/belt/mining/primitive/Initialize() +/obj/item/storage/belt/mining/primitive/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -483,7 +483,7 @@ icon_state = "soulstonebelt" item_state = "soulstonebelt" -/obj/item/storage/belt/soulstone/Initialize() +/obj/item/storage/belt/soulstone/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -506,7 +506,7 @@ item_state = "champion" materials = list(/datum/material/gold=400) -/obj/item/storage/belt/champion/Initialize() +/obj/item/storage/belt/champion/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 1 @@ -521,7 +521,7 @@ item_state = "militarywebbing" resistance_flags = FIRE_PROOF -/obj/item/storage/belt/military/Initialize() +/obj/item/storage/belt/military/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL @@ -529,12 +529,12 @@ /obj/item/storage/belt/military/snack name = "tactical snack rig" -/obj/item/storage/belt/military/snack/Initialize() +/obj/item/storage/belt/military/snack/Initialize(mapload) . = ..() var/sponsor = pick("DonkCo", "Waffle Co.", "Roffle Co.", "Gorlax Marauders", "Tiger Cooperative") desc = "A set of snack-tical webbing worn by athletes of the [sponsor] VR sports division." -/obj/item/storage/belt/military/snack/Initialize() +/obj/item/storage/belt/military/snack/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -606,7 +606,7 @@ item_state = "security" content_overlays = TRUE // This won't end well -/obj/item/storage/belt/admin/Initialize() +/obj/item/storage/belt/admin/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 1000 @@ -657,7 +657,7 @@ icon_state = "grenadebeltnew" item_state = "security" -/obj/item/storage/belt/grenade/Initialize() +/obj/item/storage/belt/grenade/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 30 @@ -697,7 +697,7 @@ icon_state = "soulstonebelt" item_state = "soulstonebelt" -/obj/item/storage/belt/wands/Initialize() +/obj/item/storage/belt/wands/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -722,7 +722,7 @@ icon_state = "janibelt" item_state = "janibelt" -/obj/item/storage/belt/janitor/Initialize() +/obj/item/storage/belt/janitor/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -755,7 +755,7 @@ icon_state = "bandolier" item_state = "bandolier" -/obj/item/storage/belt/bandolier/Initialize() +/obj/item/storage/belt/bandolier/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 24 @@ -784,7 +784,7 @@ w_class = WEIGHT_CLASS_NORMAL alternate_worn_layer = UNDER_SUIT_LAYER -/obj/item/storage/belt/holster/Initialize() +/obj/item/storage/belt/holster/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 3 @@ -806,7 +806,7 @@ name = "syndicate shoulder holster" desc = "A modified holster that can carry more than enough firepower." -/obj/item/storage/belt/holster/syndicate/Initialize() +/obj/item/storage/belt/holster/syndicate/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 4 @@ -831,7 +831,7 @@ override_state = "[icon_state]_empty" return ..() -/obj/item/storage/belt/quiver/Initialize() +/obj/item/storage/belt/quiver/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 20 @@ -852,7 +852,7 @@ desc = "Gives +1 to holding arrows. Also contains unlimited arrows." var/new_arrow_type = /obj/item/ammo_casing/reusable/arrow -/obj/item/storage/belt/quiver/unlimited/Initialize() +/obj/item/storage/belt/quiver/unlimited/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_STORAGE_REMOVED, PROC_REF(check_arrow_refresh)) @@ -878,7 +878,7 @@ /// If the return is blocked by anti-magic var/anti_magic_check = TRUE -/obj/item/storage/belt/quiver/returning/Initialize() +/obj/item/storage/belt/quiver/returning/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_STORAGE_REMOVED, PROC_REF(mark_arrow_return)) @@ -941,7 +941,7 @@ content_overlays = FALSE // The arrows are stored in the quiver, so none of it hangs out anti_magic_check = FALSE -/obj/item/storage/belt/quiver/returning/holding/Initialize() +/obj/item/storage/belt/quiver/returning/holding/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 50 @@ -953,7 +953,7 @@ icon_state = "quiver_anomaly_empty" item_state = "quiver_anomaly_empty" -/obj/item/storage/belt/quiver/anomaly/Initialize() +/obj/item/storage/belt/quiver/anomaly/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 10 // Less space for arrows due to all the parts inside @@ -989,7 +989,7 @@ icon_state = "quiver_anomaly" item_state = "quiver_anomaly" -/obj/item/storage/belt/quiver/anomaly/vacuum/Initialize() +/obj/item/storage/belt/quiver/anomaly/vacuum/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -1024,7 +1024,7 @@ /// Time after igniting an arrow for it to allow you to light another var/ignite_cooldown = 1 SECONDS -/obj/item/storage/belt/quiver/anomaly/pyro/Initialize() +/obj/item/storage/belt/quiver/anomaly/pyro/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_STORAGE_REMOVED, PROC_REF(ignite_arrow)) @@ -1061,7 +1061,7 @@ content_overlays = FALSE w_class = WEIGHT_CLASS_TINY -/obj/item/storage/belt/quiver/admin/Initialize() +/obj/item/storage/belt/quiver/admin/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 100 @@ -1102,7 +1102,7 @@ dying_key = DYE_REGISTRY_FANNYPACK custom_price = 15 -/obj/item/storage/belt/fannypack/Initialize() +/obj/item/storage/belt/fannypack/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 3 @@ -1164,7 +1164,7 @@ icon_state = "sheath" item_state = "sheath" -/obj/item/storage/belt/sabre/Initialize() +/obj/item/storage/belt/sabre/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 1 diff --git a/code/game/objects/items/storage/book.dm b/code/game/objects/items/storage/book.dm index a8b4507e742d..f3a557001a7d 100644 --- a/code/game/objects/items/storage/book.dm +++ b/code/game/objects/items/storage/book.dm @@ -9,7 +9,7 @@ resistance_flags = FLAMMABLE var/title = "book" -/obj/item/storage/book/Initialize() +/obj/item/storage/book/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 1 @@ -43,7 +43,7 @@ GLOBAL_LIST_INIT(bibleitemstates, list("bible", "koran", "scrapbook", "burning", slot_flags = ITEM_SLOT_BELT var/success_heal_chance = 60 -/obj/item/storage/book/bible/Initialize() +/obj/item/storage/book/bible/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, FALSE, TRUE) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 2996e22ede74..a02facc0d1fb 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -490,7 +490,7 @@ illustration=null var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket -/obj/item/storage/box/donkpockets/Initialize() +/obj/item/storage/box/donkpockets/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/donkpocket)) @@ -536,7 +536,7 @@ illustration = null var/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube -/obj/item/storage/box/monkeycubes/Initialize() +/obj/item/storage/box/monkeycubes/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -555,7 +555,7 @@ desc = "Waffle Co. brand mouse cubes. Just add water and a dash of subterfuge!" cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/mouse/syndicate -/obj/item/storage/box/monkeycubes/syndicate/mice/Initialize() +/obj/item/storage/box/monkeycubes/syndicate/mice/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 24 @@ -571,7 +571,7 @@ icon_state = "monkeycubebox" illustration = null -/obj/item/storage/box/gorillacubes/Initialize() +/obj/item/storage/box/gorillacubes/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 3 @@ -587,7 +587,7 @@ icon_state = "monkeycubebox" illustration = null -/obj/item/storage/box/mixedcubes/Initialize() +/obj/item/storage/box/mixedcubes/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -753,7 +753,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "spbox" -/obj/item/storage/box/snappops/Initialize() +/obj/item/storage/box/snappops/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(list(/obj/item/toy/snappop)) @@ -773,7 +773,7 @@ drop_sound = 'sound/items/handling/matchbox_drop.ogg' pickup_sound = 'sound/items/handling/matchbox_pickup.ogg' -/obj/item/storage/box/matches/Initialize() +/obj/item/storage/box/matches/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 10 @@ -796,7 +796,7 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' foldable = /obj/item/stack/sheet/cardboard //BubbleWrap -/obj/item/storage/box/lights/Initialize() +/obj/item/storage/box/lights/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 21 @@ -912,7 +912,7 @@ icon_state = "rubbershot_box" illustration = null -/obj/item/storage/box/rubbershot/Initialize() +/obj/item/storage/box/rubbershot/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -928,7 +928,7 @@ icon_state = "lethalshot_box" illustration = null -/obj/item/storage/box/lethalshot/Initialize() +/obj/item/storage/box/lethalshot/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -944,7 +944,7 @@ icon_state = "breachershot_box" illustration = null -/obj/item/storage/box/breacherslug/Initialize() +/obj/item/storage/box/breacherslug/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -960,7 +960,7 @@ icon_state = "rubbershot_box" illustration = null -/obj/item/storage/box/beanbag/Initialize() +/obj/item/storage/box/beanbag/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 7 @@ -1055,7 +1055,7 @@ illustration = "fruit" var/theme_name -/obj/item/storage/box/ingredients/Initialize() +/obj/item/storage/box/ingredients/Initialize(mapload) . = ..() if(theme_name) name = "[name] ([theme_name])" @@ -1320,7 +1320,7 @@ /obj/item/stack/sheet/mineral/bananium/fifty = 1) generate_items_inside(items_inside,src) -/obj/item/storage/box/materials/Initialize() +/obj/item/storage/box/materials/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 200 diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm index 8bf01293d95d..243a1e6e2f4d 100644 --- a/code/game/objects/items/storage/briefcase.dm +++ b/code/game/objects/items/storage/briefcase.dm @@ -15,7 +15,7 @@ max_integrity = 150 var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New() -/obj/item/storage/briefcase/Initialize() +/obj/item/storage/briefcase/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2af663fc0179..417911aefd81 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -70,7 +70,7 @@ spawn_type = /obj/item/reagent_containers/food/snacks/donut fancy_open = TRUE -/obj/item/storage/box/fancy/donut_box/Initialize() +/obj/item/storage/box/fancy/donut_box/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -84,7 +84,7 @@ spawn_type = /obj/item/reagent_containers/food/snacks/donut/deadly fancy_open = TRUE -/obj/item/storage/box/fancy/donut_box/Initialize() +/obj/item/storage/box/fancy/donut_box/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -106,7 +106,7 @@ desc = "A carton for containing eggs." spawn_type = /obj/item/reagent_containers/food/snacks/egg -/obj/item/storage/box/fancy/egg_box/Initialize() +/obj/item/storage/box/fancy/egg_box/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 12 @@ -132,7 +132,7 @@ . = ..() update_icon() -/obj/item/storage/box/fancy/candle_box/Initialize() +/obj/item/storage/box/fancy/candle_box/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 5 @@ -154,7 +154,7 @@ spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette age_restricted = TRUE -/obj/item/storage/box/fancy/cigarettes/Initialize() +/obj/item/storage/box/fancy/cigarettes/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 6 @@ -298,7 +298,7 @@ icon_type = "rolling paper" spawn_type = /obj/item/rollingpaper -/obj/item/storage/box/fancy/rollingpapers/Initialize() +/obj/item/storage/box/fancy/rollingpapers/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 10 @@ -322,7 +322,7 @@ icon_type = "premium cigar" spawn_type = /obj/item/clothing/mask/cigarette/cigar -/obj/item/storage/box/fancy/cigarettes/cigars/Initialize() +/obj/item/storage/box/fancy/cigarettes/cigars/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 5 @@ -369,7 +369,7 @@ righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' spawn_type = /obj/item/reagent_containers/food/snacks/tinychocolate -/obj/item/storage/box/fancy/heart_box/Initialize() +/obj/item/storage/box/fancy/heart_box/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 8 diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 9a53a39d56e1..210959043c01 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -62,7 +62,7 @@ item_state = "firstaid" desc = "A high capacity aid kit for doctors, full of medical supplies and basic surgical equipment" -/obj/item/storage/firstaid/medical/Initialize() +/obj/item/storage/firstaid/medical/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 12 @@ -241,7 +241,7 @@ item_state = "firstaid-rad" custom_premium_price = 600 -/obj/item/storage/firstaid/advanced/Initialize() +/obj/item/storage/firstaid/advanced/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 12 @@ -266,7 +266,7 @@ icon_state = "bezerk" item_state = "firstaid-bezerk" -/obj/item/storage/firstaid/tactical/Initialize() +/obj/item/storage/firstaid/tactical/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -320,7 +320,7 @@ custom_premium_price = 100 var/stored_hypo -/obj/item/storage/firstaid/hypospray/Initialize() +/obj/item/storage/firstaid/hypospray/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -582,7 +582,7 @@ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' w_class = WEIGHT_CLASS_SMALL -/obj/item/storage/pill_bottle/Initialize() +/obj/item/storage/pill_bottle/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.allow_quick_gather = TRUE @@ -718,7 +718,7 @@ name = "bottle of floorpills" desc = "An old pill bottle. It smells musty." -/obj/item/storage/pill_bottle/floorpill/Initialize() +/obj/item/storage/pill_bottle/floorpill/Initialize(mapload) . = ..() var/obj/item/reagent_containers/pill/P = locate() in src name = "bottle of [P.name]s" @@ -769,7 +769,7 @@ icon_state = "pill_canister_large" w_class = WEIGHT_CLASS_SMALL -/obj/item/storage/pill_bottle/gummies/Initialize() +/obj/item/storage/pill_bottle/gummies/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.allow_quick_gather = TRUE diff --git a/code/game/objects/items/storage/food.dm b/code/game/objects/items/storage/food.dm index 2e70779dbcfd..f9267538dc31 100644 --- a/code/game/objects/items/storage/food.dm +++ b/code/game/objects/items/storage/food.dm @@ -11,7 +11,8 @@ w_class = WEIGHT_CLASS_TINY custom_price = 20 -/obj/item/storage/byummie/Initialize() +/obj/item/storage/byummie/Initialize(mapload) + . = ..() var/obj/item/reagent_containers/food/snacks/borer/B for(var/i, i < 4, i++) B = new(src) @@ -25,10 +26,3 @@ B.desc = "A green yummie! It's ... moving." if("yellowyum") B.desc = "A banana flavoured yummie! Packed with lots of flavour!" - . = ..() - var/datum/component/storage/STR = GetComponent(/datum/component/storage) - STR.max_items = 4 - STR.max_w_class = WEIGHT_CLASS_TINY - STR.set_holdable(list( - /obj/item/reagent_containers/food/snacks/borer, - )) diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index fa1ff1389205..5b0334e841c8 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -13,7 +13,7 @@ var/icon_closed = "lockbox" var/icon_broken = "lockbox+b" -/obj/item/storage/lockbox/Initialize() +/obj/item/storage/lockbox/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -121,7 +121,7 @@ icon_closed = "medalbox" icon_broken = "medalbox+b" -/obj/item/storage/lockbox/medal/Initialize() +/obj/item/storage/lockbox/medal/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL @@ -268,11 +268,11 @@ add_overlay(led) ..() -/obj/item/storage/lockbox/vialbox/Initialize() +/obj/item/storage/lockbox/vialbox/Initialize(mapload) . = ..() update_icon() -/obj/item/storage/lockbox/vialbox/Initialize() +/obj/item/storage/lockbox/vialbox/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index b8010ad89e58..5dbc10bc0284 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -24,7 +24,7 @@ w_class = WEIGHT_CLASS_NORMAL desc = "This shouldn't exist. If it does, create an issue report." -/obj/item/storage/secure/Initialize() +/obj/item/storage/secure/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_SMALL @@ -138,7 +138,7 @@ new /obj/item/paper(src) new /obj/item/pen(src) -/obj/item/storage/secure/briefcase/Initialize() +/obj/item/storage/secure/briefcase/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 21 @@ -172,7 +172,7 @@ anchored = TRUE density = FALSE -/obj/item/storage/secure/safe/Initialize() +/obj/item/storage/secure/safe/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(null, list(/obj/item/storage/secure/briefcase)) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index e911203e2fda..20f199c27e23 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -12,7 +12,7 @@ /obj/item/storage/get_dumping_location(obj/item/storage/source,mob/user) return src -/obj/item/storage/Initialize() +/obj/item/storage/Initialize(mapload) . = ..() AddComponent(component_type) PopulateContents() diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 8261137f9700..54c223a2d08e 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -21,7 +21,7 @@ var/has_latches = TRUE wound_bonus = 5 -/obj/item/storage/toolbox/Initialize() +/obj/item/storage/toolbox/Initialize(mapload) . = ..() if(has_latches) if(prob(10)) @@ -160,7 +160,7 @@ w_class = WEIGHT_CLASS_NORMAL material_flags = MATERIAL_NO_COLOR -/obj/item/storage/toolbox/syndicate/Initialize() +/obj/item/storage/toolbox/syndicate/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.silent = TRUE @@ -205,7 +205,7 @@ var/fabricator_type = /obj/item/clockwork/replica_fabricator/scarab material_flags = MATERIAL_NO_COLOR -/obj/item/storage/toolbox/brass/Initialize() +/obj/item/storage/toolbox/brass/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -243,7 +243,7 @@ item_state = "artistic_toolbox" w_class = WEIGHT_CLASS_GIGANTIC //Holds more than a regular toolbox! -/obj/item/storage/toolbox/artistic/Initialize() +/obj/item/storage/toolbox/artistic/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_combined_w_class = 20 diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 775677249295..ced3b7e0c1a2 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -342,7 +342,7 @@ /obj/item/paper/contractor_guide name = "Contractor Guide" -/obj/item/paper/contractor_guide/Initialize() +/obj/item/paper/contractor_guide/Initialize(mapload) info = {"

Welcome agent, congratulations on your new position as contractor. On top of your already assigned objectives, this kit will provide you contracts to take on for TC payments.

@@ -515,7 +515,7 @@ /obj/item/storage/box/syndie_kit/space real_name = "boxed space suit and helmet" -/obj/item/storage/box/syndie_kit/space/Initialize() +/obj/item/storage/box/syndie_kit/space/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -541,7 +541,7 @@ /obj/item/storage/box/syndie_kit/chemical real_name = "chemical kit" -/obj/item/storage/box/syndie_kit/chemical/Initialize() +/obj/item/storage/box/syndie_kit/chemical/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 12 diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index f36d6963cc49..e365b45a8f5a 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -9,7 +9,7 @@ var/obj/item/card/id/front_id = null var/list/combined_access -/obj/item/storage/wallet/Initialize() +/obj/item/storage/wallet/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_items = 4 diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index f1c2b598bf93..9c096cb43d4d 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -47,7 +47,7 @@ user.visible_message(span_suicide("[user] is putting the [name] in [user.p_their()] mouth! But forgot to turn the [name] on.")) return SHAME -/obj/item/melee/baton/Initialize() +/obj/item/melee/baton/Initialize(mapload) . = ..() status = FALSE if(preload_cell_type) @@ -305,7 +305,7 @@ slot_flags = ITEM_SLOT_BACK var/obj/item/assembly/igniter/sparkler = 0 -/obj/item/melee/baton/cattleprod/Initialize() +/obj/item/melee/baton/cattleprod/Initialize(mapload) . = ..() sparkler = new (src) diff --git a/code/game/objects/items/supermatter_delaminator.dm b/code/game/objects/items/supermatter_delaminator.dm index 7850b140ba4a..b537ca44393d 100644 --- a/code/game/objects/items/supermatter_delaminator.dm +++ b/code/game/objects/items/supermatter_delaminator.dm @@ -11,7 +11,7 @@
  • Nanotrasen safety controls will announce the destabilization of the crystal. Your identity will likely be compromised, but nothing can be done about the crystal.
    • \ " -/obj/item/supermatter_delaminator/Initialize() +/obj/item/supermatter_delaminator/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -70,7 +70,7 @@ var/obj/item/supermatter_delaminator/antinoblium_shard/shard var/sealed = TRUE -/obj/item/antinoblium_container/Initialize() +/obj/item/antinoblium_container/Initialize(mapload) . = ..() shard = new /obj/item/supermatter_delaminator/antinoblium_shard diff --git a/code/game/objects/items/syndicateReverseCard.dm b/code/game/objects/items/syndicateReverseCard.dm index 165642ef518b..d210e7cf92cb 100644 --- a/code/game/objects/items/syndicateReverseCard.dm +++ b/code/game/objects/items/syndicateReverseCard.dm @@ -8,7 +8,7 @@ w_class = WEIGHT_CLASS_TINY var/used = FALSE //has this been used before? If not, give no hints about it's nature -/obj/item/syndicateReverseCard/Initialize() +/obj/item/syndicateReverseCard/Initialize(mapload) ..() var/cardColor = pick ("Red", "Green", "Yellow", "Blue") //this randomizes which color reverse you get! name = "[cardColor] Reverse" diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 537af0d89931..fa7e7f08792a 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -17,7 +17,7 @@ var/datum/effect_system/trail_follow/ion/ion_trail var/jetspeed = -0.3 // Negative increases speed -/obj/item/tank/jetpack/Initialize() +/obj/item/tank/jetpack/Initialize(mapload) . = ..() ion_trail = new ion_trail.set_up(src) @@ -200,7 +200,7 @@ var/obj/item/tank/internals/tank = null var/mob/living/carbon/human/cur_user -/obj/item/tank/jetpack/suit/Initialize() +/obj/item/tank/jetpack/suit/Initialize(mapload) . = ..() STOP_PROCESSING(SSobj, src) temp_air_contents = air_contents diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm index d829c42e97e5..643469d1e7bd 100644 --- a/code/game/objects/items/tanks/tanks.dm +++ b/code/game/objects/items/tanks/tanks.dm @@ -64,7 +64,7 @@ /obj/item/tank/ui_action_click(mob/user) toggle_internals(user) -/obj/item/tank/Initialize() +/obj/item/tank/Initialize(mapload) . = ..() air_contents = new(volume) //liters diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index a554e37ed6c9..b15c7172ef9e 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -16,7 +16,7 @@ var/obj/item/noz var/volume = 500 -/obj/item/watertank/Initialize() +/obj/item/watertank/Initialize(mapload) . = ..() create_reagents(volume, OPENCONTAINER) noz = make_noz() @@ -117,7 +117,7 @@ var/obj/item/watertank/tank -/obj/item/reagent_containers/spray/mister/Initialize() +/obj/item/reagent_containers/spray/mister/Initialize(mapload) . = ..() tank = loc if(!istype(tank)) @@ -147,7 +147,7 @@ item_state = "waterbackpackjani" custom_price = 100 -/obj/item/watertank/janitor/Initialize() +/obj/item/watertank/janitor/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/space_cleaner, 500) @@ -165,7 +165,7 @@ /obj/item/watertank/janitor/make_noz() return new /obj/item/reagent_containers/spray/mister/janitor(src) -/obj/item/reagent_containers/spray/mister/janitor/attack_self(var/mob/user) +/obj/item/reagent_containers/spray/mister/janitor/attack_self(mob/user) amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10) to_chat(user, span_notice("You [amount_per_transfer_from_this == 10 ? "remove" : "fix"] the nozzle. You'll now use [amount_per_transfer_from_this] units per spray.")) @@ -183,7 +183,7 @@ volume = 300 slowdown = 0 -/obj/item/watertank/atmos/Initialize() +/obj/item/watertank/atmos/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/water, volume) @@ -218,7 +218,7 @@ var/launcher_cost = 50 COOLDOWN_DECLARE(resin_cooldown) -/obj/item/extinguisher/mini/nozzle/Initialize() +/obj/item/extinguisher/mini/nozzle/Initialize(mapload) . = ..() tank = loc if (!istype(tank)) @@ -391,7 +391,7 @@ filling.color = mix_color_from_reagents(reagents.reagent_list) add_overlay(filling) -/obj/item/reagent_containers/chemtank/worn_overlays(var/isinhands = FALSE) //apply chemcolor and level +/obj/item/reagent_containers/chemtank/worn_overlays(isinhands = FALSE) //apply chemcolor and level . = list() //inhands + reagent_filling if(!isinhands && reagents.total_volume) @@ -450,7 +450,7 @@ volume = 2000 slowdown = 0 -/obj/item/watertank/op/Initialize() +/obj/item/watertank/op/Initialize(mapload) . = ..() reagents.add_reagent(/datum/reagent/toxin/mutagen,350) reagents.add_reagent(/datum/reagent/napalm,125) diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index ae8f0f13de7c..594aea1a862a 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -137,7 +137,7 @@ var/atmos_link_override var/obj/item/stock_parts/manipulator/manipulator -/obj/item/hand_tele/Initialize() +/obj/item/hand_tele/Initialize(mapload) . = ..() active_portal_pairs = list() manipulator = new /obj/item/stock_parts/manipulator(src) diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm index bff47bf38e48..6095106a1aac 100644 --- a/code/game/objects/items/theft_tools.dm +++ b/code/game/objects/items/theft_tools.dm @@ -15,7 +15,7 @@ var/cooldown = 0 var/pulseicon = "plutonium_core_pulse" -/obj/item/nuke_core/Initialize() +/obj/item/nuke_core/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -206,7 +206,7 @@ usesound = 'sound/weapons/bladeslice.ogg' var/usesLeft -/obj/item/scalpel/supermatter/Initialize() +/obj/item/scalpel/supermatter/Initialize(mapload) . = ..() usesLeft = rand(2, 4) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index c7cf0c171ab7..a404a46d00ba 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -38,7 +38,7 @@ user.visible_message(span_suicide("[user] is stabbing [src] into [user.p_their()] [pick("temple", "heart")]! It looks like [user.p_theyre()] trying to commit suicide!")) return(BRUTELOSS) -/obj/item/screwdriver/Initialize() +/obj/item/screwdriver/Initialize(mapload) . = ..() if(random_color) //random colors! icon_state = "screwdriver" diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index a372cd1a3b72..18a3ebfc4230 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -42,7 +42,7 @@ wound_bonus = 10 bare_wound_bonus = 15 -/obj/item/weldingtool/Initialize() +/obj/item/weldingtool/Initialize(mapload) . = ..() create_reagents(max_fuel) reagents.add_reagent(/datum/reagent/fuel, max_fuel) diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm index 14c16e3935ff..4784c3f6f8ca 100644 --- a/code/game/objects/items/tools/wirecutters.dm +++ b/code/game/objects/items/tools/wirecutters.dm @@ -34,7 +34,7 @@ ) -/obj/item/wirecutters/Initialize() +/obj/item/wirecutters/Initialize(mapload) . = ..() if(random_color) //random colors! icon_state = "cutters" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8ddaa5a60e7a..f46d52ab61ab 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -45,7 +45,7 @@ item_state = "balloon-empty" -/obj/item/toy/balloon/Initialize() +/obj/item/toy/balloon/Initialize(mapload) . = ..() create_reagents(10) @@ -398,7 +398,7 @@ toy = TRUE var/pirated = FALSE // knockoff brand! -/obj/item/twohanded/vxtvulhammer/toy/Initialize() +/obj/item/twohanded/vxtvulhammer/toy/Initialize(mapload) . = ..() if(pirated || prob(10)) // man i got scammed! pirated = TRUE @@ -454,7 +454,7 @@ w_class = WEIGHT_CLASS_TINY var/ash_type = /obj/effect/decal/cleanable/ash -/obj/item/toy/snappop/proc/pop_burst(var/n=3, var/c=1) +/obj/item/toy/snappop/proc/pop_burst(n=3, c=1) var/datum/effect_system/spark_spread/s = new() s.set_up(n, c, src) s.start() @@ -487,7 +487,7 @@ /obj/effect/decal/cleanable/ash/snappop_phoenix var/respawn_time = 300 -/obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize() +/obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(respawn)), respawn_time) @@ -722,7 +722,7 @@ var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite var/list/cards = list() -/obj/item/toy/cards/deck/Initialize() +/obj/item/toy/cards/deck/Initialize(mapload) . = ..() populate_deck() @@ -1413,7 +1413,7 @@ obj/item/toy/turn_tracker var/toysay = "What the fuck did you do?" var/toysound = 'sound/machines/click.ogg' -/obj/item/toy/figure/Initialize() +/obj/item/toy/figure/Initialize(mapload) . = ..() desc = "A \"Space Life\" brand [src]." @@ -1633,7 +1633,7 @@ obj/item/toy/turn_tracker icon_state = "ling" toysay = ";g absorbing AI in traitor maint!" -/obj/item/toy/figure/ling/Initialize() +/obj/item/toy/figure/ling/Initialize(mapload) . = ..() if(prob(25)) icon_state = "ling[rand(1,3)]" diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index e9f01440f76a..ec890b100ebf 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -250,7 +250,7 @@ wound_bonus = -15 bare_wound_bonus = 20 -/obj/item/twohanded/fireaxe/Initialize() +/obj/item/twohanded/fireaxe/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 100, 80, 0 , hitsound) //axes are not known for being precision butchering tools @@ -435,7 +435,7 @@ user.visible_message(span_suicide("[user] begins beating [user.p_them()]self to death with \the [src]'s handle! It probably would've been cooler if [user.p_they()] turned it on first!")) return BRUTELOSS -/obj/item/twohanded/dualsaber/Initialize() +/obj/item/twohanded/dualsaber/Initialize(mapload) . = ..() if(LAZYLEN(possible_colors)) saber_color = pick(possible_colors) @@ -612,7 +612,7 @@ wound_bonus = -15 bare_wound_bonus = 15 -/obj/item/twohanded/spear/Initialize() +/obj/item/twohanded/spear/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 100, 70) //decent in a pinch, but pretty bad. @@ -620,7 +620,7 @@ user.visible_message(span_suicide("[user] begins to sword-swallow \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS -/obj/item/twohanded/spear/Initialize() +/obj/item/twohanded/spear/Initialize(mapload) . = ..() AddComponent(/datum/component/jousting) @@ -734,7 +734,7 @@ actions_types = list(/datum/action/item_action/startchainsaw) var/on = FALSE -/obj/item/twohanded/required/chainsaw/Initialize() +/obj/item/twohanded/required/chainsaw/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 30, 100, 0, 'sound/weapons/chainsawhit.ogg', TRUE) @@ -790,7 +790,7 @@ force_on = 30 icon_name = "demon" -/obj/item/twohanded/required/chainsaw/demon/Initialize() +/obj/item/twohanded/required/chainsaw/demon/Initialize(mapload) . = ..() AddComponent(/datum/component/lifesteal, 30) @@ -928,7 +928,7 @@ slot_flags = ITEM_SLOT_BACK hitsound = 'sound/weapons/bladeslice.ogg' -/obj/item/twohanded/vibro_weapon/Initialize() +/obj/item/twohanded/vibro_weapon/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 20, 105) @@ -1126,7 +1126,7 @@ var/supercharged = FALSE var/toy = FALSE -/obj/item/twohanded/vxtvulhammer/Initialize() //For the sparks when you begin to charge it +/obj/item/twohanded/vxtvulhammer/Initialize(mapload) //For the sparks when you begin to charge it . = ..() spark_system = new spark_system.set_up(5, 0, src) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 9b7d747c0d11..8811dc9c4c8d 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -72,7 +72,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF -/obj/item/claymore/Initialize() +/obj/item/claymore/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 40, 105) @@ -106,7 +106,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK -/obj/item/claymore/highlander/Initialize() +/obj/item/claymore/highlander/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER) START_PROCESSING(SSobj, src) @@ -440,7 +440,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 . = ..() . += span_danger("\The [src] has a [nt ? "Nanotrasen" : "Syndicate"] marking on the blade.") -/obj/item/switchblade/backstab/Initialize() +/obj/item/switchblade/backstab/Initialize(mapload) . = ..() AddComponent(/datum/component/backstabs, 1.75) // 35 damage @@ -582,7 +582,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 attack_verb = list("sawed", "torn", "cut", "chopped", "diced") hitsound = 'sound/weapons/chainsawhit.ogg' -/obj/item/mounted_chainsaw/Initialize() +/obj/item/mounted_chainsaw/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) @@ -610,7 +610,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 attack_verb = list("busted") var/impressiveness = 45 -/obj/item/statuebust/Initialize() +/obj/item/statuebust/Initialize(mapload) . = ..() AddComponent(/datum/component/art, impressiveness) @@ -699,7 +699,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 //Things in this list will be instantly splatted. Flyman weakness is handled in the flyman species weakness proc. var/list/strong_against -/obj/item/melee/flyswatter/Initialize() +/obj/item/melee/flyswatter/Initialize(mapload) . = ..() strong_against = typecacheof(list( /mob/living/simple_animal/hostile/poison/bees/, diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 18ee55e28b02..9f8e4d0e74b5 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -250,7 +250,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e //The surgeon general warns that being buckled to certain objects receiving powerful shocks is greatly hazardous to your health ///Only tesla coils and grounding rods currently call this because mobs are already targeted over all other objects, but this might be useful for more things later. -/obj/proc/tesla_buckle_check(var/strength) +/obj/proc/tesla_buckle_check(strength) if(has_buckled_mobs()) for(var/m in buckled_mobs) var/mob/living/buckled_mob = m diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index b65890d3d6a3..8203dbca94c3 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -50,14 +50,14 @@ return FALSE return ..() -/obj/Initialize() +/obj/Initialize(mapload) . = ..() if (islist(armor)) armor = getArmor(arglist(armor)) else if (!armor) armor = getArmor() else if (!istype(armor, /datum/armor)) - stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()") + stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize(mapload)") if(obj_integrity == null) obj_integrity = max_integrity diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index 96beec4a7f1f..8092444f5ae2 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -11,7 +11,7 @@ layer = BELOW_OBJ_LAYER -/obj/structure/Initialize() +/obj/structure/Initialize(mapload) if (!armor) armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) . = ..() diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index 369c7dc50d85..20f17484332a 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -120,7 +120,7 @@ var/growth_cooldown_high = 200 var/static/list/blacklisted_turfs -/obj/structure/alien/weeds/Initialize() +/obj/structure/alien/weeds/Initialize(mapload) pixel_x = -4 pixel_y = -4 //so the sprites line up right in the map editor . = ..() @@ -142,7 +142,7 @@ if(3) icon = 'icons/obj/smooth_structures/alien/weeds3.dmi' -/obj/structure/alien/weeds/Click(var/atom/A) +/obj/structure/alien/weeds/Click(atom/A) var/turf/T = loc if(T) if(istype(A, /mob/living/carbon)) @@ -181,7 +181,7 @@ var/lon_range = 4 var/node_range = NODERANGE -/obj/structure/alien/weeds/node/Initialize() +/obj/structure/alien/weeds/node/Initialize(mapload) icon = 'icons/obj/smooth_structures/alien/weednode.dmi' . = ..() set_light(lon_range) diff --git a/code/game/objects/structures/artstuff.dm b/code/game/objects/structures/artstuff.dm index 32a0f55ded1d..9d07af715228 100644 --- a/code/game/objects/structures/artstuff.dm +++ b/code/game/objects/structures/artstuff.dm @@ -61,7 +61,7 @@ pixel_x = 10 pixel_y = 9 -/obj/item/canvas/Initialize() +/obj/item/canvas/Initialize(mapload) . = ..() reset_grid() diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm index 43cac0f2f63d..38236af658f7 100644 --- a/code/game/objects/structures/barsigns.dm +++ b/code/game/objects/structures/barsigns.dm @@ -12,7 +12,7 @@ var/panel_open = FALSE var/datum/barsign/chosen_sign -/obj/structure/sign/barsign/Initialize() +/obj/structure/sign/barsign/Initialize(mapload) . = ..() set_sign(new /datum/barsign/hiddensigns/signoff) diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 9f0fa41e8a76..4530a9bc31a8 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -22,7 +22,7 @@ var/buildstackamount = 2 var/bolts = TRUE -/obj/structure/bed/Initialize() +/obj/structure/bed/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_bed, \ success_chance = 0.8, \ @@ -151,7 +151,7 @@ desc = "A collapsed roller bed that can be ejected for emergency use. Must be collected or replaced after use." var/obj/structure/bed/roller/loaded = null -/obj/item/roller/robo/Initialize() +/obj/item/roller/robo/Initialize(mapload) . = ..() loaded = new(src) @@ -228,7 +228,7 @@ can_buckle = TRUE density = FALSE -/obj/structure/bed/grip/Initialize() +/obj/structure/bed/grip/Initialize(mapload) . = ..() /obj/structure/bed/grip/post_unbuckle_mob(mob/living/M) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index eb1547392b4f..96fdddb814c8 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -20,7 +20,7 @@ if(can_buckle && !has_buckled_mobs()) . += span_notice("Drag your sprite to sit in it.") -/obj/structure/chair/Initialize() +/obj/structure/chair/Initialize(mapload) . = ..() if(!anchored) //why would you put these on the shuttle? addtimer(CALLBACK(src, PROC_REF(RemoveFromLatejoin)), 0) @@ -155,7 +155,7 @@ item_chair = null var/mutable_appearance/armrest -/obj/structure/chair/comfy/Initialize() +/obj/structure/chair/comfy/Initialize(mapload) armrest = GetArmrest() armrest.layer = ABOVE_MOB_LAYER return ..() diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm index b7aa1f65d2bd..17dcb21f34d0 100644 --- a/code/game/objects/structures/beds_chairs/pew.dm +++ b/code/game/objects/structures/beds_chairs/pew.dm @@ -14,7 +14,7 @@ icon_state = "pewend_left" var/mutable_appearance/leftpewarmrest -/obj/structure/chair/pew/left/Initialize() +/obj/structure/chair/pew/left/Initialize(mapload) leftpewarmrest = GetLeftPewArmrest() leftpewarmrest.layer = ABOVE_MOB_LAYER return ..() @@ -45,7 +45,7 @@ icon_state = "pewend_right" var/mutable_appearance/rightpewarmrest -/obj/structure/chair/pew/right/Initialize() +/obj/structure/chair/pew/right/Initialize(mapload) rightpewarmrest = GetRightPewArmrest() rightpewarmrest.layer = ABOVE_MOB_LAYER return ..() diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 359e8be8dd82..747009d314d1 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -279,7 +279,7 @@ LINEN BINS name = "random bedsheet" desc = "If you're reading this description ingame, something has gone wrong! Honk!" -/obj/item/bedsheet/random/Initialize() +/obj/item/bedsheet/random/Initialize(mapload) ..() var/list/sheets = list(typesof(/obj/item/bedsheet) - /obj/item/bedsheet/random) sheets = shuffle(sheets) @@ -298,7 +298,7 @@ LINEN BINS name = "random dorms bedsheet" desc = "If you're reading this description ingame, something has gone wrong! Honk!" -/obj/item/bedsheet/dorms/Initialize() +/obj/item/bedsheet/dorms/Initialize(mapload) ..() var/type = pickweight(list("Colors" = 80, "Special" = 20)) switch(type) diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 1fc3a90fbf2d..d72f1cac07c1 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -103,7 +103,7 @@ GLOBAL_LIST_EMPTY(lockers) else add_overlay("[icon_state]_open") -/obj/structure/closet/proc/animate_door(var/closing = FALSE) +/obj/structure/closet/proc/animate_door(closing = FALSE) if(!door_anim_time) return if(!door_obj) door_obj = new diff --git a/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm b/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm index a582f4e6ce1e..0b3cdd9700d0 100644 --- a/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm +++ b/code/game/objects/structures/crates_lockers/closets/bluespace_locker.dm @@ -32,7 +32,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/list/mirage_whitelist = list() -/obj/structure/closet/bluespace/internal/Initialize() +/obj/structure/closet/bluespace/internal/Initialize(mapload) if(SSbluespace_locker.internal_locker && SSbluespace_locker.internal_locker != src) return INITIALIZE_HINT_QDEL SSbluespace_locker.internal_locker = src @@ -141,7 +141,7 @@ T.turf_whitelist = mirage_whitelist T.update_mirage() -/obj/structure/closet/bluespace/external/Initialize() +/obj/structure/closet/bluespace/external/Initialize(mapload) if(SSbluespace_locker.external_locker && SSbluespace_locker.external_locker != src) return INITIALIZE_HINT_QDEL SSbluespace_locker.external_locker = src diff --git a/code/game/objects/structures/crates_lockers/closets/bodybag.dm b/code/game/objects/structures/crates_lockers/closets/bodybag.dm index b3b19dbe9c3e..7ef203bd313c 100644 --- a/code/game/objects/structures/crates_lockers/closets/bodybag.dm +++ b/code/game/objects/structures/crates_lockers/closets/bodybag.dm @@ -298,7 +298,7 @@ if(sinched && inner_bag && inner_bag.killing) add_overlay("kill_flash") -/obj/structure/closet/body_bag/environmental/prisoner/syndicate/Initialize() +/obj/structure/closet/body_bag/environmental/prisoner/syndicate/Initialize(mapload) . = ..() update_airtightness() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/crates_lockers/closets/infinite.dm b/code/game/objects/structures/crates_lockers/closets/infinite.dm index f91b21d0c2ed..a57c9de2c6e7 100644 --- a/code/game/objects/structures/crates_lockers/closets/infinite.dm +++ b/code/game/objects/structures/crates_lockers/closets/infinite.dm @@ -5,7 +5,7 @@ var/stop_replicating_at = 4 var/auto_close_time = 15 SECONDS // Set to 0 to disable auto-closing. -/obj/structure/closet/infinite/Initialize() +/obj/structure/closet/infinite/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 24faba37c51a..f23a15cbc9d4 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -9,7 +9,7 @@ recursive_organ_check(src) return ..() -/obj/structure/closet/secure_closet/freezer/Initialize() +/obj/structure/closet/secure_closet/freezer/Initialize(mapload) recursive_organ_check(src) return ..() diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index c95786346146..faadb6fba554 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -19,7 +19,7 @@ ///The time it takes to pry this open with a crowbar. var/pry_lid_timer = 25 SECONDS -/obj/structure/closet/crate/Initialize() +/obj/structure/closet/crate/Initialize(mapload) . = ..() if(icon_state == "[initial(icon_state)]open") opened = TRUE @@ -112,7 +112,7 @@ recursive_organ_check(src) return ..() -/obj/structure/closet/crate/freezer/Initialize() +/obj/structure/closet/crate/freezer/Initialize(mapload) recursive_organ_check(src) return ..() @@ -294,7 +294,7 @@ name = "goat crate" desc = "Contains a completly random goat from Goat Tech Industries that may or may not break the laws of science!" -/obj/structure/closet/crate/critter/exoticgoats/Initialize() +/obj/structure/closet/crate/critter/exoticgoats/Initialize(mapload) . = ..() var/loot = rand(1,40) //40 different goats! switch(loot) diff --git a/code/game/objects/structures/crates_lockers/crates/bins.dm b/code/game/objects/structures/crates_lockers/crates/bins.dm index e4f101a07ad4..f5dcce0f0782 100644 --- a/code/game/objects/structures/crates_lockers/crates/bins.dm +++ b/code/game/objects/structures/crates_lockers/crates/bins.dm @@ -8,7 +8,7 @@ open_flags = ALLOW_OBJECTS | ALLOW_DENSE delivery_icon = null -/obj/structure/closet/crate/bin/Initialize() +/obj/structure/closet/crate/bin/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm index dcc0883ecba8..74b9e7827d31 100644 --- a/code/game/objects/structures/crates_lockers/crates/critter.dm +++ b/code/game/objects/structures/crates_lockers/crates/critter.dm @@ -9,7 +9,7 @@ delivery_icon = "deliverybox" var/obj/item/tank/internals/emergency_oxygen/tank -/obj/structure/closet/crate/critter/Initialize() +/obj/structure/closet/crate/critter/Initialize(mapload) . = ..() tank = new diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm index 8a268250fa70..06feb41fda5b 100644 --- a/code/game/objects/structures/displaycase.dm +++ b/code/game/objects/structures/displaycase.dm @@ -20,7 +20,7 @@ var/trophy_message = "" var/glass_fix = TRUE -/obj/structure/displaycase/Initialize() +/obj/structure/displaycase/Initialize(mapload) . = ..() if(start_showpieces.len && !start_showpiece_type) var/list/showpiece_entry = pick(start_showpieces) @@ -257,7 +257,7 @@ integrity_failure = 0 openable = FALSE -/obj/structure/displaycase/trophy/Initialize() +/obj/structure/displaycase/trophy/Initialize(mapload) . = ..() GLOB.trophy_cases += src diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm index f895029e139c..f7756fab8ffd 100644 --- a/code/game/objects/structures/door_assembly.dm +++ b/code/game/objects/structures/door_assembly.dm @@ -20,7 +20,7 @@ var/material_type = /obj/item/stack/sheet/metal var/material_amt = 4 -/obj/structure/door_assembly/Initialize() +/obj/structure/door_assembly/Initialize(mapload) . = ..() update_icon() update_name() diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm index a7e0e80c69b2..7d0ea0b47e9d 100644 --- a/code/game/objects/structures/electricchair.dm +++ b/code/game/objects/structures/electricchair.dm @@ -6,7 +6,7 @@ var/last_time = 1 item_chair = null -/obj/structure/chair/e_chair/Initialize() +/obj/structure/chair/e_chair/Initialize(mapload) . = ..() add_overlay(mutable_appearance('icons/obj/chairs.dmi', "echair_over", MOB_LAYER + 1)) diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 2bf3d657577b..ebe4f37d2b2d 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -33,7 +33,7 @@ var/opening = FALSE -/obj/structure/falsewall/Initialize() +/obj/structure/falsewall/Initialize(mapload) . = ..() air_update_turf(TRUE) diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 205d211b25d7..858181cf5812 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -23,7 +23,7 @@ var/hole_size= NO_HOLE var/invulnerable = FALSE -/obj/structure/fence/Initialize() +/obj/structure/fence/Initialize(mapload) . = ..() update_cut_status() @@ -111,7 +111,7 @@ cuttable = FALSE var/open = FALSE -/obj/structure/fence/door/Initialize() +/obj/structure/fence/door/Initialize(mapload) . = ..() update_door_status() diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm index 1c2a78f1dccd..49548bf352c4 100644 --- a/code/game/objects/structures/fireaxe.dm +++ b/code/game/objects/structures/fireaxe.dm @@ -16,9 +16,9 @@ var/alert = TRUE var/axe = TRUE -//yogs NOTICE - Initialize() function MIRRORED to yogstation/code/game/objects/structure/fireaxe.dm +//yogs NOTICE - Initialize(mapload) function MIRRORED to yogstation/code/game/objects/structure/fireaxe.dm //changes made to the below function will have no effect -/obj/structure/fireaxecabinet/Initialize() +/obj/structure/fireaxecabinet/Initialize(mapload) . = ..() fireaxe = new update_icon() @@ -266,7 +266,7 @@ armor = list(MELEE = 30, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, BIO = 100, RAD = 100, FIRE = 90, ACID = 50) axe = FALSE -/obj/structure/fireaxecabinet/bridge/spare/Initialize() +/obj/structure/fireaxecabinet/bridge/spare/Initialize(mapload) . = ..() fireaxe = null spareid = new(src) @@ -304,7 +304,7 @@ alert = FALSE req_access = list(ACCESS_MEDICAL, ACCESS_MINING) -/obj/structure/fireaxecabinet/fishingrod/Initialize() +/obj/structure/fireaxecabinet/fishingrod/Initialize(mapload) . = ..() fireaxe = null olreliable = new(src) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 3cd025c90e20..93a4cacd3c57 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -47,7 +47,7 @@ icon_state = "pine_1" var/list/icon_states = list("pine_1", "pine_2", "pine_3") -/obj/structure/flora/tree/pine/Initialize() +/obj/structure/flora/tree/pine/Initialize(mapload) . = ..() if(islist(icon_states && icon_states.len)) @@ -66,7 +66,7 @@ var/unlimited = FALSE var/static/list/took_presents //shared between all xmas trees -/obj/structure/flora/tree/pine/xmas/presents/Initialize() +/obj/structure/flora/tree/pine/xmas/presents/Initialize(mapload) . = ..() if(!took_presents) took_presents = list() @@ -103,7 +103,7 @@ desc = "A tree straight from the tropics." icon_state = "palm1" -/obj/structure/flora/tree/palm/Initialize() +/obj/structure/flora/tree/palm/Initialize(mapload) . = ..() icon_state = pick("palm1","palm2") pixel_x = 0 @@ -124,7 +124,7 @@ name = "pole" desc = "Don't think too hard about what it'll be used for." -/obj/structure/flora/tree/dead/Initialize() +/obj/structure/flora/tree/dead/Initialize(mapload) icon_state = "tree_[rand(1, 6)]" . = ..() @@ -136,7 +136,7 @@ pixel_x = -48 pixel_y = -20 -/obj/structure/flora/tree/jungle/Initialize() +/obj/structure/flora/tree/jungle/Initialize(mapload) icon_state = "[icon_state][rand(1, 6)]" . = ..() @@ -155,7 +155,7 @@ /obj/structure/flora/grass/brown icon_state = "snowgrass1bb" -/obj/structure/flora/grass/brown/Initialize() +/obj/structure/flora/grass/brown/Initialize(mapload) icon_state = "snowgrass[rand(1, 3)]bb" . = ..() @@ -163,14 +163,14 @@ /obj/structure/flora/grass/green icon_state = "snowgrass1gb" -/obj/structure/flora/grass/green/Initialize() +/obj/structure/flora/grass/green/Initialize(mapload) icon_state = "snowgrass[rand(1, 3)]gb" . = ..() /obj/structure/flora/grass/both icon_state = "snowgrassall1" -/obj/structure/flora/grass/both/Initialize() +/obj/structure/flora/grass/both/Initialize(mapload) icon_state = "snowgrassall[rand(1, 3)]" . = ..() @@ -183,7 +183,7 @@ icon_state = "snowbush1" anchored = TRUE -/obj/structure/flora/bush/Initialize() +/obj/structure/flora/bush/Initialize(mapload) icon_state = "snowbush[rand(1, 6)]" . = ..() @@ -195,7 +195,7 @@ icon = 'icons/obj/flora/ausflora.dmi' icon_state = "firstbush_1" -/obj/structure/flora/ausbushes/Initialize() +/obj/structure/flora/ausbushes/Initialize(mapload) if(icon_state == "firstbush_1") icon_state = "firstbush_[rand(1, 4)]" . = ..() @@ -203,105 +203,105 @@ /obj/structure/flora/ausbushes/reedbush icon_state = "reedbush_1" -/obj/structure/flora/ausbushes/reedbush/Initialize() +/obj/structure/flora/ausbushes/reedbush/Initialize(mapload) icon_state = "reedbush_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/leafybush icon_state = "leafybush_1" -/obj/structure/flora/ausbushes/leafybush/Initialize() +/obj/structure/flora/ausbushes/leafybush/Initialize(mapload) icon_state = "leafybush_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/palebush icon_state = "palebush_1" -/obj/structure/flora/ausbushes/palebush/Initialize() +/obj/structure/flora/ausbushes/palebush/Initialize(mapload) icon_state = "palebush_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/stalkybush icon_state = "stalkybush_1" -/obj/structure/flora/ausbushes/stalkybush/Initialize() +/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload) icon_state = "stalkybush_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/grassybush icon_state = "grassybush_1" -/obj/structure/flora/ausbushes/grassybush/Initialize() +/obj/structure/flora/ausbushes/grassybush/Initialize(mapload) icon_state = "grassybush_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/fernybush icon_state = "fernybush_1" -/obj/structure/flora/ausbushes/fernybush/Initialize() +/obj/structure/flora/ausbushes/fernybush/Initialize(mapload) icon_state = "fernybush_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/sunnybush icon_state = "sunnybush_1" -/obj/structure/flora/ausbushes/sunnybush/Initialize() +/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload) icon_state = "sunnybush_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/genericbush icon_state = "genericbush_1" -/obj/structure/flora/ausbushes/genericbush/Initialize() +/obj/structure/flora/ausbushes/genericbush/Initialize(mapload) icon_state = "genericbush_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/pointybush icon_state = "pointybush_1" -/obj/structure/flora/ausbushes/pointybush/Initialize() +/obj/structure/flora/ausbushes/pointybush/Initialize(mapload) icon_state = "pointybush_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/lavendergrass icon_state = "lavendergrass_1" -/obj/structure/flora/ausbushes/lavendergrass/Initialize() +/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload) icon_state = "lavendergrass_[rand(1, 4)]" . = ..() /obj/structure/flora/ausbushes/ywflowers icon_state = "ywflowers_1" -/obj/structure/flora/ausbushes/ywflowers/Initialize() +/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload) icon_state = "ywflowers_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/brflowers icon_state = "brflowers_1" -/obj/structure/flora/ausbushes/brflowers/Initialize() +/obj/structure/flora/ausbushes/brflowers/Initialize(mapload) icon_state = "brflowers_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/ppflowers icon_state = "ppflowers_1" -/obj/structure/flora/ausbushes/ppflowers/Initialize() +/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload) icon_state = "ppflowers_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/sparsegrass icon_state = "sparsegrass_1" -/obj/structure/flora/ausbushes/sparsegrass/Initialize() +/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload) icon_state = "sparsegrass_[rand(1, 3)]" . = ..() /obj/structure/flora/ausbushes/fullgrass icon_state = "fullgrass_1" -/obj/structure/flora/ausbushes/fullgrass/Initialize() +/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload) icon_state = "fullgrass_[rand(1, 3)]" . = ..() @@ -317,7 +317,7 @@ throw_speed = 2 throw_range = 4 -/obj/item/twohanded/required/kirbyplants/Initialize() +/obj/item/twohanded/required/kirbyplants/Initialize(mapload) . = ..() AddComponent(/datum/component/tactical) @@ -326,7 +326,7 @@ icon_state = "random_plant" var/list/static/states -/obj/item/twohanded/required/kirbyplants/random/Initialize() +/obj/item/twohanded/required/kirbyplants/random/Initialize(mapload) . = ..() icon = 'icons/obj/flora/plants.dmi' if(!states) @@ -357,7 +357,7 @@ light_color = "#2cb2e8" light_range = 3 -/obj/item/twohanded/required/kirbyplants/Initialize() +/obj/item/twohanded/required/kirbyplants/Initialize(mapload) . = ..() AddComponent(/datum/component/storage/concrete/kirbyplants) @@ -377,7 +377,7 @@ density = TRUE var/obj/item/stack/mineResult = /obj/item/stack/ore/glass/basalt -/obj/structure/flora/rock/Initialize() +/obj/structure/flora/rock/Initialize(mapload) . = ..() icon_state = "[icon_state][rand(1,3)]" @@ -406,7 +406,7 @@ icon_state = "grassa" -/obj/structure/flora/grass/jungle/Initialize() +/obj/structure/flora/grass/jungle/Initialize(mapload) icon_state = "[icon_state][rand(1, 5)]" . = ..() @@ -422,7 +422,7 @@ icon = 'icons/obj/flora/jungleflora.dmi' density = FALSE -/obj/structure/flora/rock/jungle/Initialize() +/obj/structure/flora/rock/jungle/Initialize(mapload) . = ..() icon_state = "[initial(icon_state)][rand(1,5)]" @@ -435,7 +435,7 @@ icon = 'icons/obj/flora/jungleflora.dmi' icon_state = "busha" -/obj/structure/flora/junglebush/Initialize() +/obj/structure/flora/junglebush/Initialize(mapload) icon_state = "[icon_state][rand(1, 3)]" . = ..() @@ -460,7 +460,7 @@ pixel_x = -16 pixel_y = -16 -/obj/structure/flora/rock/pile/largejungle/Initialize() +/obj/structure/flora/rock/pile/largejungle/Initialize(mapload) . = ..() icon_state = "[initial(icon_state)][rand(1,3)]" diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 38a7e2b3884c..fa60e3d5d10a 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -66,7 +66,7 @@ return list("mode" = RCD_WINDOWGRILLE, "delay" = 20, "cost" = 8) return FALSE -/obj/structure/grille/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd, passed_mode) +/obj/structure/grille/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) to_chat(user, span_notice("You deconstruct the grille.")) @@ -300,7 +300,7 @@ grille_type = /obj/structure/grille broken_type = null -/obj/structure/grille/broken/Initialize() +/obj/structure/grille/broken/Initialize(mapload) . = ..() holes = (holes | 16) update_icon() @@ -313,7 +313,7 @@ broken_type = /obj/structure/grille/ratvar/broken smooth = SMOOTH_FALSE -/obj/structure/grille/ratvar/Initialize() +/obj/structure/grille/ratvar/Initialize(mapload) . = ..() if(broken) new /obj/effect/temp_visual/ratvar/grille/broken(get_turf(src)) diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm index ece0495a25f0..86aa95896041 100644 --- a/code/game/objects/structures/guillotine.dm +++ b/code/game/objects/structures/guillotine.dm @@ -29,7 +29,7 @@ var/kill_count = 0 var/current_action = 0 // What's currently happening to the guillotine -/obj/structure/guillotine/Initialize() +/obj/structure/guillotine/Initialize(mapload) LAZYINITLIST(buckled_mobs) . = ..() diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm index 68c1f77770b4..258ef6579213 100644 --- a/code/game/objects/structures/headpike.dm +++ b/code/game/objects/structures/headpike.dm @@ -34,7 +34,7 @@ spear = locate(/obj/item/twohanded/bamboospear) in parts_list ..() -/obj/structure/headpike/Initialize() +/obj/structure/headpike/Initialize(mapload) . = ..() pixel_x = rand(-8, 8) diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm index 86a7b7cc5362..9b41a2331ccd 100644 --- a/code/game/objects/structures/hivebot.dm +++ b/code/game/objects/structures/hivebot.dm @@ -8,7 +8,7 @@ var/bot_type = "norm" var/bot_amt = 10 -/obj/structure/hivebot_beacon/Initialize() +/obj/structure/hivebot_beacon/Initialize(mapload) . = ..() var/datum/effect_system/fluid_spread/smoke/smoke = new smoke.set_up(2, location = loc) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 0e74f21c660f..57844bb77b00 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -15,7 +15,7 @@ projector.signs += src ..() -/obj/structure/holosign/Initialize() +/obj/structure/holosign/Initialize(mapload) . = ..() alpha = 0 SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it @@ -53,7 +53,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "holosign_banana" -/obj/structure/holosign/holobanana/Initialize() +/obj/structure/holosign/holobanana/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 120, GALOSHES_DONT_HELP) @@ -115,7 +115,7 @@ flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 rad_insulation = RAD_LIGHT_INSULATION -/obj/structure/holosign/barrier/atmos/Initialize() +/obj/structure/holosign/barrier/atmos/Initialize(mapload) . = ..() air_update_turf(TRUE) @@ -202,7 +202,7 @@ projector = null return ..() -/obj/structure/holobed/Initialize() +/obj/structure/holobed/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_bed, \ success_chance = 0.8, \ diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 038318bcfa7f..d82c20a91e63 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -13,7 +13,7 @@ anchored = TRUE resistance_flags = INDESTRUCTIBLE // no you can't destroy a hole unfortunately -/obj/structure/spawner/ice_moon/Initialize() +/obj/structure/spawner/ice_moon/Initialize(mapload) . = ..() clear_rock() diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 1effa44b3076..37bb885f2d59 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -19,7 +19,7 @@ var/const/max_signs = 4 -/obj/structure/janitorialcart/Initialize() +/obj/structure/janitorialcart/Initialize(mapload) . = ..() create_reagents(100, OPENCONTAINER) diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 588e726ac71e..e894818d15bc 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -148,7 +148,7 @@ var/id var/height = 0 // higher numbers are considered physically higher -/obj/structure/ladder/unbreakable/Initialize() +/obj/structure/ladder/unbreakable/Initialize(mapload) GLOB.ladders += src return ..() diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 66d0f9e77615..385115227669 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -121,7 +121,7 @@ true_name = "strange geyser" discovery_message = "It's a strange geyser! How does any of this even work?" //it doesnt -/obj/structure/geyser/random/Initialize() +/obj/structure/geyser/random/Initialize(mapload) . = ..() reagent_id = get_random_reagent_id() diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm index 648265d55668..520f9dfc15c7 100644 --- a/code/game/objects/structures/lavaland/necropolis_tendril.dm +++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm @@ -32,7 +32,7 @@ mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing) GLOBAL_LIST_INIT(tendrils, list()) -/obj/structure/spawner/lavaland/Initialize() +/obj/structure/spawner/lavaland/Initialize(mapload) . = ..() emitted_light = new(loc) for(var/F in RANGE_TURFS(1, src)) @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(tendrils, list()) density = TRUE var/obj/effect/light_emitter/tendril/emitted_light -/obj/effect/collapse/Initialize() +/obj/effect/collapse/Initialize(mapload) . = ..() emitted_light = new(loc) visible_message(span_boldannounce("The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!")) diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 52f42d37e2cf..a30ff698a722 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -184,7 +184,7 @@ resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF var/obj/machinery/manned_turret/turret -/obj/item/gun_control/Initialize() +/obj/item/gun_control/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) turret = loc diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index cbc91d16d46a..3dbc37c7fb3b 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -26,7 +26,7 @@ var/sheetType = /obj/item/stack/sheet/metal //what we're made of var/sheetAmount = 7 //how much we drop when deconstructed -/obj/structure/mineral_door/Initialize() +/obj/structure/mineral_door/Initialize(mapload) . = ..() air_update_turf(TRUE) @@ -301,7 +301,7 @@ resistance_flags = FLAMMABLE max_integrity = 20 -/obj/structure/mineral_door/paperframe/Initialize() +/obj/structure/mineral_door/paperframe/Initialize(mapload) . = ..() queue_smooth_neighbors(src) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index 843185bcc24e..300cc049d6c4 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -8,7 +8,7 @@ var/obj/item/mop/ourmop //if there's a mop in the bucket -/obj/structure/mopbucket/Initialize() +/obj/structure/mopbucket/Initialize(mapload) . = ..() create_reagents(100, OPENCONTAINER) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index a164eca7a0dd..f02d14fe7fe4 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an var/message_cooldown var/breakout_time = 600 -/obj/structure/bodycontainer/Initialize() +/obj/structure/bodycontainer/Initialize(mapload) . = ..() GLOB.bodycontainers += src recursive_organ_check(src) @@ -157,7 +157,7 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an var/beep_cooldown = 50 var/next_beep = 0 -/obj/structure/bodycontainer/morgue/Initialize() +/obj/structure/bodycontainer/morgue/Initialize(mapload) . = ..() connected = new/obj/structure/tray/m_tray(src) connected.connected = src @@ -227,7 +227,7 @@ GLOBAL_LIST_EMPTY(crematoriums) GLOB.crematoriums.Add(src) ..() -/obj/structure/bodycontainer/crematorium/Initialize() +/obj/structure/bodycontainer/crematorium/Initialize(mapload) . = ..() connected = new /obj/structure/tray/c_tray(src) connected.connected = src diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 295547062eb8..a47afc12f122 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -11,7 +11,7 @@ /obj/structure/plasticflaps/opaque opacity = TRUE -/obj/structure/plasticflaps/Initialize() +/obj/structure/plasticflaps/Initialize(mapload) . = ..() alpha = 0 SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it @@ -101,7 +101,7 @@ new /obj/item/stack/sheet/plastic/five(loc) qdel(src) -/obj/structure/plasticflaps/Initialize() +/obj/structure/plasticflaps/Initialize(mapload) . = ..() air_update_turf(TRUE) diff --git a/code/game/objects/structures/railings.dm b/code/game/objects/structures/railings.dm index 5ee37f0ab736..04ee6362afef 100644 --- a/code/game/objects/structures/railings.dm +++ b/code/game/objects/structures/railings.dm @@ -17,7 +17,7 @@ density = FALSE climbable = FALSE -/obj/structure/railing/Initialize() +/obj/structure/railing/Initialize(mapload) . = ..() ini_dir = dir AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ,null,CALLBACK(src, PROC_REF(can_be_rotated)),CALLBACK(src, PROC_REF(after_rotation))) diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 63b4bd31fdfb..1ad59875e691 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -17,7 +17,7 @@ var/list/allowed_projectile_typecache = list(/obj/item/projectile/beam, /obj/item/projectile/energy/nuclear_particle) var/rotation_angle = -1 -/obj/structure/reflector/Initialize() +/obj/structure/reflector/Initialize(mapload) . = ..() icon_state = "reflector_base" allowed_projectile_typecache = typecacheof(allowed_projectile_typecache) diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index bf4aeeb4303d..e91ad62ea2fb 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -17,7 +17,7 @@ icon = 'icons/obj/computer.dmi' icon_state = "computer" -/obj/structure/showcase/fakeid/Initialize() +/obj/structure/showcase/fakeid/Initialize(mapload) . = ..() add_overlay("id") add_overlay("id_key") @@ -28,7 +28,7 @@ icon = 'icons/obj/computer.dmi' icon_state = "computer" -/obj/structure/showcase/fakesec/Initialize() +/obj/structure/showcase/fakesec/Initialize(mapload) . = ..() add_overlay("security") add_overlay("security_key") diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index 530d79e765b8..5f691e267775 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -15,7 +15,7 @@ var/reagent_id = /datum/reagent/water var/reaction_volume = 200 -/obj/machinery/shower/Initialize() +/obj/machinery/shower/Initialize(mapload) . = ..() create_reagents(reaction_volume) reagents.add_reagent(reagent_id, reaction_volume) diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index 81238cb51d31..3a01b3dac254 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -15,7 +15,7 @@ var/faction = list("hostile") var/spawner_type = /datum/component/spawner -/obj/structure/spawner/Initialize() +/obj/structure/spawner/Initialize(mapload) . = ..() AddComponent(spawner_type, mob_types, spawn_time, faction, spawn_text, max_mobs) diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm index f14d79a202fe..d6cf13581371 100644 --- a/code/game/objects/structures/statues.dm +++ b/code/game/objects/structures/statues.dm @@ -16,7 +16,7 @@ var/impressiveness = 15 CanAtmosPass = ATMOS_PASS_DENSITY -/obj/structure/statue/Initialize() +/obj/structure/statue/Initialize(mapload) . = ..() AddComponent(/datum/component/art, impressiveness) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index f13373ea01ae..e4ab0a7fae97 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -103,7 +103,7 @@ framestack = /obj/item/stack/tile/brass framestackamount = 1 -/obj/structure/table_frame/brass/Initialize() +/obj/structure/table_frame/brass/Initialize(mapload) . = ..() change_construction_value(1) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 60a388261bd1..e8e0eee656b0 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -34,7 +34,7 @@ smooth = SMOOTH_TRUE canSmoothWith = list(/obj/structure/table, /obj/structure/table/reinforced) -/obj/structure/table/Initialize() +/obj/structure/table/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_bed, \ success_chance = 0.8, \ @@ -259,7 +259,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 100) var/list/debris = list() -/obj/structure/table/glass/Initialize() +/obj/structure/table/glass/Initialize(mapload) . = ..() debris += new frame debris += new /obj/item/shard @@ -371,9 +371,9 @@ /obj/structure/table/wood/fancy/red, /obj/structure/table/wood/fancy/royalblack, /obj/structure/table/wood/fancy/royalblue) - var/smooth_icon = 'icons/obj/smooth_structures/fancy_table.dmi' // see Initialize() + var/smooth_icon = 'icons/obj/smooth_structures/fancy_table.dmi' // see Initialize(mapload) -/obj/structure/table/wood/fancy/Initialize() +/obj/structure/table/wood/fancy/Initialize(mapload) . = ..() // Needs to be set dynamically because table smooth sprites are 32x34, // which the editor treats as a two-tile-tall object. The sprites are that @@ -477,7 +477,7 @@ buildstackamount = 1 canSmoothWith = list(/obj/structure/table/reinforced/brass, /obj/structure/table/bronze) -/obj/structure/table/reinforced/brass/Initialize() +/obj/structure/table/reinforced/brass/Initialize(mapload) . = ..() change_construction_value(2) @@ -527,7 +527,7 @@ can_buckle = TRUE buckle_requires_restraints = TRUE -/obj/structure/table/optable/Initialize() +/obj/structure/table/optable/Initialize(mapload) . = ..() AddComponent(/datum/component/surgery_bed, \ success_chance = 1, \ @@ -539,7 +539,7 @@ pushed_mob.set_resting(TRUE, TRUE) visible_message(span_notice("[user] lays [pushed_mob] on [src].")) -/obj/structure/table/optable/debug/Initialize() +/obj/structure/table/optable/debug/Initialize(mapload) . = ..() var/datum/component/surgery_bed/SB = GetComponent(/datum/component/surgery_bed) SB.extra_surgeries = subtypesof(/datum/surgery) diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm index e444e73b84b0..d2b91fa512e7 100644 --- a/code/game/objects/structures/tank_dispenser.dm +++ b/code/game/objects/structures/tank_dispenser.dm @@ -17,7 +17,7 @@ /obj/structure/tank_dispenser/plasma oxygentanks = 0 -/obj/structure/tank_dispenser/Initialize() +/obj/structure/tank_dispenser/Initialize(mapload) . = ..() for(var/i in 1 to oxygentanks) new /obj/item/tank/internals/oxygen(src) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm index 60cfb465db0d..839218fd15cf 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm @@ -25,7 +25,7 @@ return FALSE return TRUE -/obj/structure/c_transit_tube/Initialize() +/obj/structure/c_transit_tube/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_FLIP | ROTATION_VERBS,null,null,CALLBACK(src, PROC_REF(after_rot))) diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index ee2906ab84bf..99e985c417c3 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -8,7 +8,7 @@ var/datum/gas_mixture/air_contents = new() var/cargo = FALSE -/obj/structure/transit_tube_pod/Initialize() +/obj/structure/transit_tube_pod/Initialize(mapload) . = ..() air_contents.set_moles(/datum/gas/oxygen, MOLES_O2STANDARD) air_contents.set_moles(/datum/gas/nitrogen, MOLES_N2STANDARD) diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 2f538d929099..bb69083351c9 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -137,6 +137,6 @@ density = TRUE time_between_triggers = 2 MINUTES //Exists for 2 minutes -/obj/structure/trap/ward/Initialize() +/obj/structure/trap/ward/Initialize(mapload) . = ..() QDEL_IN(src, time_between_triggers) diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 2b574b751802..d1c3f214b08d 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -11,7 +11,7 @@ var/mob/living/swirlie = null //the mob being given a swirlie -/obj/structure/toilet/Initialize() +/obj/structure/toilet/Initialize(mapload) . = ..() open = round(rand(0, 1)) update_icon() @@ -131,7 +131,7 @@ var/exposed = 0 // can you currently put an item inside var/obj/item/hiddenitem = null // what's in the urinal -/obj/structure/urinal/Initialize() +/obj/structure/urinal/Initialize(mapload) . = ..() hiddenitem = new /obj/item/reagent_containers/food/snacks/urinalcake diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index e92d423887d7..f96d2a764bc1 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -313,7 +313,7 @@ -/obj/structure/windoor_assembly/Initialize() +/obj/structure/windoor_assembly/Initialize(mapload) . = ..() var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS AddComponent(/datum/component/simple_rotation, rotation_flags, can_be_rotated=CALLBACK(src, PROC_REF(can_be_rotated)), after_rotation=CALLBACK(src, PROC_REF(after_rotation))) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index cda936881ad6..a1efbe1afd29 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -70,7 +70,7 @@ return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 5) return FALSE -/obj/structure/window/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd) +/obj/structure/window/rcd_act(mob/user, obj/item/construction/rcd/the_rcd) if (resistance_flags & INDESTRUCTIBLE) return FALSE @@ -871,7 +871,7 @@ var/static/mutable_appearance/torn = mutable_appearance('icons/obj/smooth_structures/paperframes.dmi',icon_state = "torn", layer = ABOVE_OBJ_LAYER - 0.1) var/static/mutable_appearance/paper = mutable_appearance('icons/obj/smooth_structures/paperframes.dmi',icon_state = "paper", layer = ABOVE_OBJ_LAYER - 0.1) -/obj/structure/window/paperframe/Initialize() +/obj/structure/window/paperframe/Initialize(mapload) . = ..() update_icon() diff --git a/code/game/say.dm b/code/game/say.dm index 8ba42855c4cb..e7645a999198 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(freqtospan, list( //yogs end )) -/atom/movable/proc/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/atom/movable/proc/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(!can_speak(message)) return if(message == "" || !message) diff --git a/code/game/turfs/baseturf_skipover.dm b/code/game/turfs/baseturf_skipover.dm index 4df8c86e624e..9bef78a15ea1 100644 --- a/code/game/turfs/baseturf_skipover.dm +++ b/code/game/turfs/baseturf_skipover.dm @@ -3,7 +3,7 @@ name = "Baseturf skipover placeholder" desc = "This shouldn't exist" -/turf/baseturf_skipover/Initialize() +/turf/baseturf_skipover/Initialize(mapload) . = ..() stack_trace("[src]([type]) was instanced which should never happen. Changing into the next baseturf down...") ScrapeAway() diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm index 4c4195f54a78..a2e6ba03b463 100644 --- a/code/game/turfs/closed.dm +++ b/code/game/turfs/closed.dm @@ -6,7 +6,7 @@ flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 rad_insulation = RAD_MEDIUM_INSULATION -/turf/closed/Initialize() +/turf/closed/Initialize(mapload) . = ..() update_air_ref() @@ -108,7 +108,7 @@ smooth = SMOOTH_TRUE icon = 'icons/obj/smooth_structures/reinforced_window.dmi' -/turf/closed/indestructible/fakeglass/Initialize() +/turf/closed/indestructible/fakeglass/Initialize(mapload) . = ..() icon_state = null //set the icon state to null, so our base state isn't visible underlays += mutable_appearance('icons/obj/structures.dmi', "grille") //add a grille underlay @@ -121,7 +121,7 @@ smooth = SMOOTH_TRUE icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' -/turf/closed/indestructible/opsglass/Initialize() +/turf/closed/indestructible/opsglass/Initialize(mapload) . = ..() icon_state = null underlays += mutable_appearance('icons/obj/structures.dmi', "grille") diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 687a5efde31e..8a361f3306a9 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -86,7 +86,7 @@ heavyfootstep = FOOTSTEP_LAVA tiled_dirt = FALSE -/turf/open/indestructible/necropolis/Initialize() +/turf/open/indestructible/necropolis/Initialize(mapload) . = ..() if(prob(12)) icon_state = "necro[rand(2,3)]" @@ -314,7 +314,7 @@ light_color = "#AAD84B" color = "#53003f" -/turf/open/floor/grass/fairy/Initialize() +/turf/open/floor/grass/fairy/Initialize(mapload) . = ..() icon_state = "fairygrass[rand(1,4)]" update_icon() @@ -443,7 +443,7 @@ /turf/open/indestructible/brazil/necropolis icon_state = "necro1" -/turf/open/indestructible/brazil/necropolis/Initialize() +/turf/open/indestructible/brazil/necropolis/Initialize(mapload) . = ..() if(prob(12)) icon_state = "necro[rand(2,3)]" diff --git a/code/game/turfs/openspace/openspace.dm b/code/game/turfs/openspace/openspace.dm index 1cf670c3da6e..bede41475210 100644 --- a/code/game/turfs/openspace/openspace.dm +++ b/code/game/turfs/openspace/openspace.dm @@ -12,7 +12,7 @@ ..() return TRUE -/turf/open/openspace/Initialize() // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker +/turf/open/openspace/Initialize(mapload) // handle plane and layer here so that they don't cover other obs/turfs in Dream Maker . = ..() plane = FLOOR_OPENSPACE_PLANE layer = OPENSPACE_LAYER diff --git a/code/game/turfs/simulated/chasm.dm b/code/game/turfs/simulated/chasm.dm index 936050ada576..482a7a9a7a7e 100644 --- a/code/game/turfs/simulated/chasm.dm +++ b/code/game/turfs/simulated/chasm.dm @@ -10,7 +10,7 @@ density = TRUE //This will prevent hostile mobs from pathing into chasms, while the canpass override will still let it function like an open turf bullet_bounce_sound = null //abandon all hope ye who enter -/turf/open/chasm/Initialize() +/turf/open/chasm/Initialize(mapload) . = ..() AddComponent(/datum/component/chasm, SSmapping.get_turf_below(src)) @@ -121,7 +121,7 @@ light_power = 0.65 CanAtmosPass = ATMOS_PASS_NO -/turf/open/chasm/magic/Initialize() +/turf/open/chasm/magic/Initialize(mapload) . = ..() var/turf/T = pick(get_area_turfs(/area/fabric_of_reality)) if(T) diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/simulated/dirtystation.dm index 0461db29e5b3..831656da730c 100644 --- a/code/game/turfs/simulated/dirtystation.dm +++ b/code/game/turfs/simulated/dirtystation.dm @@ -8,7 +8,7 @@ //Making the station dirty, one tile at a time. Called by master controller's setup_objects /turf/open/floor/proc/MakeDirty() - // We start with a 1/3 chance of having this proc called by Initialize() + // We start with a 1/3 chance of having this proc called by Initialize(mapload) if(!(flags_1 & CAN_BE_DIRTY_1)) return diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm index 2789469e486c..3ae163c2e448 100644 --- a/code/game/turfs/simulated/floor/fancy_floor.dm +++ b/code/game/turfs/simulated/floor/fancy_floor.dm @@ -193,7 +193,7 @@ var/turfverb = "uproot" tiled_dirt = FALSE -/turf/open/floor/grass/Initialize() +/turf/open/floor/grass/Initialize(mapload) . = ..() if(src.type == /turf/open/floor/grass) //don't want grass subtypes getting the icon state, icon_state = "grass[rand(1,4)]" @@ -239,7 +239,7 @@ initial_gas_mix = LAVALAND_DEFAULT_ATMOS slowdown = 0 -/turf/open/floor/grass/snow/basalt/Initialize() +/turf/open/floor/grass/snow/basalt/Initialize(mapload) . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" @@ -263,7 +263,7 @@ clawfootstep = FOOTSTEP_SAND heavyfootstep = FOOTSTEP_GENERIC_HEAVY -/turf/open/floor/grass/fakebasalt/Initialize() +/turf/open/floor/grass/fakebasalt/Initialize(mapload) . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" @@ -291,7 +291,7 @@ . = ..() . += span_notice("There's a small crack on the edge of it.") -/turf/open/floor/carpet/Initialize() +/turf/open/floor/carpet/Initialize(mapload) . = ..() update_icon() @@ -433,7 +433,7 @@ plane = PLANE_SPACE tiled_dirt = FALSE -/turf/open/floor/fakespace/Initialize() +/turf/open/floor/fakespace/Initialize(mapload) . = ..() icon_state = SPACE_ICON_STATE diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm index b890683f6af5..75b94e76ea9c 100644 --- a/code/game/turfs/simulated/floor/light_floor.dm +++ b/code/game/turfs/simulated/floor/light_floor.dm @@ -32,7 +32,7 @@ "z" = image(icon = src.icon, icon_state = "light_on-z") ) -/turf/open/floor/light/Initialize() +/turf/open/floor/light/Initialize(mapload) . = ..() update_icon() if(!length(lighttile_designs)) diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm index e99722885d0d..d575fdfb7347 100644 --- a/code/game/turfs/simulated/floor/mineral_floor.dm +++ b/code/game/turfs/simulated/floor/mineral_floor.dm @@ -16,7 +16,7 @@ tiled_dirt = FALSE -/turf/open/floor/mineral/Initialize() +/turf/open/floor/mineral/Initialize(mapload) if(!broken_states) broken_states = list("[initial(icon_state)]_dam") . = ..() @@ -320,7 +320,7 @@ icons = list("alienpod1", "alienpod2", "alienpod3", "alienpod4", "alienpod5", "alienpod6", "alienpod7", "alienpod8", "alienpod9") baseturfs = /turf/open/floor/plating/abductor2 -/turf/open/floor/mineral/abductor/Initialize() +/turf/open/floor/mineral/abductor/Initialize(mapload) . = ..() icon_state = "alienpod[rand(1,9)]" diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm index bb8bd5a8ec7e..69254b140a13 100644 --- a/code/game/turfs/simulated/floor/misc_floor.dm +++ b/code/game/turfs/simulated/floor/misc_floor.dm @@ -18,7 +18,7 @@ floor_tile = /obj/item/stack/tile/circuit var/on = TRUE -/turf/open/floor/circuit/Initialize() +/turf/open/floor/circuit/Initialize(mapload) SSmapping.nuke_tiles += src update_icon() . = ..() @@ -168,7 +168,7 @@ /turf/open/floor/clockwork/Bless() //Who needs holy blessings when you have DADDY RATVAR? return -/turf/open/floor/clockwork/Initialize() +/turf/open/floor/clockwork/Initialize(mapload) . = ..() if(uses_overlay) new /obj/effect/temp_visual/ratvar/floor(src) diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm index 947be76e60d9..a4907cbc81de 100644 --- a/code/game/turfs/simulated/floor/plating.dm +++ b/code/game/turfs/simulated/floor/plating.dm @@ -33,7 +33,7 @@ else . += span_notice("You might be able to build ontop of it with some tiles...") -/turf/open/floor/plating/Initialize() +/turf/open/floor/plating/Initialize(mapload) if (!broken_states) broken_states = list("platingdmg1", "platingdmg2", "platingdmg3") if (!burnt_states) diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm index 3e361fb88894..b97fab810be0 100644 --- a/code/game/turfs/simulated/floor/plating/asteroid.dm +++ b/code/game/turfs/simulated/floor/plating/asteroid.dm @@ -20,7 +20,7 @@ var/obj/item/stack/digResult = /obj/item/stack/ore/glass/basalt var/dug -/turf/open/floor/plating/asteroid/Initialize() +/turf/open/floor/plating/asteroid/Initialize(mapload) var/proper_name = name . = ..() name = proper_name @@ -100,7 +100,7 @@ /turf/open/floor/plating/asteroid/basalt/airless initial_gas_mix = AIRLESS_ATMOS -/turf/open/floor/plating/asteroid/basalt/Initialize() +/turf/open/floor/plating/asteroid/basalt/Initialize(mapload) . = ..() set_basalt_light(src) diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/simulated/floor/plating/misc_plating.dm index 8ebede156d0e..e7462e1ed756 100644 --- a/code/game/turfs/simulated/floor/plating/misc_plating.dm +++ b/code/game/turfs/simulated/floor/plating/misc_plating.dm @@ -8,7 +8,7 @@ icon_state = "alienpod1" tiled_dirt = FALSE -/turf/open/floor/plating/abductor/Initialize() +/turf/open/floor/plating/abductor/Initialize(mapload) . = ..() icon_state = "alienpod[rand(1,9)]" @@ -52,7 +52,7 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY tiled_dirt = FALSE -/turf/open/floor/plating/ashplanet/Initialize() +/turf/open/floor/plating/ashplanet/Initialize(mapload) if(smooth) var/matrix/M = new M.Translate(-4, -4) @@ -97,7 +97,7 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY -/turf/open/floor/plating/ashplanet/wateryrock/Initialize() +/turf/open/floor/plating/ashplanet/wateryrock/Initialize(mapload) icon_state = "[icon_state][rand(1, 9)]" . = ..() @@ -157,7 +157,7 @@ clawfootstep = FOOTSTEP_SAND heavyfootstep = FOOTSTEP_GENERIC_HEAVY -/turf/open/floor/plating/ironsand/Initialize() +/turf/open/floor/plating/ironsand/Initialize(mapload) . = ..() icon_state = "ironsand[rand(1,15)]" @@ -183,7 +183,7 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY -/turf/open/floor/plating/ice/Initialize() +/turf/open/floor/plating/ice/Initialize(mapload) . = ..() MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE) diff --git a/code/game/turfs/simulated/floor/reinf_floor.dm b/code/game/turfs/simulated/floor/reinf_floor.dm index 232fa520347b..fdf05fec7c28 100644 --- a/code/game/turfs/simulated/floor/reinf_floor.dm +++ b/code/game/turfs/simulated/floor/reinf_floor.dm @@ -139,7 +139,7 @@ var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance -/turf/open/floor/engine/cult/Initialize() +/turf/open/floor/engine/cult/Initialize(mapload) . = ..() new /obj/effect/temp_visual/cult/turf/floor(src) realappearance = new /obj/effect/clockwork/overlay/floor/bloodcult(src) diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index f1d7029f9280..e092293e435a 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -23,7 +23,7 @@ var/defer_change = FALSE var/hardness = 1 //how hard the material is, we'll have to have more powerful stuff if we want to blast harder materials. -/turf/closed/mineral/Initialize() +/turf/closed/mineral/Initialize(mapload) if (!canSmoothWith) canSmoothWith = list(/turf/closed/mineral, /turf/closed/indestructible) var/matrix/M = new @@ -163,7 +163,7 @@ var/mineralChance = 13 var/display_icon_state = "rock" -/turf/closed/mineral/random/Initialize() +/turf/closed/mineral/random/Initialize(mapload) mineralSpawnChanceList = typelist("mineralSpawnChanceList", mineralSpawnChanceList) @@ -750,7 +750,7 @@ var/activated_name = null var/mutable_appearance/activated_overlay -/turf/closed/mineral/gibtonite/Initialize() +/turf/closed/mineral/gibtonite/Initialize(mapload) scan_state = pick("rock_Uranium", "rock_Gold", "rock_Diamond", "rock_Silver", "rock_Plasma", "rock_BScrystal", "rock_Titanium", "rock_Iron", "rock_Gibtonite") //YOGS - stealth gibtonite, hides it as another mineral det_time = rand(8,10) //So you don't know exactly when the hot potato will explode . = ..() diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index 388faf6039b4..6383407b0c7d 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -9,7 +9,7 @@ sheet_amount = 1 girder_type = /obj/structure/girder/cult -/turf/closed/wall/mineral/cult/Initialize() +/turf/closed/wall/mineral/cult/Initialize(mapload) new /obj/effect/temp_visual/cult/turf(src) . = ..() @@ -59,7 +59,7 @@ var/heated var/obj/effect/clockwork/overlay/wall/realappearance -/turf/closed/wall/clockwork/Initialize() +/turf/closed/wall/clockwork/Initialize(mapload) . = ..() new /obj/effect/temp_visual/ratvar/wall(src) new /obj/effect/temp_visual/ratvar/beam(src) @@ -90,7 +90,7 @@ animate(src, color = previouscolor, time = 0.8 SECONDS) addtimer(CALLBACK(src, /atom/proc/update_atom_colour), 0.8 SECONDS) -/turf/closed/wall/clockwork/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd) +/turf/closed/wall/clockwork/rcd_act(mob/user, obj/item/construction/rcd/the_rcd) return FALSE /turf/closed/wall/clockwork/devastate_wall() diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm index 50e73bc43f93..eb437da4683f 100644 --- a/code/game/turfs/space/space.dm +++ b/code/game/turfs/space/space.dm @@ -27,7 +27,7 @@ //This is used to optimize the map loader return -/turf/open/space/Initialize() +/turf/open/space/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) icon_state = SPACE_ICON_STATE air = space_gas diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 965412416d5f..7dd6c1b46906 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -385,7 +385,7 @@ GLOBAL_LIST_EMPTY(station_turfs) ////////////////////////////// //Distance associates with all directions movement -/turf/proc/Distance(var/turf/T) +/turf/proc/Distance(turf/T) return get_dist(src,T) // This Distance proc assumes that only cardinal movement is diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index 036d4593691f..edaf2ed31fe9 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -98,7 +98,7 @@ update_icon() return TRUE -/obj/machinery/ntnet_relay/Initialize() +/obj/machinery/ntnet_relay/Initialize(mapload) uid = gl_uid++ component_parts = list() diff --git a/code/modules/VR/vr_human.dm b/code/modules/VR/vr_human.dm index d51765163f2d..3adc00bd2f07 100644 --- a/code/modules/VR/vr_human.dm +++ b/code/modules/VR/vr_human.dm @@ -3,7 +3,7 @@ var/obj/machinery/vr_sleeper/vr_sleeper var/datum/action/quit_vr/quit_action -/mob/living/carbon/human/virtual_reality/Initialize() +/mob/living/carbon/human/virtual_reality/Initialize(mapload) . = ..() quit_action = new() quit_action.Grant(src) diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm index 64f814a6ffd0..154cbd61fd30 100644 --- a/code/modules/VR/vr_sleeper.dm +++ b/code/modules/VR/vr_sleeper.dm @@ -17,7 +17,7 @@ var/allow_creating_vr_humans = TRUE //So you can have vr_sleepers that always spawn you as a specific person or 1 life/chance vr games var/only_current_user_can_interact = FALSE -/obj/machinery/vr_sleeper/Initialize() +/obj/machinery/vr_sleeper/Initialize(mapload) . = ..() sparks = new /datum/effect_system/spark_spread() sparks.set_up(2,0) @@ -161,7 +161,7 @@ for(var/obj/effect/landmark/vr_spawn/V in GLOB.landmarks_list) GLOB.vr_spawnpoints[V.vr_category] = V -/obj/machinery/vr_sleeper/proc/build_virtual_human(mob/living/carbon/human/H, location, var/datum/outfit/outfit, transfer = TRUE) +/obj/machinery/vr_sleeper/proc/build_virtual_human(mob/living/carbon/human/H, location, datum/outfit/outfit, transfer = TRUE) if(H) cleanup_vr_human() vr_human = new /mob/living/carbon/human/virtual_reality(location) @@ -194,7 +194,7 @@ var/vr_category = "default" //So we can have specific sleepers, eg: "Basketball VR Sleeper", etc. var/vr_outfit = /datum/outfit/vr -/obj/effect/landmark/vr_spawn/Initialize() +/obj/effect/landmark/vr_spawn/Initialize(mapload) . = ..() LAZYADD(GLOB.vr_spawnpoints[vr_category], src) @@ -221,7 +221,7 @@ invisibility = INVISIBILITY_ABSTRACT var/area/vr_area -/obj/effect/vr_clean_master/Initialize() +/obj/effect/vr_clean_master/Initialize(mapload) . = ..() vr_area = get_area(src) addtimer(CALLBACK(src, PROC_REF(clean_up)), 3 MINUTES) diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm index 8f656ae4074f..4d03bdd61615 100644 --- a/code/modules/admin/fun_balloon.dm +++ b/code/modules/admin/fun_balloon.dm @@ -6,7 +6,7 @@ anchored = TRUE var/popped = FALSE -/obj/effect/fun_balloon/Initialize() +/obj/effect/fun_balloon/Initialize(mapload) . = ..() SSobj.processing |= src @@ -92,7 +92,7 @@ icon_state = "syndballoon" anchored = TRUE -/obj/effect/station_crash/Initialize() +/obj/effect/station_crash/Initialize(mapload) ..() for(var/S in SSshuttle.stationary) var/obj/docking_port/stationary/SM = S diff --git a/code/modules/admin/ipintel.dm b/code/modules/admin/ipintel.dm index 40925e10355e..7ec466f29a87 100644 --- a/code/modules/admin/ipintel.dm +++ b/code/modules/admin/ipintel.dm @@ -75,7 +75,7 @@ qdel(query_add_ip_intel) -/proc/ip_intel_query(ip, var/retryed=0) +/proc/ip_intel_query(ip, retryed=0) . = -1 //default if (!ip) return diff --git a/code/modules/admin/permissions/database.dm b/code/modules/admin/permissions/database.dm index 63454cd68a92..9d3632e7bfd0 100644 --- a/code/modules/admin/permissions/database.dm +++ b/code/modules/admin/permissions/database.dm @@ -55,7 +55,7 @@ dbadmins[admin_ckey] = admin_rank qdel(query_load_admins) -/datum/permissions_controller/db/_load_permissions_for(var/client/C) +/datum/permissions_controller/db/_load_permissions_for(client/C) if(IsAdminAdvancedProcCall()) var/msg = " has tried to elevate permissions!" message_admins("[key_name_admin(usr)][msg]") diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 85107da67418..f5860b0c2ce5 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -407,7 +407,7 @@ return sortList(world.GetConfig("ban")) -/proc/get_stickyban_from_ckey(var/ckey) +/proc/get_stickyban_from_ckey(ckey) . = list() if (!ckey) return null diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index e01d6073ebd0..aeed239b205e 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -318,7 +318,7 @@ //assignment: '=' expression -/datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list()) +/datum/SDQL_parser/proc/assignment(i, list/node, list/assignment_list = list()) assignment_list += token(i) if(token(i + 1) == ".") @@ -425,7 +425,7 @@ return i + 1 //array: '[' expression, expression, ... ']' -/datum/SDQL_parser/proc/array(var/i, var/list/node) +/datum/SDQL_parser/proc/array(i, list/node) // Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array. if(token(i)[1] != "\[") parse_error("Expected an array but found '[token(i)]'") diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 79a87f6633f8..1e05e75f80c2 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -331,7 +331,7 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) else alert("Invalid mob") -/proc/make_types_fancy(var/list/types) +/proc/make_types_fancy(list/types) if (ispath(types)) types = list(types) . = list() @@ -943,8 +943,8 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention) /client/proc/cmd_display_init_log() set category = "Misc.Server Debug" - set name = "Display Initialize() Log" - set desc = "Displays a list of things that didn't handle Initialize() properly" + set name = "Display Initialize(mapload) Log" + set desc = "Displays a list of things that didn't handle Initialize(mapload) properly" usr << browse("" + replacetext(SSatoms.InitLog(), "\n", "
    ") + "", "window=initlog") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 226b086ac12a..2e08b91adfe4 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -377,7 +377,7 @@ unset_busy_human_dummy(DUMMY_HUMAN_SLOT_ADMIN) return preview_icon -/datum/admins/proc/makeEmergencyresponseteam(var/datum/ert/ertemplate = null) +/datum/admins/proc/makeEmergencyresponseteam(datum/ert/ertemplate = null) if (ertemplate) ertemplate = new ertemplate else @@ -493,7 +493,7 @@ return // Uplink-equipped Centcom Response Team -/datum/admins/proc/makeUplinkEmergencyResponseTeam(var/datum/ert/ertemplate = null) +/datum/admins/proc/makeUplinkEmergencyResponseTeam(datum/ert/ertemplate = null) if (ertemplate) ertemplate = new ertemplate else diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 570e637903ca..56b9811b0ccd 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -81,7 +81,7 @@ SSblackbox.record_feedback("tally", "admin_verb", 1, "Headset Message") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_mod_antag_rep(client/C in GLOB.clients, var/operation) +/client/proc/cmd_admin_mod_antag_rep(client/C in GLOB.clients, operation) set category = "Misc.Unused" set name = "Modify Antagonist Reputation" @@ -1400,7 +1400,7 @@ Traitors and the like can also be revived with the previous role mostly intact. divine_wrath.preparePixelProjectile(target, source_turf) divine_wrath.fire() -/client/proc/punish_log(var/whom, var/punishment) +/client/proc/punish_log(whom, punishment) var/msg = "[key_name(usr)] punished [key_name_admin(whom)] with [punishment]." //yogs - Yog tickets message_admins(msg) admin_ticket_log(whom, msg) diff --git a/code/modules/admin/view_variables/massmodvar.dm b/code/modules/admin/view_variables/massmodvar.dm index 37f342faa7e5..f0da7638cd9d 100644 --- a/code/modules/admin/view_variables/massmodvar.dm +++ b/code/modules/admin/view_variables/massmodvar.dm @@ -198,7 +198,7 @@ message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)") -/proc/get_all_of_type(var/T, subtypes = TRUE) +/proc/get_all_of_type(T, subtypes = TRUE) var/list/typecache = list() typecache[T] = 1 if (subtypes) diff --git a/code/modules/admin/view_variables/modifyvariables.dm b/code/modules/admin/view_variables/modifyvariables.dm index e8b1cd5fb410..534db89b83fd 100644 --- a/code/modules/admin/view_variables/modifyvariables.dm +++ b/code/modules/admin/view_variables/modifyvariables.dm @@ -8,7 +8,7 @@ GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "bound_height", "boun GLOBAL_PROTECT(VVpixelmovement) -/client/proc/vv_get_class(var/var_name, var/var_value) +/client/proc/vv_get_class(var_name, var_value) if(isnull(var_value)) . = VV_NULL @@ -269,7 +269,7 @@ GLOBAL_PROTECT(VVpixelmovement) //FALSE = no subtypes, strict exact type pathing (or the type doesn't have subtypes) //TRUE = Yes subtypes //NULL = User cancelled at the prompt or invalid type given -/client/proc/vv_subtype_prompt(var/type) +/client/proc/vv_subtype_prompt(type) if (!ispath(type)) return var/list/subtypes = subtypesof(type) diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm index 263268a5ca12..59a14dc1fbc6 100644 --- a/code/modules/admin/whitelist.dm +++ b/code/modules/admin/whitelist.dm @@ -15,7 +15,7 @@ GLOBAL_PROTECT(whitelist) if(!GLOB.whitelist.len) GLOB.whitelist = null -/proc/check_whitelist(var/ckey) +/proc/check_whitelist(ckey) if(!GLOB.whitelist) return FALSE . = (ckey in GLOB.whitelist) diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index 0aa4fa5d0dd6..74fd4e93cdff 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -17,7 +17,7 @@ var/mind_control_duration = 180 SECONDS var/active_mind_control = FALSE -/obj/item/organ/heart/gland/Initialize() +/obj/item/organ/heart/gland/Initialize(mapload) . = ..() icon_state = pick(list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral")) @@ -454,7 +454,7 @@ mind_control_duration = 1200 var/list/possible_reagents = list() -/obj/item/organ/heart/gland/chem/Initialize() +/obj/item/organ/heart/gland/chem/Initialize(mapload) . = ..() for(var/R in subtypesof(/datum/reagent/drug) + subtypesof(/datum/reagent/medicine) + typesof(/datum/reagent/toxin)) possible_reagents += R diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 930d0b21f41a..e406925421dc 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -261,4 +261,4 @@ new item(drop_location) else - say("Insufficent data!") \ No newline at end of file + say("Insufficent data!") diff --git a/code/modules/antagonists/abductor/machinery/dispenser.dm b/code/modules/antagonists/abductor/machinery/dispenser.dm index edab5fee91a0..e3f6a742abf9 100644 --- a/code/modules/antagonists/abductor/machinery/dispenser.dm +++ b/code/modules/antagonists/abductor/machinery/dispenser.dm @@ -12,7 +12,7 @@ //TODO : replace with presets or spectrum return rgb(rand(0,255),rand(0,255),rand(0,255)) -/obj/machinery/abductor/gland_dispenser/Initialize() +/obj/machinery/abductor/gland_dispenser/Initialize(mapload) . = ..() gland_types = subtypesof(/obj/item/organ/heart/gland) gland_types = shuffle(gland_types) diff --git a/code/modules/antagonists/abductor/machinery/pad.dm b/code/modules/antagonists/abductor/machinery/pad.dm index f345bc398462..39d69dc2c2ff 100644 --- a/code/modules/antagonists/abductor/machinery/pad.dm +++ b/code/modules/antagonists/abductor/machinery/pad.dm @@ -56,7 +56,7 @@ icon_state = "teleport" duration = 80 -/obj/effect/temp_visual/teleport_abductor/Initialize() +/obj/effect/temp_visual/teleport_abductor/Initialize(mapload) . = ..() var/datum/effect_system/spark_spread/S = new S.set_up(10,0,loc) diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index d50d4ff7bd89..83ab43ea0459 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -27,7 +27,7 @@ else remove_atom_colour(FIXED_COLOUR_PRIORITY) -/mob/living/simple_animal/hostile/blob/Initialize() +/mob/living/simple_animal/hostile/blob/Initialize(mapload) . = ..() if(!independent) //no pulling people deep into the blob verbs -= /mob/living/verb/pulled @@ -107,7 +107,7 @@ var/mob/living/carbon/human/oldguy var/is_zombie = FALSE -/mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, var/obj/structure/blob/factory/linked_node) +/mob/living/simple_animal/hostile/blob/blobspore/Initialize(mapload, obj/structure/blob/factory/linked_node) if(istype(linked_node)) factory = linked_node factory.spores += src diff --git a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm index 87e87ba24c67..fb81ebac4274 100644 --- a/code/modules/antagonists/blob/blobstrains/_blobstrain.dm +++ b/code/modules/antagonists/blob/blobstrains/_blobstrain.dm @@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(valid_blobstrains, subtypesof(/datum/blobstrain) - list(/datum/ overmind.add_points(point_rate) overmind.blob_core.obj_integrity = min(overmind.blob_core.max_integrity, overmind.blob_core.obj_integrity+core_regen) -/datum/blobstrain/proc/attack_living(var/mob/living/L, var/list/nearby_blobs) // When the blob attacks people +/datum/blobstrain/proc/attack_living(mob/living/L, list/nearby_blobs) // When the blob attacks people send_message(L) /datum/blobstrain/proc/blobbernaut_attack(mob/living/L, blobbernaut) // When this blob's blobbernaut attacks people diff --git a/code/modules/antagonists/blob/blobstrains/_reagent.dm b/code/modules/antagonists/blob/blobstrains/_reagent.dm index 0847c66aa3ba..3467771c8de5 100644 --- a/code/modules/antagonists/blob/blobstrains/_reagent.dm +++ b/code/modules/antagonists/blob/blobstrains/_reagent.dm @@ -6,7 +6,7 @@ reagent = new reagent() -/datum/blobstrain/reagent/attack_living(var/mob/living/L) +/datum/blobstrain/reagent/attack_living(mob/living/L) reagent.reaction_mob(L, VAPOR, 25, 1, L.get_permeability(), overmind) send_message(L) diff --git a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm index bbd33ef965d4..d910a564a5e1 100644 --- a/code/modules/antagonists/blob/blobstrains/debris_devourer.dm +++ b/code/modules/antagonists/blob/blobstrains/debris_devourer.dm @@ -12,7 +12,7 @@ message = "The blob blasts you" -/datum/blobstrain/debris_devourer/attack_living(var/mob/living/L, var/list/nearby_blobs) +/datum/blobstrain/debris_devourer/attack_living(mob/living/L, list/nearby_blobs) send_message(L) for (var/obj/structure/blob/blob in nearby_blobs) debris_attack(L, blob) diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 8741b6920db1..eb3d55cdad08 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -217,7 +217,7 @@ GLOBAL_LIST_EMPTY(blob_nodes) blob_points = clamp(blob_points + points, 0, max_blob_points) hud_used.blobpwrdisplay.maptext = "
    [round(blob_points)]
    " -/mob/camera/blob/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/camera/blob/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if (!message) return diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index faab39fc9ded..5482732d13b7 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -50,7 +50,7 @@ /obj/structure/blob/blob_act() return -/obj/structure/blob/Adjacent(var/atom/neighbour) +/obj/structure/blob/Adjacent(atom/neighbour) . = ..() if(.) var/result = 0 diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm index 456b2d8bcf0b..f9c3b48eb84b 100644 --- a/code/modules/antagonists/blob/structures/node.dm +++ b/code/modules/antagonists/blob/structures/node.dm @@ -10,7 +10,7 @@ resistance_flags = LAVA_PROOF -/obj/structure/blob/node/Initialize() +/obj/structure/blob/node/Initialize(mapload) GLOB.blob_nodes += src START_PROCESSING(SSobj, src) . = ..() diff --git a/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm b/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm index d0994280867b..48b371bcd7c3 100644 --- a/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm +++ b/code/modules/antagonists/bloodsuckers/bloodsuckers_objects.dm @@ -11,7 +11,7 @@ var/area/lair_area var/mob/lair_owner -/obj/item/restraints/legcuffs/beartrap/bloodsucker/Initialize() +/obj/item/restraints/legcuffs/beartrap/bloodsucker/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -179,7 +179,7 @@ hitsound = 'sound/items/bikehorn.ogg' sharpness = SHARP_POINTY //torture ducky -/obj/item/stake/ducky/Initialize() +/obj/item/stake/ducky/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) @@ -311,7 +311,7 @@ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/in_use = FALSE -/obj/item/book/kindred/Initialize() +/obj/item/book/kindred/Initialize(mapload) . = ..() AddComponent(/datum/component/stationloving, FALSE, TRUE) diff --git a/code/modules/antagonists/bloodsuckers/powers/cloak.dm b/code/modules/antagonists/bloodsuckers/powers/cloak.dm index 66db7d87b040..d1265033e259 100644 --- a/code/modules/antagonists/bloodsuckers/powers/cloak.dm +++ b/code/modules/antagonists/bloodsuckers/powers/cloak.dm @@ -98,7 +98,7 @@ item_state = "cloak" armor = list(MELEE = 0, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 10, ACID = 100) //good if you haven nothing -/obj/item/clothing/neck/yogs/sith_cloak/cloak/Initialize() +/obj/item/clothing/neck/yogs/sith_cloak/cloak/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) START_PROCESSING(SSobj, src) diff --git a/code/modules/antagonists/bloodsuckers/powers/gangrel.dm b/code/modules/antagonists/bloodsuckers/powers/gangrel.dm index 6d073029a4bd..eae474784ffa 100644 --- a/code/modules/antagonists/bloodsuckers/powers/gangrel.dm +++ b/code/modules/antagonists/bloodsuckers/powers/gangrel.dm @@ -625,25 +625,25 @@ xenoshoe = YES_DIGIT body_parts_covered = GROIN|LEGS|FEET -/obj/item/clothing/neck/wolfcollar/Initialize() +/obj/item/clothing/neck/wolfcollar/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) -/obj/item/radio/headset/wolfears/Initialize() +/obj/item/radio/headset/wolfears/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) make_syndie() -/obj/item/clothing/gloves/wolfclaws/Initialize() +/obj/item/clothing/gloves/wolfclaws/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) -/obj/item/clothing/shoes/wolflegs/Initialize() +/obj/item/clothing/shoes/wolflegs/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) -/obj/item/clothing/shoes/xeno_wraps/wolfdigilegs/Initialize() +/obj/item/clothing/shoes/xeno_wraps/wolfdigilegs/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, BLOODSUCKER_TRAIT) diff --git a/code/modules/antagonists/bloodsuckers/structures/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsuckers/structures/bloodsucker_crypt.dm index 4db1742c6c69..c639c21c7b33 100644 --- a/code/modules/antagonists/bloodsuckers/structures/bloodsucker_crypt.dm +++ b/code/modules/antagonists/bloodsuckers/structures/bloodsucker_crypt.dm @@ -472,7 +472,7 @@ desc = "It looks upsettingly familiar..." icon_state = "statue" -/obj/structure/bloodsucker/bloodstatue/Initialize() +/obj/structure/bloodsucker/bloodstatue/Initialize(mapload) . = ..() AddComponent(/datum/component/art, 30) @@ -1317,7 +1317,7 @@ var/mutable_appearance/armrest // Add rotating and armrest -/obj/structure/bloodsucker/bloodthrone/Initialize() +/obj/structure/bloodsucker/bloodthrone/Initialize(mapload) AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE) armrest = GetArmrest() armrest.layer = ABOVE_MOB_LAYER diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index 7ba8b17e7f8b..50745e796481 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -269,7 +269,7 @@ return TRUE return FALSE -/datum/antagonist/changeling/proc/can_absorb_dna(mob/living/carbon/human/target, var/verbose=1) +/datum/antagonist/changeling/proc/can_absorb_dna(mob/living/carbon/human/target, verbose=1) var/mob/living/carbon/user = owner.current if(!istype(user)) return diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index b1b6db06595e..1ac2f9c46ec4 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -293,7 +293,7 @@ firing_effect_type = null var/obj/item/gun/magic/tentacle/gun //the item that shot it -/obj/item/ammo_casing/magic/tentacle/Initialize() +/obj/item/ammo_casing/magic/tentacle/Initialize(mapload) gun = loc . = ..() @@ -312,7 +312,7 @@ var/chain var/obj/item/ammo_casing/magic/tentacle/source //the item that shot it -/obj/item/projectile/tentacle/Initialize() +/obj/item/projectile/tentacle/Initialize(mapload) source = loc . = ..() @@ -444,7 +444,7 @@ var/remaining_uses //Set by the changeling ability. -/obj/item/shield/changeling/Initialize() +/obj/item/shield/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) @@ -490,7 +490,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen) armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90) //No armor at all. -/obj/item/clothing/suit/space/changeling/Initialize() +/obj/item/clothing/suit/space/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) @@ -511,7 +511,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 90, ACID = 90) flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH -/obj/item/clothing/head/helmet/space/changeling/Initialize() +/obj/item/clothing/head/helmet/space/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -546,7 +546,7 @@ heat_protection = 0 allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant) // allows ling armor to carry the usual space suit tanks. -/obj/item/clothing/suit/armor/changeling/Initialize() +/obj/item/clothing/suit/armor/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) if(ismob(loc)) @@ -560,7 +560,7 @@ armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 20, BOMB = 10, BIO = 4, RAD = 0, FIRE = 90, ACID = 90) flags_inv = HIDEEARS|HIDEHAIR|HIDEEYES|HIDEFACIALHAIR|HIDEFACE -/obj/item/clothing/head/helmet/changeling/Initialize() +/obj/item/clothing/head/helmet/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) diff --git a/code/modules/antagonists/changeling/powers/transform.dm b/code/modules/antagonists/changeling/powers/transform.dm index 2dfc15f7d2fd..c97cde1d6e62 100644 --- a/code/modules/antagonists/changeling/powers/transform.dm +++ b/code/modules/antagonists/changeling/powers/transform.dm @@ -10,7 +10,7 @@ /obj/item/clothing/glasses/changeling name = "flesh" -/obj/item/clothing/glasses/changeling/Initialize() +/obj/item/clothing/glasses/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -22,7 +22,7 @@ return . = ..() -/datum/antagonist/changeling/select_dna(var/prompt, var/title) +/datum/antagonist/changeling/select_dna(prompt, title) var/mob/living/carbon/user = owner.current if(!istype(user)) return @@ -48,7 +48,7 @@ /obj/item/clothing/under/changeling name = "flesh" -/obj/item/clothing/under/changeling/Initialize() +/obj/item/clothing/under/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -64,7 +64,7 @@ name = "flesh" allowed = list(/obj/item/changeling) -/obj/item/clothing/suit/changeling/Initialize() +/obj/item/clothing/suit/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -79,7 +79,7 @@ /obj/item/clothing/head/changeling name = "flesh" -/obj/item/clothing/head/changeling/Initialize() +/obj/item/clothing/head/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -94,7 +94,7 @@ /obj/item/clothing/shoes/changeling name = "flesh" -/obj/item/clothing/shoes/changeling/Initialize() +/obj/item/clothing/shoes/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -109,7 +109,7 @@ /obj/item/clothing/gloves/changeling name = "flesh" -/obj/item/clothing/gloves/changeling/Initialize() +/obj/item/clothing/gloves/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -124,7 +124,7 @@ /obj/item/clothing/mask/changeling name = "flesh" -/obj/item/clothing/mask/changeling/Initialize() +/obj/item/clothing/mask/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -141,7 +141,7 @@ slot_flags = ALL allowed = list(/obj/item/changeling) -/obj/item/changeling/Initialize() +/obj/item/changeling/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CHANGELING_TRAIT) @@ -164,7 +164,7 @@ changeling_transform(user, chosen_prof) return TRUE -/datum/antagonist/changeling/proc/select_dna(var/prompt, var/title) +/datum/antagonist/changeling/proc/select_dna(prompt, title) var/mob/living/carbon/user = owner.current if(!istype(user)) return diff --git a/code/modules/antagonists/clockcult/clock_effect.dm b/code/modules/antagonists/clockcult/clock_effect.dm index 8e3a8f4ceb03..a788677eb162 100644 --- a/code/modules/antagonists/clockcult/clock_effect.dm +++ b/code/modules/antagonists/clockcult/clock_effect.dm @@ -10,7 +10,7 @@ opacity = 0 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF -/obj/effect/clockwork/Initialize() +/obj/effect/clockwork/Initialize(mapload) . = ..() GLOB.all_clockwork_objects += src diff --git a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm index e3b30c480d61..e4f8df2114bc 100644 --- a/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm +++ b/code/modules/antagonists/clockcult/clock_effects/city_of_cogs_rift.dm @@ -16,7 +16,7 @@ /obj/effect/clockwork/city_of_cogs_rift/singularity_pull() return -/obj/effect/clockwork/city_of_cogs_rift/Initialize() +/obj/effect/clockwork/city_of_cogs_rift/Initialize(mapload) . = ..() visible_message(span_warning("The air above [loc] shimmers and pops as a [name] forms there!")) for(var/mob/M in GLOB.player_list) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm index 2f547798efba..9d3de9254511 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_overlay.dm @@ -33,7 +33,7 @@ smooth = SMOOTH_TRUE layer = CLOSED_TURF_LAYER -/obj/effect/clockwork/overlay/wall/Initialize() +/obj/effect/clockwork/overlay/wall/Initialize(mapload) . = ..() queue_smooth_neighbors(src) addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(queue_smooth), src), 1) diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index fc43883665ec..400a1f0cba1a 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -179,7 +179,7 @@ sigil_name = "Sigil of Transmission" affects_servants = TRUE -/obj/effect/clockwork/sigil/transmission/Initialize() +/obj/effect/clockwork/sigil/transmission/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm index 94c765690282..eda88f27e706 100644 --- a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm +++ b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm @@ -6,7 +6,7 @@ alpha = 200 layer = MASSIVE_OBJ_LAYER -/obj/effect/clockwork/general_marker/Initialize() +/obj/effect/clockwork/general_marker/Initialize(mapload) . = ..() animate(src, alpha = 0, time = 1 SECONDS) QDEL_IN(src, 1 SECONDS) diff --git a/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm b/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm index 27d456a1bd4c..e1d464e41047 100644 --- a/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm +++ b/code/modules/antagonists/clockcult/clock_effects/servant_blocker.dm @@ -8,7 +8,7 @@ density = TRUE CanAtmosPass = ATMOS_PASS_NO -/obj/effect/clockwork/servant_blocker/Initialize() +/obj/effect/clockwork/servant_blocker/Initialize(mapload) . = ..() air_update_turf(TRUE) diff --git a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm index c00e24cb95c9..fa3445c41848 100644 --- a/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm +++ b/code/modules/antagonists/clockcult/clock_effects/spatial_gateway.dm @@ -15,7 +15,7 @@ var/obj/effect/clockwork/spatial_gateway/linked_gateway //The gateway linked to this one var/timerid -/obj/effect/clockwork/spatial_gateway/Initialize() +/obj/effect/clockwork/spatial_gateway/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(check_setup)), 1) diff --git a/code/modules/antagonists/clockcult/clock_item.dm b/code/modules/antagonists/clockcult/clock_item.dm index 7c8e877fb3b2..f4d5352ab901 100644 --- a/code/modules/antagonists/clockcult/clock_item.dm +++ b/code/modules/antagonists/clockcult/clock_item.dm @@ -8,7 +8,7 @@ icon_state = "rare_pepe" w_class = WEIGHT_CLASS_SMALL -/obj/item/clockwork/Initialize() +/obj/item/clockwork/Initialize(mapload) . = ..() ratvar_act() GLOB.all_clockwork_objects += src diff --git a/code/modules/antagonists/clockcult/clock_items/clock_components.dm b/code/modules/antagonists/clockcult/clock_items/clock_components.dm index 1aa2d239baa3..54f46016056f 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_components.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_components.dm @@ -172,7 +172,7 @@ var/randomspritemax = 2 var/sprite_shift = 9 -/obj/item/clockwork/alloy_shards/Initialize() +/obj/item/clockwork/alloy_shards/Initialize(mapload) . = ..() if(randomsinglesprite) replace_name_desc() diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm index f6892102c21d..453d831794b2 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm @@ -10,7 +10,7 @@ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH armor = list(MELEE = 50, BULLET = 60, LASER = 0, ENERGY = 0, BOMB = 60, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) -/obj/item/clothing/head/helmet/clockwork/Initialize() +/obj/item/clothing/head/helmet/clockwork/Initialize(mapload) . = ..() ratvar_act() GLOB.all_clockwork_objects += src @@ -71,7 +71,7 @@ armor = list(MELEE = 60, BULLET = 60, LASER = 0, ENERGY = 0, BOMB = 60, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel) -/obj/item/clothing/suit/armor/clockwork/Initialize() +/obj/item/clothing/suit/armor/clockwork/Initialize(mapload) . = ..() ratvar_act() GLOB.all_clockwork_objects += src @@ -135,7 +135,7 @@ resistance_flags = FIRE_PROOF | ACID_PROOF armor = list(MELEE = 80, BULLET = 60, LASER = 0, ENERGY = 0, BOMB = 60, BIO = 60, RAD = 0, FIRE = 100, ACID = 100) -/obj/item/clothing/gloves/clockwork/Initialize() +/obj/item/clothing/gloves/clockwork/Initialize(mapload) . = ..() ratvar_act() GLOB.all_clockwork_objects += src @@ -188,7 +188,7 @@ equip_delay_other = 30 resistance_flags = FIRE_PROOF | ACID_PROOF -/obj/item/clothing/shoes/clockwork/Initialize() +/obj/item/clothing/shoes/clockwork/Initialize(mapload) . = ..() ratvar_act() GLOB.all_clockwork_objects += src diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 1152e74df8ac..3e3b8fd0e8b7 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -83,7 +83,7 @@ if(!GLOB.ratvar_awakens) SStgui.close_uis(src) -/obj/item/clockwork/slab/Initialize() +/obj/item/clockwork/slab/Initialize(mapload) . = ..() update_slab_info(src) START_PROCESSING(SSobj, src) diff --git a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm index aa69852c0515..8863fd03c1c6 100644 --- a/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm +++ b/code/modules/antagonists/clockcult/clock_items/construct_chassis.dm @@ -11,7 +11,7 @@ var/creation_message = span_brass("The chassis shudders and hums to life!") var/construct_type //The construct this shell will create -/obj/item/clockwork/construct_chassis/Initialize() +/obj/item/clockwork/construct_chassis/Initialize(mapload) . = ..() var/area/A = get_area(src) if(A && construct_type) diff --git a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm index 5ec7e0637a72..798e79faaca7 100644 --- a/code/modules/antagonists/clockcult/clock_items/integration_cog.dm +++ b/code/modules/antagonists/clockcult/clock_items/integration_cog.dm @@ -15,7 +15,7 @@ var/watts_per_second = 20 var/depowered_multiplier = 0.5 -/obj/item/clockwork/integration_cog/Initialize() +/obj/item/clockwork/integration_cog/Initialize(mapload) . = ..() transform *= 0.5 //little cog! diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index 95201c4799ee..58622fa79774 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -13,7 +13,7 @@ var/recharge_cooldown = 30 SECONDS //divided by 10 if ratvar is alive actions_types = list(/datum/action/cooldown/judicial_visor) -/obj/item/clothing/glasses/judicial_visor/Initialize() +/obj/item/clothing/glasses/judicial_visor/Initialize(mapload) . = ..() GLOB.all_clockwork_objects += src blaster = new(src) diff --git a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm index 374c7d4b3eda..f0d8f5741854 100644 --- a/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm +++ b/code/modules/antagonists/clockcult/clock_items/soul_vessel.dm @@ -26,7 +26,7 @@ override_cyborg_laws = TRUE can_update_laws = TRUE -/obj/item/mmi/posibrain/soul_vessel/Initialize() +/obj/item/mmi/posibrain/soul_vessel/Initialize(mapload) . = ..() radio.on = FALSE laws = new /datum/ai_laws/ratvar() diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm index 058b83f40e76..bac0e1fac941 100644 --- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm +++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm @@ -12,7 +12,7 @@ visor_vars_to_toggle = NONE //we don't actually toggle anything we just set it tint = 3 //this'll get reset, but it won't handle vision updates properly otherwise -/obj/item/clothing/glasses/wraith_spectacles/Initialize() +/obj/item/clothing/glasses/wraith_spectacles/Initialize(mapload) . = ..() GLOB.all_clockwork_objects += src diff --git a/code/modules/antagonists/clockcult/clock_mobs.dm b/code/modules/antagonists/clockcult/clock_mobs.dm index 89d7db897eb0..c2bd915cc3aa 100644 --- a/code/modules/antagonists/clockcult/clock_mobs.dm +++ b/code/modules/antagonists/clockcult/clock_mobs.dm @@ -23,7 +23,7 @@ var/playstyle_string = span_heavy_brass("You are a bug, yell at whoever spawned you!") var/empower_string = span_heavy_brass("You have nothing to empower, yell at the coders!") //Shown to the mob when the herald beacon activates -/mob/living/simple_animal/hostile/clockwork/Initialize() +/mob/living/simple_animal/hostile/clockwork/Initialize(mapload) . = ..() update_values() diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index fcfd2773bfb7..efcbd6f882ec 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -77,7 +77,7 @@ E = new V E.Grant(src) -/mob/camera/eminence/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/camera/eminence/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot send IC messages (muted).") diff --git a/code/modules/antagonists/clockcult/clock_structure.dm b/code/modules/antagonists/clockcult/clock_structure.dm index 0a57556e3fef..768d550e5378 100644 --- a/code/modules/antagonists/clockcult/clock_structure.dm +++ b/code/modules/antagonists/clockcult/clock_structure.dm @@ -18,7 +18,7 @@ var/construction_value = 0 //How much value the structure contributes to the overall "power" of the structures on the station var/immune_to_servant_attacks = FALSE //if we ignore attacks from servants of ratvar instead of taking damage -/obj/structure/destructible/clockwork/Initialize() +/obj/structure/destructible/clockwork/Initialize(mapload) . = ..() change_construction_value(construction_value) GLOB.all_clockwork_objects += src @@ -134,7 +134,7 @@ density = FALSE resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF | FREEZE_PROOF -/obj/structure/destructible/clockwork/massive/Initialize() +/obj/structure/destructible/clockwork/massive/Initialize(mapload) . = ..() GLOB.poi_list += src diff --git a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm index 53884b8743a7..68564ac756ec 100644 --- a/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm +++ b/code/modules/antagonists/clockcult/clock_structures/_trap_object.dm @@ -5,7 +5,7 @@ clockwork_desc = "A trap that shouldn't exist, and you should report this as a bug." var/list/wired_to -/obj/structure/destructible/clockwork/trap/Initialize() +/obj/structure/destructible/clockwork/trap/Initialize(mapload) . = ..() wired_to = list() diff --git a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm index 221436cb1b0d..35d628814b22 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ark_of_the_clockwork_justicar.dm @@ -38,7 +38,7 @@ var/next_spaghetti = 0 var/spaghetti_cooldown = 50 -/obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize() +/obj/structure/destructible/clockwork/massive/celestial_gateway/Initialize(mapload) . = ..() glow = new(get_turf(src)) if(!GLOB.ark_of_the_clockwork_justiciar) @@ -212,7 +212,7 @@ var/damage = max((obj_integrity * 0.7) / severity, 100) //requires multiple bombs to take down take_damage(damage, BRUTE, BOMB, 0) -/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time(var/deciseconds = TRUE) +/obj/structure/destructible/clockwork/massive/celestial_gateway/proc/get_arrival_time(deciseconds = TRUE) if(seconds_until_activation) . = seconds_until_activation else if(grace_period) diff --git a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm index 5219aabd2f40..04cab9f17304 100644 --- a/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm +++ b/code/modules/antagonists/clockcult/clock_structures/clockwork_obelisk.dm @@ -16,7 +16,7 @@ var/hierophant_cost = MIN_CLOCKCULT_POWER //how much it costs to broadcast with large text var/gateway_cost = 2000 //how much it costs to open a gateway -/obj/structure/destructible/clockwork/powered/clockwork_obelisk/Initialize() +/obj/structure/destructible/clockwork/powered/clockwork_obelisk/Initialize(mapload) . = ..() toggle(1) diff --git a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm index 230f80df2f59..aa74ab72091b 100644 --- a/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm +++ b/code/modules/antagonists/clockcult/clock_structures/heralds_beacon.dm @@ -15,7 +15,7 @@ var/votes_needed = 0 //How many votes are needed to activate the beacon var/available = FALSE //If the beacon can be used -/obj/structure/destructible/clockwork/heralds_beacon/Initialize() +/obj/structure/destructible/clockwork/heralds_beacon/Initialize(mapload) . = ..() voters = list() START_PROCESSING(SSprocessing, src) diff --git a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm index d654f58020cc..a2919c034364 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ocular_warden.dm @@ -18,7 +18,7 @@ var/time_between_shots = 4 //yogs: slower attack speed var/last_process = 0 //see above -/obj/structure/destructible/clockwork/ocular_warden/Initialize() +/obj/structure/destructible/clockwork/ocular_warden/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm index 8e3fc61404a0..686ded33c937 100644 --- a/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm +++ b/code/modules/antagonists/clockcult/clock_structures/ratvar_the_clockwork_justicar.dm @@ -17,7 +17,7 @@ var/convert_range = 10 obj_flags = CAN_BE_HIT | DANGEROUS_POSSESSION -/obj/structure/destructible/clockwork/massive/ratvar/Initialize() +/obj/structure/destructible/clockwork/massive/ratvar/Initialize(mapload) . = ..() GLOB.ratvar_awakens++ for(var/obj/O in GLOB.all_clockwork_objects) diff --git a/code/modules/antagonists/clockcult/clock_structures/stargazer.dm b/code/modules/antagonists/clockcult/clock_structures/stargazer.dm index 8f66fa43ef14..e0d2fd622aef 100644 --- a/code/modules/antagonists/clockcult/clock_structures/stargazer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/stargazer.dm @@ -69,7 +69,7 @@ var/fading = FALSE var/obj/effect/stargazer_light/sg_light -/obj/structure/destructible/clockwork/stargazer/Initialize() +/obj/structure/destructible/clockwork/stargazer/Initialize(mapload) . = ..() sg_light = new(get_turf(src)) START_PROCESSING(SSobj, src) diff --git a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm index 62de05b8dbeb..eb441a7c8597 100644 --- a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm +++ b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm @@ -14,7 +14,7 @@ debris = list() var/timerid -/obj/structure/destructible/clockwork/taunting_trail/Initialize() +/obj/structure/destructible/clockwork/taunting_trail/Initialize(mapload) . = ..() timerid = QDEL_IN(src, 15) var/obj/structure/destructible/clockwork/taunting_trail/Tt = locate(/obj/structure/destructible/clockwork/taunting_trail) in loc diff --git a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm index 9b654855634d..33ee2c0c225a 100644 --- a/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm +++ b/code/modules/antagonists/clockcult/clock_structures/trap_triggers/pressure_sensor.dm @@ -7,7 +7,7 @@ icon_state = "pressure_sensor" alpha = 50 -/obj/structure/destructible/clockwork/trap/trigger/Initialize() +/obj/structure/destructible/clockwork/trap/trigger/Initialize(mapload) . = ..() for(var/obj/structure/destructible/clockwork/trap/T in get_turf(src)) if(!istype(T, /obj/structure/destructible/clockwork/trap/trigger)) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 66ba4ff28583..2e0de722ef84 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -13,7 +13,7 @@ var/wiggle_wiggle var/mutable_appearance/impale_overlay //This is applied to any mob impaled so that they visibly have the skewer coming through their chest -/obj/structure/destructible/clockwork/trap/brass_skewer/Initialize() +/obj/structure/destructible/clockwork/trap/brass_skewer/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) diff --git a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm index 0d097a505056..092b824b4259 100644 --- a/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm +++ b/code/modules/antagonists/clockcult/clock_structures/wall_gear.dm @@ -15,7 +15,7 @@ /obj/structure/destructible/clockwork/wall_gear/displaced anchored = FALSE -/obj/structure/destructible/clockwork/wall_gear/Initialize() +/obj/structure/destructible/clockwork/wall_gear/Initialize(mapload) . = ..() new /obj/effect/temp_visual/ratvar/gear(get_turf(src)) diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 09cd27c49b63..043d9ddeaa5d 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -87,7 +87,7 @@ to_chat(owner, span_danger("Your need for mental fitness vanishes alongside the voices, mood has been disabled.")) C.RemoveComponent() -/datum/antagonist/obsessed/proc/forge_objectives(var/datum/mind/obsessionmind) +/datum/antagonist/obsessed/proc/forge_objectives(datum/mind/obsessionmind) var/list/objectives_left = list("spendtime", "polaroid", "hug") var/datum/quirk/family_heirloom/family_heirloom diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 0d8ba961e53c..9e01314bf471 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -358,7 +358,7 @@ health_cost = source.health_cost ..() -/obj/item/melee/blood_magic/Initialize() +/obj/item/melee/blood_magic/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) diff --git a/code/modules/antagonists/cult/cult_comms.dm b/code/modules/antagonists/cult/cult_comms.dm index 90723ebcd760..769db8b8053b 100644 --- a/code/modules/antagonists/cult/cult_comms.dm +++ b/code/modules/antagonists/cult/cult_comms.dm @@ -87,7 +87,7 @@ var/datum/antagonist/cult/C = owner.mind.has_antag_datum(/datum/antagonist/cult,TRUE) pollCultists(owner,C.cult_team) -/proc/pollCultists(var/mob/living/Nominee,datum/team/cult/team) //Cult Master Poll +/proc/pollCultists(mob/living/Nominee,datum/team/cult/team) //Cult Master Poll if(world.time < CULT_POLL_WAIT) to_chat(Nominee, "It would be premature to select a leader while everyone is still settling in, try again in [DisplayTimeText(CULT_POLL_WAIT-world.time)].") return diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index be5cb128225e..74c0b5bd29c7 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -25,7 +25,7 @@ armour_penetration = 35 actions_types = list(/datum/action/item_action/cult_dagger) -/obj/item/melee/cultblade/dagger/Initialize() +/obj/item/melee/cultblade/dagger/Initialize(mapload) . = ..() var/image/I = image(icon = 'icons/effects/blood.dmi' , icon_state = null, loc = src) I.override = TRUE @@ -49,7 +49,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") -/obj/item/melee/cultblade/Initialize() +/obj/item/melee/cultblade/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 40, 100) @@ -73,7 +73,7 @@ item_flags = NEEDS_PERMIT | DROPDEL flags_1 = NONE -/obj/item/melee/cultblade/ghost/Initialize() +/obj/item/melee/cultblade/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) @@ -120,7 +120,7 @@ var/spin_cooldown = 25 SECONDS var/dash_toggled = TRUE -/obj/item/twohanded/required/cult_bastard/Initialize() +/obj/item/twohanded/required/cult_bastard/Initialize(mapload) . = ..() jaunt = new(src) linked_action = new(src) @@ -319,7 +319,7 @@ /obj/item/clothing/head/culthood/alt/ghost item_flags = DROPDEL -/obj/item/clothing/head/culthood/alt/ghost/Initialize() +/obj/item/clothing/head/culthood/alt/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) @@ -332,7 +332,7 @@ /obj/item/clothing/suit/cultrobes/alt/ghost item_flags = DROPDEL -/obj/item/clothing/suit/cultrobes/alt/ghost/Initialize() +/obj/item/clothing/suit/cultrobes/alt/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) @@ -681,7 +681,7 @@ GLOBAL_VAR_INIT(curselimit, 0) hitsound = 'sound/weapons/bladeslice.ogg' var/datum/action/innate/cult/spear/spear_act -/obj/item/twohanded/cult_spear/Initialize() +/obj/item/twohanded/cult_spear/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 100, 90) @@ -814,7 +814,7 @@ GLOBAL_VAR_INIT(curselimit, 0) var/firing = FALSE var/angle -/obj/item/blood_beam/Initialize() +/obj/item/blood_beam/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) diff --git a/code/modules/antagonists/cult/cult_structures.dm b/code/modules/antagonists/cult/cult_structures.dm index 53d7f23a9115..d1d13d45a883 100644 --- a/code/modules/antagonists/cult/cult_structures.dm +++ b/code/modules/antagonists/cult/cult_structures.dm @@ -290,7 +290,7 @@ icon_state = "pillaralt-enter" alt = 1 -/obj/structure/destructible/cult/pillar/Initialize() +/obj/structure/destructible/cult/pillar/Initialize(mapload) ..() var/turf/T = loc if (!T) @@ -322,7 +322,7 @@ /obj/structure/destructible/cult/pillar/conceal() return -/obj/structure/destructible/cult/pillar/ex_act(var/severity) +/obj/structure/destructible/cult/pillar/ex_act(severity) switch(severity) if (EXPLODE_DEVASTATE) take_damage(200) @@ -347,7 +347,7 @@ var/anchor = FALSE //are we the bloodstone used to summon Nar'sie? used in the final part of the summoning is_endgame = TRUE -/obj/structure/destructible/cult/bloodstone/Initialize() +/obj/structure/destructible/cult/bloodstone/Initialize(mapload) ..() if (!src.loc) message_admins("Blood Cult: A blood stone was somehow spawned in nullspace. It has been destroyed.") @@ -410,7 +410,7 @@ ..() update_icon() -/obj/structure/destructible/cult/bloodstone/ex_act(var/severity) +/obj/structure/destructible/cult/bloodstone/ex_act(severity) switch(severity) if (EXPLODE_DEVASTATE) take_damage(200) diff --git a/code/modules/antagonists/cult/ritual.dm b/code/modules/antagonists/cult/ritual.dm index 6efdc41049da..6d7fee6247ba 100644 --- a/code/modules/antagonists/cult/ritual.dm +++ b/code/modules/antagonists/cult/ritual.dm @@ -5,7 +5,7 @@ This file contains the cult dagger and rune list code */ -/obj/item/melee/cultblade/dagger/Initialize() +/obj/item/melee/cultblade/dagger/Initialize(mapload) . = ..() if(!LAZYLEN(GLOB.rune_types)) GLOB.rune_types = list() diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index 3ec2ad52d200..60929c1eb197 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -133,7 +133,7 @@ structure_check() searches for nearby cultist structures required for the invoca */ -/obj/effect/rune/proc/can_invoke(var/mob/living/user=null) +/obj/effect/rune/proc/can_invoke(mob/living/user=null) //This proc determines if the rune can be invoked at the time. If there are multiple required cultists, it will find all nearby cultists. var/list/invokers = list() //people eligible to invoke the rune if(user) @@ -160,7 +160,7 @@ structure_check() searches for nearby cultist structures required for the invoca invokers += L return invokers -/obj/effect/rune/proc/invoke(var/list/invokers) +/obj/effect/rune/proc/invoke(list/invokers) //This proc contains the effects of the rune as well as things that happen afterwards. If you want it to spawn an object and then delete itself, have both here. for(var/M in invokers) if(isliving(M)) @@ -202,7 +202,7 @@ structure_check() searches for nearby cultist structures required for the invoca icon_state = "[rand(1,7)]" color = rgb(rand(0,255), rand(0,255), rand(0,255)) -/obj/effect/rune/malformed/invoke(var/list/invokers) +/obj/effect/rune/malformed/invoke(list/invokers) ..() qdel(src) @@ -220,7 +220,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/convert/do_invoke_glow() return -/obj/effect/rune/convert/invoke(var/list/invokers) +/obj/effect/rune/convert/invoke(list/invokers) if(rune_in_use) return var/list/myriad_targets = list() @@ -367,7 +367,7 @@ structure_check() searches for nearby cultist structures required for the invoca color = RUNE_COLOR_TALISMAN construct_invoke = FALSE -/obj/effect/rune/empower/invoke(var/list/invokers) +/obj/effect/rune/empower/invoke(list/invokers) . = ..() var/mob/living/user = invokers[1] //the first invoker is always the user for(var/datum/action/innate/cult/blood_magic/BM in user.actions) @@ -397,7 +397,7 @@ structure_check() searches for nearby cultist structures required for the invoca GLOB.teleport_runes -= src return ..() -/obj/effect/rune/teleport/invoke(var/list/invokers) +/obj/effect/rune/teleport/invoke(list/invokers) var/mob/living/user = invokers[1] //the first invoker is always the user var/list/potential_runes = list() var/list/teleportnames = list() @@ -531,7 +531,7 @@ structure_check() searches for nearby cultist structures required for the invoca ..() req_cultists = initial(req_cultists) -/obj/effect/rune/narsie/invoke(var/list/invokers) +/obj/effect/rune/narsie/invoke(list/invokers) if(used) return if(!is_station_level(z)) @@ -595,7 +595,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/revive_number = LAZYLEN(GLOB.sacrificed) - revives_used . += "Revives Remaining: [round(revive_number/SOULS_TO_REVIVE)]" -/obj/effect/rune/raise_dead/invoke(var/list/invokers) +/obj/effect/rune/raise_dead/invoke(list/invokers) var/turf/T = get_turf(src) var/mob/living/mob_to_revive var/list/potential_revive_mobs = list() @@ -702,7 +702,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/wall/BlockSuperconductivity() return density -/obj/effect/rune/wall/invoke(var/list/invokers) +/obj/effect/rune/wall/invoke(list/invokers) if(recharging) return var/mob/living/user = invokers[1] @@ -765,7 +765,7 @@ structure_check() searches for nearby cultist structures required for the invoca icon_state = "3" color = RUNE_COLOR_SUMMON -/obj/effect/rune/summon/invoke(var/list/invokers) +/obj/effect/rune/summon/invoke(list/invokers) var/mob/living/user = invokers[1] var/list/cultists = list() for(var/datum/mind/M in SSticker.mode.cult) @@ -830,7 +830,7 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/blood_boil/do_invoke_glow() return -/obj/effect/rune/blood_boil/invoke(var/list/invokers) +/obj/effect/rune/blood_boil/invoke(list/invokers) if(rune_in_use) return ..() @@ -890,7 +890,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/ghost_limit = 3 var/ghosts = 0 -/obj/effect/rune/manifest/Initialize() +/obj/effect/rune/manifest/Initialize(mapload) . = ..() @@ -907,7 +907,7 @@ structure_check() searches for nearby cultist structures required for the invoca return list() return ..() -/obj/effect/rune/manifest/invoke(var/list/invokers) +/obj/effect/rune/manifest/invoke(list/invokers) . = ..() var/mob/living/user = invokers[1] var/turf/T = get_turf(src) @@ -1017,7 +1017,7 @@ structure_check() searches for nearby cultist structures required for the invoca req_cultists = 3 scribe_delay = 100 -/obj/effect/rune/apocalypse/invoke(var/list/invokers) +/obj/effect/rune/apocalypse/invoke(list/invokers) if(rune_in_use) return . = ..() @@ -1123,7 +1123,7 @@ structure_check() searches for nearby cultist structures required for the invoca N.runEvent() qdel(src) -/obj/effect/rune/apocalypse/proc/image_handler(var/list/images, duration) +/obj/effect/rune/apocalypse/proc/image_handler(list/images, duration) var/end = world.time + duration set waitfor = 0 while(end>world.time) diff --git a/code/modules/antagonists/demon/sins/gluttony.dm b/code/modules/antagonists/demon/sins/gluttony.dm index da9260121acc..fa143c877332 100644 --- a/code/modules/antagonists/demon/sins/gluttony.dm +++ b/code/modules/antagonists/demon/sins/gluttony.dm @@ -48,7 +48,7 @@ ///Time before it deletes itself. var/timeleft = 15 SECONDS -/obj/effect/gluttony/timed/Initialize() +/obj/effect/gluttony/timed/Initialize(mapload) . = ..() if(timeleft) QDEL_IN(src, timeleft) diff --git a/code/modules/antagonists/devil/imp/imp.dm b/code/modules/antagonists/devil/imp/imp.dm index 7a5611cea8be..84d6303a0e58 100644 --- a/code/modules/antagonists/devil/imp/imp.dm +++ b/code/modules/antagonists/devil/imp/imp.dm @@ -40,7 +40,7 @@ Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." -/mob/living/simple_animal/imp/Initialize() +/mob/living/simple_animal/imp/Initialize(mapload) ..() boost = world.time + 30 diff --git a/code/modules/antagonists/devil/true_devil/_true_devil.dm b/code/modules/antagonists/devil/true_devil/_true_devil.dm index 9c036e2feb1e..a2ce95b245b4 100644 --- a/code/modules/antagonists/devil/true_devil/_true_devil.dm +++ b/code/modules/antagonists/devil/true_devil/_true_devil.dm @@ -26,7 +26,7 @@ var/mob/living/oldform var/list/devil_overlays[DEVIL_TOTAL_LAYERS] -/mob/living/carbon/true_devil/Initialize() +/mob/living/carbon/true_devil/Initialize(mapload) create_bodyparts() //initialize bodyparts create_internal_organs() grant_all_languages() diff --git a/code/modules/antagonists/disease/disease_disease.dm b/code/modules/antagonists/disease/disease_disease.dm index 802d7209ac9c..1ad43448edf5 100644 --- a/code/modules/antagonists/disease/disease_disease.dm +++ b/code/modules/antagonists/disease/disease_disease.dm @@ -20,7 +20,7 @@ overmind.remove_infection(src) ..() -/datum/disease/advance/sentient_disease/infect(var/mob/living/infectee, make_copy = TRUE) +/datum/disease/advance/sentient_disease/infect(mob/living/infectee, make_copy = TRUE) if(make_copy && overmind && (overmind.disease_template != src)) overmind.disease_template.infect(infectee, TRUE) //get an updated version of the virus else diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 73a5e8d4a55c..a9c6d361e279 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -105,7 +105,7 @@ the new instance inside the host to be updated to the template's stats. for(var/datum/disease_ability/ability in purchased_abilities) . += span_notice("[ability.name]") -/mob/camera/disease/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/camera/disease/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) return /mob/camera/disease/Move(NewLoc, Dir = 0) @@ -280,13 +280,13 @@ the new instance inside the host to be updated to the template's stats. if(T) forceMove(T) -/mob/camera/disease/DblClickOn(var/atom/A, params) +/mob/camera/disease/DblClickOn(atom/A, params) if(hosts[A]) set_following(A) else ..() -/mob/camera/disease/ClickOn(var/atom/A, params) +/mob/camera/disease/ClickOn(atom/A, params) if(freemove && ishuman(A)) var/mob/living/carbon/human/H = A if(tgui_alert(usr, "Select [H.name] as your initial host?", "Select Host", list("Yes", "No")) != "Yes") diff --git a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm index ef3a6cec9297..253a644b265b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_effects.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_effects.dm @@ -274,7 +274,7 @@ ///who has already used this influence var/list/siphoners = list() -/obj/effect/reality_smash/Initialize() +/obj/effect/reality_smash/Initialize(mapload) . = ..() GLOB.reality_smash_track.smashes += src img = image(icon, src, "reality_smash", OBJ_LAYER) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index c1e5e1da82c7..f4f85df58495 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -138,7 +138,7 @@ R.shatter() // Shield :b:roke qdel(R) -/obj/item/gun/magic/hook/sickly_blade/Initialize() +/obj/item/gun/magic/hook/sickly_blade/Initialize(mapload) . = ..() linked_action = new(src) diff --git a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm index 4ec64ef051db..8a460be77dad 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_magic.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_magic.dm @@ -756,7 +756,7 @@ icon_state = "small_rune_1" layer = LOW_SIGIL_LAYER -/obj/effect/glowing_rune/Initialize() +/obj/effect/glowing_rune/Initialize(mapload) . = ..() pixel_y = rand(-6,6) pixel_x = rand(-6,6) diff --git a/code/modules/antagonists/fugitive/old_god.dm b/code/modules/antagonists/fugitive/old_god.dm index 21ae7aaa957a..f9b8d067ca22 100644 --- a/code/modules/antagonists/fugitive/old_god.dm +++ b/code/modules/antagonists/fugitive/old_god.dm @@ -12,7 +12,7 @@ var/datum/action/cooldown/yalp_heal/heal var/hunters_release_time // Yogs -- making Login() dialogue make more sense -/mob/camera/yalp_elor/Initialize() +/mob/camera/yalp_elor/Initialize(mapload) . = ..() transmit = new transport = new @@ -64,7 +64,7 @@ forceMove(T) Moved(OldLoc, direct) -/mob/camera/yalp_elor/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/camera/yalp_elor/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, "You cannot send IC messages (muted).") diff --git a/code/modules/antagonists/horror/horror.dm b/code/modules/antagonists/horror/horror.dm index 67d2d4fbe55a..c077161477d8 100644 --- a/code/modules/antagonists/horror/horror.dm +++ b/code/modules/antagonists/horror/horror.dm @@ -317,7 +317,7 @@ if(stat != DEAD && victim.stat != DEAD) heal_overall_damage(1) -/mob/living/simple_animal/horror/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/horror/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(victim) to_chat(src, span_warning("You cannot speak out loud while inside a host!")) return diff --git a/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm b/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm index f2e57d9000b2..3db16153f14a 100644 --- a/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm +++ b/code/modules/antagonists/horror/horror_abilities_and_upgrades.dm @@ -209,7 +209,7 @@ soul_price = 1 var/transferring = FALSE -/datum/action/innate/horror/transfer_host/proc/is_transferring(var/mob/living/carbon/C) +/datum/action/innate/horror/transfer_host/proc/is_transferring(mob/living/carbon/C) return transferring && C.Adjacent(B.victim) /datum/action/innate/horror/transfer_host/Activate() diff --git a/code/modules/antagonists/horror/horror_datums.dm b/code/modules/antagonists/horror/horror_datums.dm index 865d7fc7aaf6..14cd039fbf26 100644 --- a/code/modules/antagonists/horror/horror_datums.dm +++ b/code/modules/antagonists/horror/horror_datums.dm @@ -287,7 +287,7 @@ R = new R.Grant(src) -/mob/living/captive_brain/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/captive_brain/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(client) if(client.prefs.muted & MUTE_IC) to_chat(src, span_danger("You cannot speak in IC (muted).")) diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index 5359b58ee695..4513e199850e 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -178,7 +178,7 @@ /mob/living/simple_animal/hostile/morph/LoseAggro() vision_range = initial(vision_range) -/mob/living/simple_animal/hostile/morph/AIShouldSleep(var/list/possible_targets) +/mob/living/simple_animal/hostile/morph/AIShouldSleep(list/possible_targets) . = ..() if(.) var/list/things = list() diff --git a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm index e26e328cbdd4..071348355324 100644 --- a/code/modules/antagonists/nukeop/equipment/borgchameleon.dm +++ b/code/modules/antagonists/nukeop/equipment/borgchameleon.dm @@ -27,7 +27,7 @@ var/mob/living/silicon/robot/user // needed for process() var/animation_playing = FALSE -/obj/item/borg_chameleon/Initialize() +/obj/item/borg_chameleon/Initialize(mapload) . = ..() friendlyName = pick(GLOB.ai_names) diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index d86339b48847..6477ecc6b202 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -33,7 +33,7 @@ var/obj/effect/countdown/nuclearbomb/countdown -/obj/machinery/nuclearbomb/Initialize() +/obj/machinery/nuclearbomb/Initialize(mapload) . = ..() countdown = new(src) GLOB.nuke_list += src @@ -517,7 +517,7 @@ proper_bomb = FALSE var/obj/structure/reagent_dispensers/beerkeg/keg -/obj/machinery/nuclearbomb/beer/Initialize() +/obj/machinery/nuclearbomb/beer/Initialize(mapload) . = ..() keg = new(src) QDEL_NULL(core) @@ -637,7 +637,7 @@ This is here to make the tiles around the station mininuke change when it's arme var/turf/lastlocation var/last_disk_move -/obj/item/disk/nuclear/Initialize() +/obj/item/disk/nuclear/Initialize(mapload) . = ..() if(!fake) GLOB.poi_list |= src diff --git a/code/modules/antagonists/nukeop/equipment/pinpointer.dm b/code/modules/antagonists/nukeop/equipment/pinpointer.dm index 3c1efe8faaf1..d81ca2e80459 100644 --- a/code/modules/antagonists/nukeop/equipment/pinpointer.dm +++ b/code/modules/antagonists/nukeop/equipment/pinpointer.dm @@ -67,7 +67,7 @@ desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives." flags_1 = NONE -/obj/item/pinpointer/syndicate_cyborg/Initialize() +/obj/item/pinpointer/syndicate_cyborg/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT) diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 96bc231adc38..591f4279e954 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -168,7 +168,7 @@ /mob/living/simple_animal/revenant/med_hud_set_status() return //we use no hud -/mob/living/simple_animal/revenant/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/revenant/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(!message) return src.log_talk(message, LOG_SAY) @@ -376,7 +376,7 @@ var/old_key //key of the previous revenant, will have first pick on reform. var/mob/living/simple_animal/revenant/revenant -/obj/item/ectoplasm/revenant/Initialize() +/obj/item/ectoplasm/revenant/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(try_reform)), 600) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index f81c23c44083..5493f5eefb60 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -47,7 +47,7 @@ del_on_death = 1 deathmessage = "screams in anger as it collapses into a puddle of viscera!" -/mob/living/simple_animal/slaughter/Initialize() +/mob/living/simple_animal/slaughter/Initialize(mapload) ..() var/obj/effect/proc_holder/spell/bloodcrawl/bloodspell = new AddSpell(bloodspell) @@ -175,7 +175,7 @@ playsound(T, feast_sound, 50, 1, -1) to_chat(M, span_clown("You leave [src]'s warm embrace, and feel ready to take on the world.")) -/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(var/mob/living/victim) +/mob/living/simple_animal/slaughter/laughter/bloodcrawl_swallow(mob/living/victim) if(consumed_mobs) // Keep their corpse so rescue is possible consumed_mobs += victim diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index ca12ec0146c2..28b33a22a8b3 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -289,7 +289,7 @@ if(malf) killer.add_malf_picker() -/datum/antagonist/traitor/proc/equip(var/silent = FALSE) +/datum/antagonist/traitor/proc/equip(silent = FALSE) if(traitor_kind == TRAITOR_HUMAN) uplink_holder = owner.equip_traitor(employer, silent, src) //yogs - uplink_holder = diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 8d1dd9363c25..abea49d42908 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -253,7 +253,7 @@ GLOBAL_LIST_INIT(malf_modules, subtypesof(/datum/AI_Module)) var/detonation_timer var/next_announce -/obj/machinery/doomsday_device/Initialize() +/obj/machinery/doomsday_device/Initialize(mapload) . = ..() countdown = new(src) diff --git a/code/modules/antagonists/traitor/equipment/contractor.dm b/code/modules/antagonists/traitor/equipment/contractor.dm index 2895c3a98ff6..8ff3b2388e7d 100644 --- a/code/modules/antagonists/traitor/equipment/contractor.dm +++ b/code/modules/antagonists/traitor/equipment/contractor.dm @@ -112,7 +112,7 @@ limited = 2 cost = 0 -/datum/contractor_item/contract_reroll/handle_purchase(var/datum/contractor_hub/hub) +/datum/contractor_item/contract_reroll/handle_purchase(datum/contractor_hub/hub) . = ..() if (.) @@ -159,7 +159,7 @@ cost = 2 var/datum/mind/partner_mind = null -/datum/contractor_item/contractor_partner/handle_purchase(var/datum/contractor_hub/hub, mob/living/user) +/datum/contractor_item/contractor_partner/handle_purchase(datum/contractor_hub/hub, mob/living/user) . = ..() if (.) @@ -238,7 +238,7 @@ limited = 2 cost = 3 -/datum/contractor_item/blackout/handle_purchase(var/datum/contractor_hub/hub) +/datum/contractor_item/blackout/handle_purchase(datum/contractor_hub/hub) . = ..() if (.) @@ -246,7 +246,7 @@ priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", ANNOUNCER_POWEROFF) // Subtract cost, and spawn if it's an item. -/datum/contractor_item/proc/handle_purchase(var/datum/contractor_hub/hub, mob/living/user) +/datum/contractor_item/proc/handle_purchase(datum/contractor_hub/hub, mob/living/user) if (hub.contract_rep >= cost) hub.contract_rep -= cost diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index e8c6242cb0d5..bf4db5b81c8c 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -45,7 +45,7 @@ var/location = pick_list_weighted(WANTED_FILE, "location") wanted_message = "[base] [verb_string] [noun] [location]." -/datum/syndicate_contract/proc/handle_extraction(var/mob/living/user) +/datum/syndicate_contract/proc/handle_extraction(mob/living/user) if (contract.target && contract.dropoff_check(user, contract.target.current)) var/turf/free_location = find_obstruction_free_location(3, user, contract.dropoff) @@ -151,7 +151,7 @@ $[C.registered_account.account_balance].") // They're off to holding - handle the return timer and give some text about what's going on. -/datum/syndicate_contract/proc/handleVictimExperience(var/mob/living/M) +/datum/syndicate_contract/proc/handleVictimExperience(mob/living/M) // Ship 'em back - dead or alive, 4 minutes wait. // Even if they weren't the target, we're still treating them the same. addtimer(CALLBACK(src, PROC_REF(returnVictim), M), (6 SECONDS * 10) * 4) @@ -186,7 +186,7 @@ M.adjust_confusion(20 SECONDS) // We're returning the victim -/datum/syndicate_contract/proc/returnVictim(var/mob/living/M) +/datum/syndicate_contract/proc/returnVictim(mob/living/M) var/list/possible_drop_loc = list() for (var/turf/possible_drop in contract.dropoff.contents) diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index 09566b65982a..a8d38d361538 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -22,7 +22,7 @@ var/rend_desc = "You should run now." var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning -/obj/item/veilrender/Initialize() +/obj/item/veilrender/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 80, 100) @@ -45,7 +45,7 @@ var/spawn_amt_left = 20 var/spawn_fast = 0 -/obj/effect/rend/New(loc, var/spawn_type, var/spawn_amt, var/desc, var/spawn_fast) +/obj/effect/rend/New(loc, spawn_type, spawn_amt, desc, spawn_fast) src.spawn_path = spawn_type src.spawn_amt_left = spawn_amt src.desc = desc @@ -471,6 +471,6 @@ duration = 40 pixel_x = 500 -/obj/effect/temp_visual/tornado/Initialize() +/obj/effect/temp_visual/tornado/Initialize(mapload) . = ..() animate(src, pixel_x = -500, time = 4 SECONDS) diff --git a/code/modules/antagonists/zombie/zombie.dm b/code/modules/antagonists/zombie/zombie.dm index 334a10cec74e..efa491c95810 100644 --- a/code/modules/antagonists/zombie/zombie.dm +++ b/code/modules/antagonists/zombie/zombie.dm @@ -372,7 +372,7 @@ var/silent = TRUE //Do you have to be conscious to use this? -/obj/effect/proc_holder/zombie/Initialize() +/obj/effect/proc_holder/zombie/Initialize(mapload) . = ..() action = new(src) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index ed41fff2b090..97f7b4c017f2 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -58,7 +58,7 @@ return TRUE -//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs +//Called when another assembly acts on this one, radio will determine where it came from for wire calcs /obj/item/assembly/proc/pulsed(radio = FALSE) if(wire_type & WIRE_RECEIVE) INVOKE_ASYNC(src, PROC_REF(activate)) @@ -67,7 +67,7 @@ return TRUE -//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct +//Called when this device attempts to act on another device, radio determines if it was sent via radio or direct /obj/item/assembly/proc/pulse(radio = FALSE) if(connected && wire_type) connected.pulse_assembly(src) diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm index efffbc03a861..3c983852d139 100644 --- a/code/modules/assembly/holder.dm +++ b/code/modules/assembly/holder.dm @@ -14,7 +14,7 @@ var/obj/item/assembly/a_left = null var/obj/item/assembly/a_right = null -/obj/item/assembly_holder/Initialize() +/obj/item/assembly_holder/Initialize(mapload) . = ..() var/static/rotation_flags = ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_FLIP | ROTATION_VERBS AddComponent(/datum/component/simple_rotation, rotation_flags) diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm index 6c1260c559b6..3376e86cb0a5 100644 --- a/code/modules/assembly/igniter.dm +++ b/code/modules/assembly/igniter.dm @@ -11,7 +11,7 @@ user.ignite_mob() return FIRELOSS -/obj/item/assembly/igniter/Initialize() +/obj/item/assembly/igniter/Initialize(mapload) . = ..() sparks = new sparks.set_up(2, 0, src) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index e19ace6dfc07..a8136d59619e 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -11,7 +11,7 @@ var/turf/listeningTo var/hearing_range = 3 -/obj/item/assembly/infra/Initialize() +/obj/item/assembly/infra/Initialize(mapload) . = ..() beams = list() START_PROCESSING(SSobj, src) diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm index 4ef4ed3e2940..ae7b26bef1da 100644 --- a/code/modules/assembly/proximity.dm +++ b/code/modules/assembly/proximity.dm @@ -9,7 +9,7 @@ var/sensitivity = 1 var/hearing_range = 3 -/obj/item/assembly/prox_sensor/Initialize() +/obj/item/assembly/prox_sensor/Initialize(mapload) . = ..() proximity_monitor = new(src, 0) START_PROCESSING(SSobj, src) diff --git a/code/modules/assembly/radio.dm b/code/modules/assembly/radio.dm index c0a5a5549042..a4b062d924fd 100644 --- a/code/modules/assembly/radio.dm +++ b/code/modules/assembly/radio.dm @@ -17,7 +17,7 @@ // If the encryption key can be removed var/key_locked = FALSE -/obj/item/assembly/radio/Initialize() +/obj/item/assembly/radio/Initialize(mapload) . = ..() radio = new(src) if(radio_key) diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 8b097bee28c5..d549dba6d50a 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -29,7 +29,7 @@ user.set_suicide(TRUE) user.suicide_log() -/obj/item/assembly/signaler/Initialize() +/obj/item/assembly/signaler/Initialize(mapload) . = ..() set_frequency(frequency) diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm index 0c5011f07425..0861f88d4eb9 100644 --- a/code/modules/assembly/timer.dm +++ b/code/modules/assembly/timer.dm @@ -21,7 +21,7 @@ user.adjustOxyLoss(200) user.death(0) -/obj/item/assembly/timer/Initialize() +/obj/item/assembly/timer/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm index 6f5e56423b8b..ab5068eb1373 100644 --- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm +++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm @@ -34,7 +34,7 @@ var/list/atmos_overlay_types //gas IDs of current active gas overlays is_openturf = TRUE -/turf/open/Initialize() +/turf/open/Initialize(mapload) if(!blocks_air) air = new air.copy_from_turf(src) diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm index 22a407f3d14b..861f457062fd 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_devices.dm @@ -21,7 +21,7 @@ return list(turn(dir, 180), dir) ///Used by binary devices to set what the offset will be for each layer -/obj/machinery/atmospherics/components/binary/proc/set_overlay_offset(var/pipe_layer) +/obj/machinery/atmospherics/components/binary/proc/set_overlay_offset(pipe_layer) switch(pipe_layer) if(1, 3, 5) return 1 diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index 184258760675..edb0f39239ab 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -101,7 +101,7 @@ /obj/machinery/atmospherics/components/replacePipenet(datum/pipeline/Old, datum/pipeline/New) parents[parents.Find(Old)] = New -/obj/machinery/atmospherics/components/unsafe_pressure_release(var/mob/user, var/pressures) +/obj/machinery/atmospherics/components/unsafe_pressure_release(mob/user, pressures) ..() var/turf/T = get_turf(src) @@ -126,7 +126,7 @@ T.assume_air(to_release) air_update_turf(1) -/obj/machinery/atmospherics/components/proc/safe_input(var/title, var/text, var/default_set) +/obj/machinery/atmospherics/components/proc/safe_input(title, text, default_set) var/new_value = input(usr,text,title,default_set) as num if(usr.canUseTopic(src)) return new_value diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm index b5a1003f339c..5e22afc0705c 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_core.dm @@ -1,5 +1,5 @@ /** - * This section contain the hfr core with all the variables and the Initialize() and Destroy() procs + * This section contain the hfr core with all the variables and the Initialize(mapload) and Destroy() procs */ /obj/machinery/atmospherics/components/unary/hypertorus/core name = "HFR core" diff --git a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm index d3b1dfab1e01..ec56fa1788a7 100644 --- a/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm +++ b/code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm @@ -32,7 +32,7 @@ ///Stores the total amount of moles needed for the current recipe var/total_recipe_moles = 0 -/obj/machinery/atmospherics/components/binary/crystallizer/Initialize() +/obj/machinery/atmospherics/components/binary/crystallizer/Initialize(mapload) . = ..() internal = new diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm index 13fcd05d0ae6..c587b1b1b630 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm @@ -47,7 +47,7 @@ Housekeeping and pipe network stuff return list(node1_connect, node2_connect, node3_connect) -/obj/machinery/atmospherics/components/trinary/proc/set_overlay_offset(var/pipe_layer) +/obj/machinery/atmospherics/components/trinary/proc/set_overlay_offset(pipe_layer) switch(pipe_layer) if(1) return 1 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 8c5b6271de3e..457b22944185 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -40,7 +40,7 @@ payment_department = ACCOUNT_MED -/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize() +/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize(mapload) . = ..() initialize_directions = dir diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index 801f7a4b2fcf..62c5ef10b2ad 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -23,7 +23,7 @@ var/heat_capacity = 0 var/interactive = TRUE // So mapmakers can disable interaction. -/obj/machinery/atmospherics/components/unary/thermomachine/Initialize() +/obj/machinery/atmospherics/components/unary/thermomachine/Initialize(mapload) . = ..() initialize_directions = dir @@ -199,7 +199,7 @@ on = TRUE icon_state = "freezer_1" -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/Initialize() +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/Initialize(mapload) . = ..() if(target_temperature == initial(target_temperature)) target_temperature = min_temperature @@ -207,7 +207,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom name = "cold room freezer" -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom/Initialize() +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on/coldroom/Initialize(mapload) . = ..() target_temperature = T0C-80 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index bca6f49eeb7c..672fa9af62c9 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -149,7 +149,7 @@ scrub(tile) return TRUE -/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(var/turf/tile) +/obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile) if(!istype(tile)) return FALSE var/datum/gas_mixture/environment = tile.return_air() diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index db6cb5682a06..b6a6290539d9 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -28,7 +28,7 @@ idle_power_usage = 150 active_power_usage = 2000 -/obj/machinery/atmospherics/miner/Initialize() +/obj/machinery/atmospherics/miner/Initialize(mapload) . = ..() set_active(active) //Force overlay update. diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index 5f9e874880dd..40db098a78ac 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -7,7 +7,7 @@ var/icon_temperature = T20C //stop small changes in temperature causing icon refresh resistance_flags = LAVA_PROOF | FIRE_PROOF -/obj/machinery/atmospherics/pipe/heat_exchanging/Initialize() +/obj/machinery/atmospherics/pipe/heat_exchanging/Initialize(mapload) . = ..() add_atom_colour("#404040", FIXED_COLOUR_PRIORITY) diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index 00285a5f77d1..40eeb619ba4f 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -20,7 +20,7 @@ var/list/front_nodes var/list/back_nodes -/obj/machinery/atmospherics/pipe/layer_manifold/Initialize() +/obj/machinery/atmospherics/pipe/layer_manifold/Initialize(mapload) front_nodes = list() back_nodes = list() icon_state = "manifoldlayer_center" diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm index 7e1464138d0f..e051cf04f92f 100644 --- a/code/modules/atmospherics/machinery/pipes/manifold.dm +++ b/code/modules/atmospherics/machinery/pipes/manifold.dm @@ -22,8 +22,8 @@ var/mutable_appearance/center -/* We use New() instead of Initialize() because these values are used in update_icon() - * in the mapping subsystem init before Initialize() is called in the atoms subsystem init. +/* We use New() instead of Initialize(mapload) because these values are used in update_icon() + * in the mapping subsystem init before Initialize(mapload) is called in the atoms subsystem init. * This is true for the other manifolds (the 4 ways and the heat exchanges) too. */ /obj/machinery/atmospherics/pipe/manifold/New() diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 5ff4b2868fa0..a4b2f4ece714 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -270,7 +270,7 @@ pump.stat = 0 SSair.add_to_rebuild_queue(pump) -/obj/machinery/portable_atmospherics/canister/Initialize() +/obj/machinery/portable_atmospherics/canister/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm index 14a413defbf2..c5558ef62a09 100644 --- a/code/modules/atmospherics/machinery/portable/pump.dm +++ b/code/modules/atmospherics/machinery/portable/pump.dm @@ -15,7 +15,7 @@ volume = 1000 -/obj/machinery/portable_atmospherics/pump/Initialize() +/obj/machinery/portable_atmospherics/pump/Initialize(mapload) . = ..() pump = new(src, FALSE) pump.on = TRUE diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm index 692412c4b944..6d9e143dbfcc 100644 --- a/code/modules/atmospherics/machinery/portable/scrubber.dm +++ b/code/modules/atmospherics/machinery/portable/scrubber.dm @@ -56,7 +56,7 @@ var/turf/T = get_turf(src) scrub(T.return_air()) -/obj/machinery/portable_atmospherics/scrubber/proc/scrub(var/datum/gas_mixture/mixture) +/obj/machinery/portable_atmospherics/scrubber/proc/scrub(datum/gas_mixture/mixture) if(air_contents.return_pressure() >= overpressure_m * ONE_ATMOSPHERE) return diff --git a/code/modules/awaymissions/away_props.dm b/code/modules/awaymissions/away_props.dm index e3143445d787..5b1007aac624 100644 --- a/code/modules/awaymissions/away_props.dm +++ b/code/modules/awaymissions/away_props.dm @@ -21,7 +21,7 @@ invisibility = INVISIBILITY_MAXIMUM var/strength = 30 -/obj/effect/wind/Initialize() +/obj/effect/wind/Initialize(mapload) . = ..() START_PROCESSING(SSobj,src) @@ -40,7 +40,7 @@ var/list/blocked_types = list() var/reverse = FALSE //Block if path not present -/obj/effect/path_blocker/Initialize() +/obj/effect/path_blocker/Initialize(mapload) . = ..() if(blocked_types.len) blocked_types = typecacheof(blocked_types) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index be680d67251a..31e7d7fa5d59 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -35,7 +35,7 @@ QDEL_NULL(reset) return ..() -/obj/item/twohanded/ctf/Initialize() +/obj/item/twohanded/ctf/Initialize(mapload) . = ..() if(!reset) reset = new reset_path(get_turf(src)) @@ -163,7 +163,7 @@ var/static/arena_reset = FALSE var/static/list/people_who_want_to_play = list() -/obj/machinery/capture_the_flag/Initialize() +/obj/machinery/capture_the_flag/Initialize(mapload) . = ..() GLOB.poi_list |= src @@ -260,7 +260,7 @@ addtimer(CALLBACK(src, PROC_REF(clear_cooldown), body.ckey), respawn_cooldown, TIMER_UNIQUE) body.dust() -/obj/machinery/capture_the_flag/proc/clear_cooldown(var/ckey) +/obj/machinery/capture_the_flag/proc/clear_cooldown(ckey) recently_dead_ckeys -= ckey /obj/machinery/capture_the_flag/proc/spawn_team_member(client/new_team_member) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index e8f3e31417d8..14007b5a3087 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -135,7 +135,7 @@ mob_type = /mob/living/carbon/human //Human specific stuff. var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID. - var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize() + var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize(mapload) var/disable_pda = TRUE var/disable_sensors = TRUE //All of these only affect the ID that the outfit has placed in the ID slot @@ -170,7 +170,7 @@ var/facial_hair_style var/skin_tone -/obj/effect/mob_spawn/human/Initialize() +/obj/effect/mob_spawn/human/Initialize(mapload) if(ispath(outfit)) outfit = new outfit() if(!outfit) diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm index bb9b2081180f..c183a67a633d 100644 --- a/code/modules/awaymissions/gateway.dm +++ b/code/modules/awaymissions/gateway.dm @@ -14,7 +14,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) var/list/linked = list() var/can_link = FALSE //Is this the centerpiece? -/obj/machinery/gateway/Initialize() +/obj/machinery/gateway/Initialize(mapload) randomspawns = GLOB.awaydestinations update_icon() if(!istype(src, /obj/machinery/gateway/centerstation) && !istype(src, /obj/machinery/gateway/centeraway)) @@ -76,7 +76,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/safe_throw_at(atom/target, range, speed, mob/thrower, spin = TRUE, diagonals_first = FALSE, datum/callback/callback, force = MOVE_FORCE_STRONG, quickstart = TRUE) return -/obj/machinery/gateway/centerstation/Initialize() +/obj/machinery/gateway/centerstation/Initialize(mapload) . = ..() if(!GLOB.the_gateway) GLOB.the_gateway = src @@ -177,7 +177,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) can_link = TRUE -/obj/machinery/gateway/centeraway/Initialize() +/obj/machinery/gateway/centeraway/Initialize(mapload) . = ..() update_icon() stationgate = locate(/obj/machinery/gateway/centerstation) @@ -239,7 +239,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation) /obj/machinery/gateway/centeraway/admin desc = "A mysterious gateway built by unknown hands, this one seems more compact." -/obj/machinery/gateway/centeraway/admin/Initialize() +/obj/machinery/gateway/centeraway/admin/Initialize(mapload) . = ..() if(stationgate && !stationgate.awaygate) stationgate.awaygate = src diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm index 38ebc62e93b6..b6e9e8ca6ba2 100644 --- a/code/modules/awaymissions/mission_code/Academy.dm +++ b/code/modules/awaymissions/mission_code/Academy.dm @@ -231,7 +231,7 @@ user.dropItemToGround(src) -/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user,roll) +/obj/item/dice/d20/fate/proc/effect(mob/living/carbon/human/user,roll) var/turf/T = get_turf(src) switch(roll) if(1) diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm index 73b975fad814..e82ec6d3cad8 100644 --- a/code/modules/awaymissions/mission_code/Cabin.dm +++ b/code/modules/awaymissions/mission_code/Cabin.dm @@ -24,7 +24,7 @@ density = FALSE var/active = 1 -/obj/structure/firepit/Initialize() +/obj/structure/firepit/Initialize(mapload) . = ..() toggleFirepit() diff --git a/code/modules/awaymissions/mission_code/murderdome.dm b/code/modules/awaymissions/mission_code/murderdome.dm index 914a1f2828c7..0af5f2499d45 100644 --- a/code/modules/awaymissions/mission_code/murderdome.dm +++ b/code/modules/awaymissions/mission_code/murderdome.dm @@ -31,7 +31,7 @@ icon_state = "barrier0" alpha = 100 -/obj/effect/murderdome/dead_barricade/Initialize() +/obj/effect/murderdome/dead_barricade/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(respawn)), 3 MINUTES) diff --git a/code/modules/awaymissions/mission_code/runner.dm b/code/modules/awaymissions/mission_code/runner.dm index e881112a4cb7..43c69447c648 100644 --- a/code/modules/awaymissions/mission_code/runner.dm +++ b/code/modules/awaymissions/mission_code/runner.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(vr_runner_tiles) var/not_reset = FALSE // check so turfs dont fall after being reset var/falling_time = 1.5 SECONDS // time it takes for the turf to fall -/turf/open/indestructible/runner/Initialize() +/turf/open/indestructible/runner/Initialize(mapload) . = ..() GLOB.vr_runner_tiles += src diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index d37660b43e53..cc3fec872b8e 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -22,7 +22,7 @@ /obj/effect/landmark/sc_bible_spawner name = "Safecode hint spawner" -/obj/effect/landmark/sc_bible_spawner/Initialize() +/obj/effect/landmark/sc_bible_spawner/Initialize(mapload) ..() var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible/booze(loc) B.name = "The Holy book of the Geometer" @@ -49,7 +49,7 @@ //Syndicate sub-machine guns. /obj/item/gun/ballistic/automatic/c20r/sc_c20r -/obj/item/gun/ballistic/automatic/c20r/sc_c20r/Initialize() +/obj/item/gun/ballistic/automatic/c20r/sc_c20r/Initialize(mapload) . = ..() for(var/ammo in magazine.stored_ammo) if(prob(95)) //95% chance @@ -58,7 +58,7 @@ //Barman's shotgun /obj/item/gun/ballistic/shotgun/sc_pump -/obj/item/gun/ballistic/shotgun/sc_pump/Initialize() +/obj/item/gun/ballistic/shotgun/sc_pump/Initialize(mapload) . = ..() for(var/ammo in magazine.stored_ammo) if(prob(95)) //95% chance @@ -85,13 +85,13 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison name = "smudged paper" -/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/Initialize() +/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/Initialize(mapload) . = ..() info = "The ink is smudged, you can only make out a couple numbers: '[GLOB.sc_safecode1]**[GLOB.sc_safecode4]*'" /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro name = "shredded paper" -/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/Initialize() +/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/Initialize(mapload) . = ..() info = "Although the paper is shredded, you can clearly see the number: '[GLOB.sc_safecode2]'" @@ -102,7 +102,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible name = "hidden paper" -/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/Initialize() +/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/Initialize(mapload) . = ..() info = {"It would appear that the pen hidden with the paper had leaked ink over the paper. However you can make out the last three digits:'[GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]' @@ -127,7 +127,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]") /obj/item/storage/secure/safe/sc_ssafe name = "Captain's secure safe" -/obj/item/storage/secure/safe/sc_ssafe/Initialize() +/obj/item/storage/secure/safe/sc_ssafe/Initialize(mapload) . = ..() l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]" l_set = 1 diff --git a/code/modules/awaymissions/signpost.dm b/code/modules/awaymissions/signpost.dm index 7fb1a5896cf7..beb4c49d2856 100644 --- a/code/modules/awaymissions/signpost.dm +++ b/code/modules/awaymissions/signpost.dm @@ -7,7 +7,7 @@ var/question = "Travel back?" var/list/zlevels -/obj/structure/signpost/Initialize() +/obj/structure/signpost/Initialize(mapload) . = ..() set_light(2) zlevels = SSmapping.levels_by_trait(ZTRAIT_STATION) @@ -63,7 +63,7 @@ exit the area." question = "Leave? You might never come back." -/obj/structure/signpost/exit/Initialize() +/obj/structure/signpost/exit/Initialize(mapload) . = ..() zlevels = list() for(var/i in 1 to world.maxz) diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm index 0c4c8269e48d..f6e18b6ec5b5 100644 --- a/code/modules/awaymissions/super_secret_room.dm +++ b/code/modules/awaymissions/super_secret_room.dm @@ -10,7 +10,7 @@ var/times_spoken_to = 0 var/list/shenanigans = list() -/obj/structure/speaking_tile/Initialize() +/obj/structure/speaking_tile/Initialize(mapload) . = ..() var/json_file = file("data/npc_saves/Poly.json") if(!fexists(json_file)) @@ -123,7 +123,7 @@ w_class = WEIGHT_CLASS_SMALL materials = list(/datum/material/glass = 500) -/obj/item/rupee/Initialize() +/obj/item/rupee/Initialize(mapload) . = ..() var/newcolor = color2hex(pick(10;"green", 5;"blue", 3;"red", 1;"purple")) add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) diff --git a/code/modules/cargo/bounty_console.dm b/code/modules/cargo/bounty_console.dm index 6a2e47dd4d7e..1059bb18e716 100644 --- a/code/modules/cargo/bounty_console.dm +++ b/code/modules/cargo/bounty_console.dm @@ -9,7 +9,7 @@ var/printer_ready = 0 //cooldown var var/static/datum/bank_account/cargocash -/obj/machinery/computer/bounty/Initialize() +/obj/machinery/computer/bounty/Initialize(mapload) . = ..() printer_ready = world.time + PRINTER_TIMEOUT cargocash = SSeconomy.get_dep_account(ACCOUNT_CAR) @@ -20,7 +20,7 @@ /obj/item/paper/bounty_printout name = "paper - Bounties" -/obj/item/paper/bounty_printout/Initialize() +/obj/item/paper/bounty_printout/Initialize(mapload) . = ..() info = "

    Nanotrasen Cargo Bounties


    " update_icon() diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index 4ceb0113c062..40bf5def556a 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -552,7 +552,7 @@ var/turf/drop = locate(coords_list[1], coords_list[2], coords_list[3]) setupView(RANGE_TURFS(3, drop)) -/datum/centcom_podlauncher/proc/setupView(var/list/visible_turfs) +/datum/centcom_podlauncher/proc/setupView(list/visible_turfs) var/list/bbox = get_bbox_of_atoms(visible_turfs) var/size_x = bbox[3] - bbox[1] + 1 var/size_y = bbox[4] - bbox[2] + 1 @@ -802,7 +802,7 @@ for (var/mob/living/M in whoDyin) admin_ticket_log(M, "[key_name_admin(usr)] [msg]") -/datum/centcom_podlauncher/proc/loadData(var/list/dataToLoad) +/datum/centcom_podlauncher/proc/loadData(list/dataToLoad) bayNumber = dataToLoad["bayNumber"] customDropoff = dataToLoad["customDropoff"] renderLighting = dataToLoad["renderLighting"] diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index eb1cec360c9d..b09cd169f262 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -26,7 +26,7 @@ can_send = FALSE can_approve_requests = FALSE -/obj/machinery/computer/cargo/Initialize() +/obj/machinery/computer/cargo/Initialize(mapload) . = ..() var/obj/item/circuitboard/computer/cargo/board = circuit contraband = board.contraband diff --git a/code/modules/cargo/expressconsole.dm b/code/modules/cargo/expressconsole.dm index 785c55fb3f9e..c9d22a586f26 100644 --- a/code/modules/cargo/expressconsole.dm +++ b/code/modules/cargo/expressconsole.dm @@ -25,7 +25,7 @@ var/locked = TRUE //is the console locked? unlock with ID var/usingBeacon = FALSE //is the console in beacon mode? exists to let beacon know when a pod may come in -/obj/machinery/computer/cargo/express/Initialize() +/obj/machinery/computer/cargo/express/Initialize(mapload) . = ..() packin_up() @@ -141,7 +141,7 @@ if(D.adjust_money(-BEACON_COST)) cooldown = 10//a ~ten second cooldown for printing beacons to prevent spam var/obj/item/supplypod_beacon/C = new /obj/item/supplypod_beacon(drop_location()) - C.link_console(src, usr)//rather than in beacon's Initialize(), we can assign the computer to the beacon by reusing this proc) + C.link_console(src, usr)//rather than in beacon's Initialize(mapload), we can assign the computer to the beacon by reusing this proc) printed_beacons++//printed_beacons starts at 0, so the first one out will be called beacon # 1 beacon.name = "Supply Pod Beacon #[printed_beacons]" diff --git a/code/modules/cargo/order.dm b/code/modules/cargo/order.dm index 3c532e137355..ca7883ffb2bf 100644 --- a/code/modules/cargo/order.dm +++ b/code/modules/cargo/order.dm @@ -57,7 +57,7 @@ P.update_icon() return P -/datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C, var/owner, var/packname) //generates-the-manifests. +/datum/supply_order/proc/generateManifest(obj/structure/closet/crate/C, owner, packname) //generates-the-manifests. var/obj/item/paper/fluff/jobs/cargo/manifest/P = new(C, id, 0) var/station_name = (P.errors & MANIFEST_ERROR_NAME) ? new_station_name() : station_name() @@ -109,8 +109,8 @@ generateManifest(C, account_holder, pack) return C -/datum/supply_order/proc/generateCombo(var/miscbox, var/misc_own, var/misc_contents) +/datum/supply_order/proc/generateCombo(miscbox, misc_own, misc_contents) for (var/I in misc_contents) new I(miscbox) generateManifest(miscbox, misc_own, "") - return \ No newline at end of file + return diff --git a/code/modules/cargo/supplypod.dm b/code/modules/cargo/supplypod.dm index a66293a499da..f7c55fc15716 100644 --- a/code/modules/cargo/supplypod.dm +++ b/code/modules/cargo/supplypod.dm @@ -82,7 +82,7 @@ delays = list(POD_TRANSIT = 20, POD_FALLING = 4, POD_OPENING = 30, POD_LEAVING = 30) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/structure/closet/supplypod/Initialize(var/customStyle = FALSE) +/obj/structure/closet/supplypod/Initialize(mapload, customStyle = FALSE) . = ..() if (!loc) var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/podStorage] //temporary holder for supplypods mid-transit @@ -91,7 +91,7 @@ style = customStyle setStyle(style) //Upon initialization, give the supplypod an iconstate, name, and description based on the "style" variable. This system is important for the centcom_podlauncher to function correctly -/obj/structure/closet/supplypod/extractionpod/Initialize() +/obj/structure/closet/supplypod/extractionpod/Initialize(mapload) . = ..() var/turf/picked_turf = pick(GLOB.holdingfacility) reverse_dropoff_coords = list(picked_turf.x, picked_turf.y, picked_turf.z) diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index ca8417f9bb04..a8464a573325 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -12,7 +12,7 @@ var/ready = FALSE var/launched = FALSE -/obj/item/supplypod_beacon/proc/update_status(var/consoleStatus) +/obj/item/supplypod_beacon/proc/update_status(consoleStatus) switch(consoleStatus) if (SP_LINKED) linked = TRUE diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 913470993949..cb252326ffce 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( src << browse(file('html/statbrowser.html'), "window=statbrowser") // Initialize tgui panel - tgui_panel.initialize() + tgui_panel.Initialize() src << browse(file('html/statbrowser.html'), "window=statbrowser") addtimer(CALLBACK(src, PROC_REF(check_panel_loaded)), 5 SECONDS) @@ -1081,7 +1081,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(statbrowser_ready) return to_chat(src, span_userdanger("Statpanel failed to load, click here to reload the panel ")) - tgui_panel.initialize() + tgui_panel.Initialize() /client/verb/stop_client_sounds() set name = "Stop Sounds" diff --git a/code/modules/client/message.dm b/code/modules/client/message.dm index e282e3a6cbf6..ae47da5fe4c9 100644 --- a/code/modules/client/message.dm +++ b/code/modules/client/message.dm @@ -1,6 +1,6 @@ GLOBAL_LIST_EMPTY(clientmessages) -/proc/addclientmessage(var/ckey, var/message) +/proc/addclientmessage(ckey, message) ckey = ckey(ckey) if (!ckey || !message) return diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 9a38ad4f2575..31cb70d3e407 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -257,7 +257,7 @@ select_look(owner) return 1 -/datum/action/item_action/chameleon/change/proc/emp_randomise(var/amount = EMP_RANDOMISE_TIME) +/datum/action/item_action/chameleon/change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME) START_PROCESSING(SSprocessing, src) random_look(owner) @@ -294,7 +294,7 @@ icon_state = "engine" item_state = "engi_suit" -/obj/item/clothing/under/chameleon/Initialize() +/obj/item/clothing/under/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -311,7 +311,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/under/chameleon/broken/Initialize() +/obj/item/clothing/under/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -328,7 +328,7 @@ /obj/item/clothing/under/plasmaman/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/under/plasmaman/chameleon/Initialize() +/obj/item/clothing/under/plasmaman/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -360,7 +360,7 @@ /obj/item/clothing/suit/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/suit/chameleon/Initialize() +/obj/item/clothing/suit/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -377,7 +377,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/suit/chameleon/broken/Initialize() +/obj/item/clothing/suit/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -394,7 +394,7 @@ /obj/item/clothing/glasses/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/glasses/chameleon/Initialize() +/obj/item/clothing/glasses/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -411,7 +411,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/glasses/chameleon/broken/Initialize() +/obj/item/clothing/glasses/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -429,7 +429,7 @@ /obj/item/clothing/gloves/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/gloves/chameleon/Initialize() +/obj/item/clothing/gloves/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -446,7 +446,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/gloves/chameleon/broken/Initialize() +/obj/item/clothing/gloves/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -463,7 +463,7 @@ /obj/item/clothing/head/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/head/chameleon/Initialize() +/obj/item/clothing/head/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -480,7 +480,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/head/chameleon/broken/Initialize() +/obj/item/clothing/head/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -496,7 +496,7 @@ /obj/item/clothing/head/helmet/space/plasmaman/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/head/helmet/space/plasmaman/chameleon/Initialize() +/obj/item/clothing/head/helmet/space/plasmaman/chameleon/Initialize(mapload) . = ..() chameleon_action = new /datum/action/item_action/chameleon/change if(syndicate) @@ -519,7 +519,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) // which means it offers no protection, it's just air and light -/obj/item/clothing/head/chameleon/drone/Initialize() +/obj/item/clothing/head/chameleon/drone/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) chameleon_action.random_look() @@ -547,7 +547,7 @@ /obj/item/clothing/mask/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/mask/chameleon/Initialize() +/obj/item/clothing/mask/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -564,7 +564,7 @@ return chameleon_action.emp_randomise() -/obj/item/clothing/mask/chameleon/broken/Initialize() +/obj/item/clothing/mask/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -583,7 +583,7 @@ // Can drones use the voice changer part? Let's not find out. vchange = 0 -/obj/item/clothing/mask/chameleon/drone/Initialize() +/obj/item/clothing/mask/chameleon/drone/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) chameleon_action.random_look() @@ -608,7 +608,7 @@ /obj/item/clothing/shoes/chameleon/syndicate syndicate = TRUE -/obj/item/clothing/shoes/chameleon/Initialize() +/obj/item/clothing/shoes/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -635,7 +635,7 @@ /obj/item/clothing/shoes/chameleon/noslip/syndicate syndicate = TRUE -/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize() +/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -646,7 +646,7 @@ /obj/item/storage/backpack/chameleon/syndicate syndicate = TRUE -/obj/item/storage/backpack/chameleon/Initialize() +/obj/item/storage/backpack/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -662,7 +662,7 @@ return chameleon_action.emp_randomise() -/obj/item/storage/backpack/chameleon/broken/Initialize() +/obj/item/storage/backpack/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -674,7 +674,7 @@ /obj/item/storage/belt/chameleon/syndicate syndicate = TRUE -/obj/item/storage/belt/chameleon/Initialize() +/obj/item/storage/belt/chameleon/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) @@ -693,7 +693,7 @@ return chameleon_action.emp_randomise() -/obj/item/storage/belt/chameleon/broken/Initialize() +/obj/item/storage/belt/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -704,7 +704,7 @@ /obj/item/radio/headset/chameleon/syndicate syndicate = TRUE -/obj/item/radio/headset/chameleon/Initialize() +/obj/item/radio/headset/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -720,7 +720,7 @@ return chameleon_action.emp_randomise() -/obj/item/radio/headset/chameleon/broken/Initialize() +/obj/item/radio/headset/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -731,7 +731,7 @@ /obj/item/pda/chameleon/syndicate syndicate = TRUE -/obj/item/pda/chameleon/Initialize() +/obj/item/pda/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -748,7 +748,7 @@ return chameleon_action.emp_randomise() -/obj/item/pda/chameleon/broken/Initialize() +/obj/item/pda/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) @@ -762,7 +762,7 @@ /obj/item/stamp/chameleon/syndicate syndicate = TRUE -/obj/item/stamp/chameleon/Initialize() +/obj/item/stamp/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -772,7 +772,7 @@ chameleon_action.initialize_disguises() add_item_action(chameleon_action) -/obj/item/stamp/chameleon/broken/Initialize() +/obj/item/stamp/chameleon/broken/Initialize(mapload) . = ..() chameleon_action.emp_randomise(INFINITY) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8515dd7b9b26..b7ba4c0dd5ed 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -55,7 +55,7 @@ /// How many zones (body parts, not precise) we have disabled so far, for naming purposes var/zones_disabled -/obj/item/clothing/Initialize() +/obj/item/clothing/Initialize(mapload) if(CHECK_BITFIELD(clothing_flags, VOICEBOX_TOGGLABLE)) actions_types += /datum/action/item_action/toggle_voice_box . = ..() diff --git a/code/modules/clothing/ears/_ears.dm b/code/modules/clothing/ears/_ears.dm index 43da70c86961..98ea902107de 100644 --- a/code/modules/clothing/ears/_ears.dm +++ b/code/modules/clothing/ears/_ears.dm @@ -17,7 +17,7 @@ resistance_flags = FLAMMABLE custom_price = 40 -/obj/item/clothing/ears/earmuffs/Initialize() +/obj/item/clothing/ears/earmuffs/Initialize(mapload) . = ..() AddElement(/datum/element/earhealing) AddComponent(/datum/component/wearertargeting/earprotection, list(ITEM_SLOT_EARS)) @@ -33,7 +33,7 @@ var/headphones_on = FALSE custom_price = 20 -/obj/item/clothing/ears/headphones/Initialize() +/obj/item/clothing/ears/headphones/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index a7967a771217..5cf0c4407f9f 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -389,7 +389,7 @@ var/datum/action/item_action/chameleon/change/chameleon_action -/obj/item/clothing/glasses/thermal/syndi/Initialize() +/obj/item/clothing/glasses/thermal/syndi/Initialize(mapload) . = ..() chameleon_action = new(src) if(syndicate) @@ -465,7 +465,7 @@ var/datum/action/cooldown/expose/expose_ability var/hud_type = DATA_HUD_MEDICAL_ADVANCED -/obj/item/clothing/glasses/godeye/Initialize() +/obj/item/clothing/glasses/godeye/Initialize(mapload) . = ..() expose_ability = new(src) diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index f6446edfb47b..bd0d1dba3c7e 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -21,7 +21,7 @@ var/mode = MODE_NONE var/range = 1 -/obj/item/clothing/glasses/meson/engine/Initialize() +/obj/item/clothing/glasses/meson/engine/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) update_icon() diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index d74613329a98..f65cb9d9086c 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -117,7 +117,7 @@ // have multiple inheritance, okay? var/datum/action/item_action/chameleon/change/chameleon_action -/obj/item/clothing/glasses/hud/security/chameleon/Initialize() +/obj/item/clothing/glasses/hud/security/chameleon/Initialize(mapload) . = ..() chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/clothing/glasses diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 4f086b4eee31..bb096851f20b 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -133,7 +133,7 @@ var/datum/action/cooldown/swipe/swipe_ability alternate_worn_layer = ABOVE_BODY_FRONT_LAYER -/obj/item/clothing/gloves/bracer/cuffs/Initialize() +/obj/item/clothing/gloves/bracer/cuffs/Initialize(mapload) . = ..() swipe_ability = new(swipe_ability) diff --git a/code/modules/clothing/head/_head.dm b/code/modules/clothing/head/_head.dm index 2323cfef6313..31b2ded62e4a 100644 --- a/code/modules/clothing/head/_head.dm +++ b/code/modules/clothing/head/_head.dm @@ -11,7 +11,7 @@ var/hattable = TRUE dynamic_hair_suffix = "+generic" -/obj/item/clothing/head/Initialize() +/obj/item/clothing/head/Initialize(mapload) . = ..() if(ishuman(loc) && dynamic_hair_suffix) var/mob/living/carbon/human/H = loc diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 07554e146686..09dce2c10e8e 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -126,7 +126,7 @@ visor_flags_inv = HIDEEYES | HIDEFACE visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH -/obj/item/clothing/head/hardhat/weldhat/Initialize() +/obj/item/clothing/head/hardhat/weldhat/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 4be640336455..015fa6c1949e 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -21,7 +21,7 @@ var/obj/item/flashlight/seclite/attached_light var/datum/action/item_action/toggle_helmet_flashlight/alight -/obj/item/clothing/head/helmet/Initialize() +/obj/item/clothing/head/helmet/Initialize(mapload) . = ..() if(attached_light) alight = new(src) @@ -94,7 +94,7 @@ name = "occupying force helmet" desc = "Standard deployment gear. Protects the head from impacts and has a built in mounted light." -/obj/item/clothing/head/helmet/sec/occupying/Initialize(mob/user) +/obj/item/clothing/head/helmet/sec/occupying/Initialize(mapload, mob/user) attached_light = new /obj/item/flashlight/seclite(null) . = ..() @@ -137,7 +137,7 @@ visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH dog_fashion = null -/obj/item/clothing/head/helmet/riot/raised/Initialize() +/obj/item/clothing/head/helmet/riot/raised/Initialize(mapload) . = ..() up = !up flags_1 ^= visor_flags @@ -333,7 +333,7 @@ heat_protection = HEAD armor = list(MELEE = 35, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 50, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 5) -/obj/item/clothing/head/helmet/kasa/Initialize() +/obj/item/clothing/head/helmet/kasa/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, null, null, list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5)) //maximum armor 65/15/15/15/65 diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 328d7856a764..ce5288b44381 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -75,7 +75,7 @@ pocket_storage_component_path = /datum/component/storage/concrete/pockets/small/fedora/detective dog_fashion = /datum/dog_fashion/head/detective -/obj/item/clothing/head/fedora/det_hat/Initialize() +/obj/item/clothing/head/fedora/det_hat/Initialize(mapload) . = ..() new /obj/item/reagent_containers/food/drinks/flask/det(src) @@ -178,7 +178,7 @@ desc = "That was white fabric. Was." dog_fashion = null //THIS IS FOR SLAUGHTER, NOT PUPPIES -/obj/item/clothing/head/beret/highlander/Initialize() +/obj/item/clothing/head/beret/highlander/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 930dd5b40a6e..f27d58e42f10 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -259,7 +259,7 @@ desc = "Once it's on, it never comes off." dog_fashion = null -/obj/item/clothing/head/sombrero/shamebrero/Initialize() +/obj/item/clothing/head/sombrero/shamebrero/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT) diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 8aa4000fad48..2784ced4aeca 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -122,7 +122,7 @@ desc = "It's an extra-tall snap-back hat with a picture of a fish, and text that reads: \"Women fear me. Fish fear me. Men turn their eyes away from me as I walk. No beast dares make a sound in my presence. I am alone on this barren Earth.\" This one feels like it's radiating a powerful energy...and smells of salt water?" dog_fashion = /datum/dog_fashion/head/fishfear/legendary -/obj/item/clothing/head/soft/fishfear/legendary/Initialize() +/obj/item/clothing/head/soft/fishfear/legendary/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,15) diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 755357400c90..5c3220aa8d86 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -21,7 +21,7 @@ color = "#736e35" visor_flags_inv = HIDEFACE -/obj/item/clothing/mask/breath/tactical/Initialize() +/obj/item/clothing/mask/breath/tactical/Initialize(mapload) . = ..() adjustmask() // this mask starts lowered diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index f73d609027fb..c4a9818e71bd 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -113,7 +113,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( flags_inv = HIDEFACIALHAIR clothing_flags = NONE -/obj/item/clothing/mask/pig/cursed/Initialize() +/obj/item/clothing/mask/pig/cursed/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT) playsound(get_turf(src), 'sound/magic/pighead_curse.ogg', 50, 1) @@ -139,7 +139,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( /obj/item/clothing/mask/frog/cursed clothing_flags = NONE -/obj/item/clothing/mask/frog/cursed/Initialize() +/obj/item/clothing/mask/frog/cursed/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT) @@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( flags_inv = HIDEFACIALHAIR clothing_flags = NONE -/obj/item/clothing/mask/cowmask/cursed/Initialize() +/obj/item/clothing/mask/cowmask/cursed/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT) playsound(get_turf(src), 'sound/magic/cowhead_curse.ogg', 50, 1) @@ -193,7 +193,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( clothing_flags = NONE flags_inv = HIDEFACIALHAIR -/obj/item/clothing/mask/horsehead/cursed/Initialize() +/obj/item/clothing/mask/horsehead/cursed/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_MASK_TRAIT) playsound(get_turf(src), 'sound/magic/horsehead_curse.ogg', 50, 1) @@ -331,7 +331,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( icon_state = "banddurathread" mutantrace_variation = MUTANTRACE_VARIATION -/obj/item/clothing/mask/bandana/durathread/tied/Initialize() +/obj/item/clothing/mask/bandana/durathread/tied/Initialize(mapload) . = ..() AltClick(bypass = TRUE) diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index 45dbb177c80a..401491e8f12b 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -175,7 +175,7 @@ icon_state = "petcollar" var/tagname = null -/obj/item/clothing/neck/petcollar/Initialize() +/obj/item/clothing/neck/petcollar/Initialize(mapload) .= ..() AddComponent(/datum/component/squeak, list('sound/effects/collarbell1.ogg'=1,'sound/effects/collarbell2.ogg'=1), 50, 100, 2) @@ -392,7 +392,7 @@ armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 75, ACID = 75) //Resistant to the dangers of the natural world or something -/obj/item/clothing/neck/cloak/ranger/Initialize() +/obj/item/clothing/neck/cloak/ranger/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ITEM_POST_UNEQUIP, PROC_REF(on_unequip)) diff --git a/code/modules/clothing/neck/bodycamera.dm b/code/modules/clothing/neck/bodycamera.dm index 5fac7363de8d..a73749e00491 100644 --- a/code/modules/clothing/neck/bodycamera.dm +++ b/code/modules/clothing/neck/bodycamera.dm @@ -18,7 +18,7 @@ var/preset = FALSE //if true, the camera is already configured and cannot be reset var/mob/listeningTo //This code is simular to the code for the RCL. -/obj/item/clothing/neck/bodycam/Initialize() +/obj/item/clothing/neck/bodycam/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NO_STORAGE, TRAIT_GENERIC) bodcam = new(src) @@ -144,7 +144,7 @@ preset = TRUE resistance_flags = FIRE_PROOF //For showing off to your friends about how you can kill an ashdrake, or some shit -/obj/item/clothing/neck/bodycam/miner/Initialize() +/obj/item/clothing/neck/bodycam/miner/Initialize(mapload) . = ..() bodcam.network[1] = "mine" bodcam.c_tag = "Unactivated Miner Body Camera" diff --git a/code/modules/clothing/outfits/amber.dm b/code/modules/clothing/outfits/amber.dm index 04945d81a71c..16eb12d3f514 100644 --- a/code/modules/clothing/outfits/amber.dm +++ b/code/modules/clothing/outfits/amber.dm @@ -16,7 +16,7 @@ // amber task force vest loadouts // To note: each vest has 7 normal slots - Hopek -/obj/item/storage/belt/military/amber/Initialize() // Amber Soldier +/obj/item/storage/belt/military/amber/Initialize(mapload) // Amber Soldier . = ..() new /obj/item/ammo_box/magazine/recharge(src) new /obj/item/ammo_box/magazine/recharge(src) @@ -27,7 +27,7 @@ new /obj/item/jawsoflife/jimmy(src) -/obj/item/storage/belt/military/amber_commander/Initialize() // Amber Commander +/obj/item/storage/belt/military/amber_commander/Initialize(mapload) // Amber Commander . = ..() new /obj/item/ammo_box/magazine/recharge(src) new /obj/item/ammo_box/magazine/recharge(src) @@ -37,7 +37,7 @@ new /obj/item/restraints/handcuffs/cable/zipties(src) new /obj/item/jawsoflife/jimmy(src) -/obj/item/storage/belt/military/amber_medic/Initialize() // Amber Medic +/obj/item/storage/belt/military/amber_medic/Initialize(mapload) // Amber Medic . = ..() new /obj/item/ammo_box/magazine/recharge(src) new /obj/item/reagent_containers/medspray/synthflesh(src) // for getting people back to defib range diff --git a/code/modules/clothing/outfits/imperial.dm b/code/modules/clothing/outfits/imperial.dm index 976b92a115db..264e5c04a55c 100644 --- a/code/modules/clothing/outfits/imperial.dm +++ b/code/modules/clothing/outfits/imperial.dm @@ -105,7 +105,7 @@ // Belts -/obj/item/storage/belt/military/imperial/guardsman/Initialize() // Imperial Guardsman +/obj/item/storage/belt/military/imperial/guardsman/Initialize(mapload) // Imperial Guardsman . = ..() new /obj/item/ammo_box/magazine/recharge/lasgun(src) new /obj/item/ammo_box/magazine/recharge/lasgun(src) @@ -115,7 +115,7 @@ new /obj/item/restraints/handcuffs/cable/zipties(src) new /obj/item/jawsoflife/jimmy(src) -/obj/item/storage/belt/military/imperial/plasma/Initialize() // Plasma gunner +/obj/item/storage/belt/military/imperial/plasma/Initialize(mapload) // Plasma gunner . = ..() new /obj/item/ammo_box/magazine/recharge/lasgun/pistol(src) new /obj/item/ammo_box/magazine/recharge/lasgun/pistol(src) @@ -125,7 +125,7 @@ new /obj/item/jawsoflife/jimmy(src) new /obj/item/stack/medical/mesh(src) // for when his gun inevitably explodes -/obj/item/storage/belt/military/imperial/hotshot/Initialize() // Veteran +/obj/item/storage/belt/military/imperial/hotshot/Initialize(mapload) // Veteran . = ..() new /obj/item/ammo_box/magazine/recharge/lasgun/hotshot(src) new /obj/item/ammo_box/magazine/recharge/lasgun/hotshot(src) @@ -135,7 +135,7 @@ new /obj/item/restraints/handcuffs/cable/zipties(src) new /obj/item/jawsoflife/jimmy(src) -/obj/item/storage/belt/military/imperial/sniper/Initialize() // Marksman +/obj/item/storage/belt/military/imperial/sniper/Initialize(mapload) // Marksman . = ..() new /obj/item/ammo_box/magazine/recharge/lasgun/sniper(src) new /obj/item/ammo_box/magazine/recharge/lasgun/sniper(src) @@ -146,7 +146,7 @@ new /obj/item/twohanded/binoculars(src) -/obj/item/storage/belt/military/imperial/sergeant/Initialize() // Sergeant +/obj/item/storage/belt/military/imperial/sergeant/Initialize(mapload) // Sergeant . = ..() new /obj/item/ammo_box/magazine/boltpistol(src) new /obj/item/ammo_box/magazine/boltpistol(src) diff --git a/code/modules/clothing/outfits/occupying.dm b/code/modules/clothing/outfits/occupying.dm index 449ef96fe011..2370855f22f7 100644 --- a/code/modules/clothing/outfits/occupying.dm +++ b/code/modules/clothing/outfits/occupying.dm @@ -3,7 +3,7 @@ name = "peacekeeping force jumpsuit" color = "#55ff9b" -/obj/item/clothing/under/rank/security/grey/amber/occupying/Initialize(mob/user) +/obj/item/clothing/under/rank/security/grey/amber/occupying/Initialize(mapload, mob/user) . = ..() if(prob(50)) // Adds variation to the uniform. 50% will be worn casually. rolldown(TRUE) @@ -26,7 +26,7 @@ // Peacekeeping force vest loadouts // To note: each vest has 7 normal slots - Hopek -/obj/item/storage/belt/military/occupying_officer/Initialize() // Occupying Officer +/obj/item/storage/belt/military/occupying_officer/Initialize(mapload) // Occupying Officer . = ..() new /obj/item/ammo_box/magazine/wt550m9/wtr(src) new /obj/item/ammo_box/magazine/wt550m9/wtr(src) @@ -37,7 +37,7 @@ new /obj/item/jawsoflife/jimmy(src) -/obj/item/storage/belt/military/occupying_commander/Initialize() // Occupying force Commander +/obj/item/storage/belt/military/occupying_commander/Initialize(mapload) // Occupying force Commander . = ..() new /obj/item/ammo_box/magazine/wt550m9/wtr(src) new /obj/item/ammo_box/magazine/wt550m9/wtr(src) @@ -50,7 +50,7 @@ /obj/item/storage/belt/military/occupying_heavy color = "#55ff9b" -/obj/item/storage/belt/military/occupying_heavy/Initialize() // Occupying Riot Officer +/obj/item/storage/belt/military/occupying_heavy/Initialize(mapload) // Occupying Riot Officer . = ..() new /obj/item/restraints/legcuffs/bola/energy(src) new /obj/item/restraints/legcuffs/bola/energy(src) diff --git a/code/modules/clothing/shoes/bananashoes.dm b/code/modules/clothing/shoes/bananashoes.dm index 20dd6785aadf..064b1dc748fc 100644 --- a/code/modules/clothing/shoes/bananashoes.dm +++ b/code/modules/clothing/shoes/bananashoes.dm @@ -8,7 +8,7 @@ var/on = FALSE var/always_noslip = FALSE -/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize() +/obj/item/clothing/shoes/clown_shoes/banana_shoes/Initialize(mapload) . = ..() AddComponent(/datum/component/material_container, list(/datum/material/bananium), 200000, TRUE, /obj/item/stack) AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 75) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 5cf8b8fda1de..e8f8638531f6 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -17,7 +17,7 @@ resistance_flags = NONE pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes -/obj/item/clothing/shoes/combat/combat_knife/Initialize() +/obj/item/clothing/shoes/combat/combat_knife/Initialize(mapload) . = ..() new /obj/item/kitchen/knife/combat(src) @@ -84,7 +84,7 @@ icon_state = "clowncrocs" item_state = "clowncrocs" -/obj/item/clothing/shoes/clown_shoes/Initialize() +/obj/item/clothing/shoes/clown_shoes/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg'=1,'sound/effects/clownstep2.ogg'=1), 50) @@ -143,7 +143,7 @@ icon_state = "spurboots" item_state = "spurboots" -/obj/item/clothing/shoes/jackboots/warden/Initialize() +/obj/item/clothing/shoes/jackboots/warden/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/effects/spurstep.ogg')) @@ -203,7 +203,7 @@ /obj/item/clothing/shoes/cult/alt/ghost item_flags = DROPDEL -/obj/item/clothing/shoes/cult/alt/ghost/Initialize() +/obj/item/clothing/shoes/cult/alt/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) @@ -248,7 +248,7 @@ var/jumpspeed = 3 var/recharging_rate = 6 SECONDS //default 6 seconds between each dash -/obj/item/clothing/shoes/bhop/Initialize() +/obj/item/clothing/shoes/bhop/Initialize(mapload) . = ..() for(var/datum/action/cooldown/boost/bhop_action in actions) bhop_action.jumpdistance = jumpdistance @@ -273,7 +273,7 @@ icon = 'icons/obj/clothing/clockwork_garb.dmi' icon_state = "clockwork_treads" -/obj/item/clothing/shoes/bronze/Initialize() +/obj/item/clothing/shoes/bronze/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/machines/clockcult/integration_cog_install.ogg' = 1, 'sound/magic/clockwork/fellowship_armory.ogg' = 1), 50) @@ -286,7 +286,7 @@ var/wheelToggle = FALSE //False means wheels are not popped out var/obj/vehicle/ridden/scooter/wheelys/W -/obj/item/clothing/shoes/wheelys/Initialize() +/obj/item/clothing/shoes/wheelys/Initialize(mapload) . = ..() W = new /obj/vehicle/ridden/scooter/wheelys(null) @@ -364,7 +364,7 @@ var/list/occupants = list() var/max_occupants = 4 -/obj/item/clothing/shoes/cowboy/Initialize() +/obj/item/clothing/shoes/cowboy/Initialize(mapload) . = ..() if(prob(2)) var/mob/living/simple_animal/hostile/retaliate/poison/snake/bootsnake = new/mob/living/simple_animal/hostile/retaliate/poison/snake(src) @@ -567,7 +567,7 @@ var/recharging_rate = 60 syndicate = TRUE -/obj/item/clothing/shoes/airshoes/Initialize() +/obj/item/clothing/shoes/airshoes/Initialize(mapload) . = ..() shoes_of_air = new /obj/vehicle/ridden/scooter/airshoes(null) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index cd901c2a3724..4e7e5b6b3e97 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -36,7 +36,7 @@ var/teleporting = 0 var/phase_timer_id -/obj/item/clothing/suit/space/chronos/Initialize() +/obj/item/clothing/suit/space/chronos/Initialize(mapload) teleport_now.chronosuit = src teleport_now.target = src return ..() @@ -271,7 +271,7 @@ if(target_ui) QDEL_NULL(target_ui) -/obj/effect/chronos_cam/relaymove(var/mob/user, direction) +/obj/effect/chronos_cam/relaymove(mob/user, direction) if(!holder) qdel(src) return diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index f700b55b42dd..fd422cc78b1e 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -21,7 +21,7 @@ var/grace = RAD_GEIGER_GRACE_PERIOD var/datum/looping_sound/geiger/soundloop -/obj/item/clothing/head/helmet/space/hardsuit/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/Initialize(mapload) . = ..() soundloop = new(list(), FALSE, TRUE) soundloop.volume = 5 @@ -65,7 +65,7 @@ return soundloop.start(user) -/obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(var/msg) +/obj/item/clothing/head/helmet/space/hardsuit/proc/display_visor_message(msg) var/mob/wearer = loc if(msg && ishuman(wearer)) wearer.show_message("[icon2html(src, wearer)][span_robot("[msg]")]", MSG_VISUAL) @@ -110,7 +110,7 @@ var/obj/item/tank/jetpack/suit/jetpack = null var/hardsuit_type -/obj/item/clothing/suit/space/hardsuit/Initialize() +/obj/item/clothing/suit/space/hardsuit/Initialize(mapload) if(jetpack && ispath(jetpack)) jetpack = new jetpack(src) . = ..() @@ -270,7 +270,7 @@ light_range = 7 allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator) -/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/mining/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) @@ -286,7 +286,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS -/obj/item/clothing/suit/space/hardsuit/mining/Initialize() +/obj/item/clothing/suit/space/hardsuit/mining/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) @@ -308,7 +308,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon() icon_state = "hardsuit[on]-[hardsuit_type]" -/obj/item/clothing/head/helmet/space/hardsuit/syndi/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/syndi/Initialize(mapload) . = ..() if(istype(loc, /obj/item/clothing/suit/space/hardsuit/syndi)) linkedsuit = loc @@ -437,7 +437,7 @@ light_range = 0 //luminosity when on actions_types = list() -/obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/carp/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, LOCKED_HELMET_TRAIT) @@ -509,7 +509,7 @@ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard slowdown = 0 -/obj/item/clothing/suit/space/hardsuit/wizard/Initialize() +/obj/item/clothing/suit/space/hardsuit/wizard/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, FALSE, FALSE, ITEM_SLOT_OCLOTHING, INFINITY, FALSE) @@ -547,7 +547,7 @@ clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | SCAN_REAGENTS | HEADINTERNALS actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_research_scanner) -/obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/rd/Initialize(mapload) . = ..() RegisterSignal(SSdcs, COMSIG_GLOB_EXPLOSION, PROC_REF(sense_explosion)) @@ -604,7 +604,7 @@ armor = list(MELEE = 35, BULLET = 25, LASER = 30, ENERGY = 10, BOMB = 40, BIO = 100, RAD = 50, FIRE = 75, ACID = 75, WOUND = 20) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security -/obj/item/clothing/suit/space/hardsuit/security/Initialize() +/obj/item/clothing/suit/space/hardsuit/security/Initialize(mapload) . = ..() allowed = GLOB.security_hardsuit_allowed @@ -651,7 +651,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT //this needed to be added a long fucking time ago helmettype = /obj/item/clothing/head/helmet/space/hardsuit/swat -/obj/item/clothing/suit/space/hardsuit/swat/Initialize() +/obj/item/clothing/suit/space/hardsuit/swat/Initialize(mapload) . = ..() allowed = GLOB.security_hardsuit_allowed @@ -710,7 +710,7 @@ resistance_flags = FIRE_PROOF max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT -/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/ert/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, LOCKED_HELMET_TRAIT) @@ -799,7 +799,7 @@ actions_types = list() resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize() +/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, FALSE, FALSE, TRUE, ITEM_SLOT_OCLOTHING) @@ -812,7 +812,7 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize() +/obj/item/clothing/suit/space/hardsuit/ert/paranormal/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE, ITEM_SLOT_OCLOTHING) @@ -913,7 +913,7 @@ var/shield_state = "shield-old" var/shield_on = "shield-old" -/obj/item/clothing/suit/space/hardsuit/shielded/Initialize() +/obj/item/clothing/suit/space/hardsuit/shielded/Initialize(mapload) . = ..() if(!allowed) allowed = GLOB.advanced_hardsuit_allowed @@ -1164,11 +1164,11 @@ max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF -/obj/item/clothing/suit/space/hardsuit/powerarmor_advanced/Initialize() +/obj/item/clothing/suit/space/hardsuit/powerarmor_advanced/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate,10,/obj/item/stack/sheet/animalhide/weaver_chitin, list(MELEE = 0.5, BULLET = 3, LASER = 0.5, ENERGY = 2.5, BOMB = 5, BIO = 10, RAD = 8, FIRE = 10, ACID = 9, WOUND = 0.1)) -/obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/powerarmor_advanced/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate,10,/obj/item/stack/sheet/animalhide/weaver_chitin, list(MELEE = 0.5, BULLET = 3, LASER = 0.5, ENERGY = 2.5, BOMB = 5, BIO = 10, RAD = 8, FIRE = 10, ACID = 9, WOUND = 0.1)) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 5598fd9f5281..6fe7c7c62bab 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -12,7 +12,7 @@ armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50, WOUND = 15) cryo_preserve = TRUE -/obj/item/clothing/suit/armor/Initialize() +/obj/item/clothing/suit/armor/Initialize(mapload) . = ..() if(!allowed) allowed = GLOB.security_vest_allowed @@ -180,7 +180,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT mutantrace_variation = MUTANTRACE_VARIATION -/obj/item/clothing/suit/armor/pathfinder/Initialize() +/obj/item/clothing/suit/armor/pathfinder/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate, null, null, list(MELEE = 10, BULLET = 5, LASER = 5, ENERGY = 5, BOMB = 5)) //maximum armor 60/15/15/15/65 @@ -220,7 +220,7 @@ resistance_flags = FLAMMABLE dog_fashion = null -/obj/item/clothing/suit/armor/vest/det_suit/Initialize() +/obj/item/clothing/suit/armor/vest/det_suit/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 0d6ceee6a999..4db872de4d04 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -57,7 +57,7 @@ heat_protection = CHEST|GROIN|LEGS|ARMS mutantrace_variation = MUTANTRACE_VARIATION -/obj/item/clothing/suit/det_suit/Initialize() +/obj/item/clothing/suit/det_suit/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed @@ -65,7 +65,7 @@ desc = "All the class of a trenchcoat without the security fibers." armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) -/obj/item/clothing/suit/det_suit/civilian/Initialize() +/obj/item/clothing/suit/det_suit/civilian/Initialize(mapload) . = ..() //Same permissions as the leather jacket/leather overcoat, because you know, trench coat allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/tank/internals/ipc_coolant, /obj/item/toy, /obj/item/storage/box/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/radio) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 53f43de7a75c..8e19310400f4 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -165,7 +165,7 @@ body_parts_covered = ARMS|CHEST actions_types = list(/datum/action/item_action/toggle_wings) -/obj/item/clothing/suit/toggle/owlwings/Initialize() +/obj/item/clothing/suit/toggle/owlwings/Initialize(mapload) . = ..() allowed = GLOB.security_vest_allowed @@ -236,7 +236,7 @@ icon_state = "ponchoshame" item_state = "ponchoshame" -/obj/item/clothing/suit/poncho/ponchoshame/Initialize() +/obj/item/clothing/suit/poncho/ponchoshame/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT) @@ -576,7 +576,7 @@ armor = list(MELEE = 25, BULLET = 30, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 0, ACID = 50) hoodtype = /obj/item/clothing/head/hooded/winterhood/captain -/obj/item/clothing/suit/hooded/wintercoat/captain/Initialize() +/obj/item/clothing/suit/hooded/wintercoat/captain/Initialize(mapload) . = ..() allowed = GLOB.security_wintercoat_allowed @@ -604,7 +604,7 @@ armor = list(MELEE = 25, BULLET = 15, LASER = 30, ENERGY = 10, BOMB = 25, BIO = 0, RAD = 0, FIRE = 0, ACID = 45) hoodtype = /obj/item/clothing/head/hooded/winterhood/security -/obj/item/clothing/suit/hooded/wintercoat/security/Initialize() +/obj/item/clothing/suit/hooded/wintercoat/security/Initialize(mapload) . = ..() allowed = GLOB.security_wintercoat_allowed diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm index 891d51b6fb3d..b3afba75cb07 100644 --- a/code/modules/clothing/suits/toggles.dm +++ b/code/modules/clothing/suits/toggles.dm @@ -5,7 +5,7 @@ var/obj/item/clothing/head/hooded/hood var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this -/obj/item/clothing/suit/hooded/Initialize() +/obj/item/clothing/suit/hooded/Initialize(mapload) . = ..() MakeHood() @@ -125,7 +125,7 @@ . += "Alt-click on [src] to toggle the [togglename]." //Hardsuit toggle code -/obj/item/clothing/suit/space/hardsuit/Initialize() +/obj/item/clothing/suit/space/hardsuit/Initialize(mapload) MakeHelmet() . = ..() diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index c21a6280ed1b..9a5db223afa8 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -244,7 +244,7 @@ to_chat(user, span_notice("You charge \the [W]. It can now absorb [W.current_charges] hits.")) qdel(src) -/obj/item/clothing/suit/wizrobe/armor/Initialize() +/obj/item/clothing/suit/wizrobe/armor/Initialize(mapload) . = ..() if(!allowed) allowed = GLOB.advanced_hardsuit_allowed diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm index 6ca19da1ac74..346de7cbf271 100644 --- a/code/modules/clothing/under/_under.dm +++ b/code/modules/clothing/under/_under.dm @@ -51,7 +51,7 @@ else if(damaged_state == CLOTHING_PRISTINE && has_sensor == BROKEN_SENSORS) has_sensor = HAS_SENSORS -/obj/item/clothing/under/Initialize() +/obj/item/clothing/under/Initialize(mapload) . = ..() if(random_sensor) //make the sensor mode favor higher levels, except coords. diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 83a83c05b086..a05a07d35829 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -334,13 +334,13 @@ icon_state = "pocketprotector" pocket_storage_component_path = /datum/component/storage/concrete/pockets/pocketprotector -/obj/item/clothing/accessory/pocketprotector/full/Initialize() +/obj/item/clothing/accessory/pocketprotector/full/Initialize(mapload) . = ..() new /obj/item/pen/red(src) new /obj/item/pen(src) new /obj/item/pen/blue(src) -/obj/item/clothing/accessory/pocketprotector/cosmetology/Initialize() +/obj/item/clothing/accessory/pocketprotector/cosmetology/Initialize(mapload) . = ..() for(var/i in 1 to 3) new /obj/item/lipstick/random(src) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index a2c44a8befb0..553db2d82ace 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -12,7 +12,7 @@ /obj/item/clothing/under/color/random icon_state = "random_jumpsuit" -/obj/item/clothing/under/color/random/Initialize() +/obj/item/clothing/under/color/random/Initialize(mapload) ..() var/obj/item/clothing/under/color/C = pick(subtypesof(/obj/item/clothing/under/color) - subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/color/random - /obj/item/clothing/under/color/grey/glorf - /obj/item/clothing/under/color/black/ghost) if(ishuman(loc)) @@ -25,7 +25,7 @@ /obj/item/clothing/under/skirt/color/random icon_state = "random_jumpsuit" //Skirt variant needed -/obj/item/clothing/under/skirt/color/random/Initialize() +/obj/item/clothing/under/skirt/color/random/Initialize(mapload) ..() var/obj/item/clothing/under/skirt/color/C = pick(subtypesof(/obj/item/clothing/under/skirt/color) - /obj/item/clothing/under/skirt/color/random) if(ishuman(loc)) @@ -49,7 +49,7 @@ /obj/item/clothing/under/color/black/ghost item_flags = DROPDEL -/obj/item/clothing/under/color/black/ghost/Initialize() +/obj/item/clothing/under/color/black/ghost/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CULT_TRAIT) diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index e1dc9455ffc9..ca2978767bb1 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -181,7 +181,7 @@ can_adjust = FALSE mutantrace_variation = NO_MUTANTRACE_VARIATION -/obj/item/clothing/under/rank/clown/Initialize() +/obj/item/clothing/under/rank/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 737323083e64..409e68ea653e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -434,7 +434,7 @@ /obj/item/clothing/under/kilt/highlander desc = "You're the only one worthy of this kilt." -/obj/item/clothing/under/kilt/highlander/Initialize() +/obj/item/clothing/under/kilt/highlander/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HIGHLANDER) @@ -547,7 +547,7 @@ fitted = FEMALE_UNIFORM_TOP can_adjust = FALSE -/obj/item/clothing/under/maid/Initialize() +/obj/item/clothing/under/maid/Initialize(mapload) . = ..() var/obj/item/clothing/accessory/maidapron/A = new (src) attach_accessory(A) @@ -790,7 +790,7 @@ alternate_worn_layer = GLOVES_LAYER //covers hands but gloves can go over it. This is how these things work in my head. can_adjust = FALSE -/obj/item/clothing/under/mech_suit/Initialize() +/obj/item/clothing/under/mech_suit/Initialize(mapload) ..() AddComponent(/datum/component/mech_pilot, 0.9) diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm index 2962bba33b01..5200b8744533 100644 --- a/code/modules/detectivework/scanner.dm +++ b/code/modules/detectivework/scanner.dm @@ -35,7 +35,7 @@ var/sound_scanner_nomatch = 'sound/items/scanner_nomatch.ogg' var/sound_scanner_match = 'sound/items/scanner_match.ogg' -/obj/item/detective_scanner/proc/feedback(sound_file , var/sound_only = FALSE) +/obj/item/detective_scanner/proc/feedback(sound_file , sound_only = FALSE) if(sound_only) playsound(src, sound_file, 50, 0) return @@ -46,7 +46,7 @@ playsound(src, sound_file, 50, 0) sleep(scan_speed) // this is here again for sound timing - Hopek -/obj/item/detective_scanner/Initialize() +/obj/item/detective_scanner/Initialize(mapload) . = ..() sound_on = (can_sound ? sound_on : FALSE) @@ -308,7 +308,7 @@ scan_icon = FALSE // this scanner doesn't get a chance to play the animation because scans are instant so its best to leave this false to avoid unnecessary icon updates. view_check = FALSE // admin scanner doesn't care if you can actually see something -/obj/item/detective_scanner/admin/Initialize() +/obj/item/detective_scanner/admin/Initialize(mapload) . = ..() if(prob(50)) // has a 50% chance to either have the regular or advanced sprite. Both with aqua coloring of course icon_state = "forensic2" diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 657316b48b61..a4559db26221 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -51,7 +51,7 @@ // Checks if the event can be spawned. Used by event controller and "false alarm" event. // Admin-created events override this. -/datum/round_event_control/proc/canSpawnEvent(var/players_amt, var/gamemode) +/datum/round_event_control/proc/canSpawnEvent(players_amt, gamemode) if(occurrences >= max_occurrences) return FALSE if(earliest_start >= world.time-SSticker.round_start_time) diff --git a/code/modules/events/fugitive_spawning.dm b/code/modules/events/fugitive_spawning.dm index 368220e53c27..16321f29a003 100644 --- a/code/modules/events/fugitive_spawning.dm +++ b/code/modules/events/fugitive_spawning.dm @@ -58,7 +58,7 @@ role_name = "fugitive hunter" return SUCCESSFUL_SPAWN -/datum/round_event/ghost_role/fugitives/proc/gear_fugitive(var/mob/dead/selected, var/turf/landing_turf, backstory) //spawns normal fugitive +/datum/round_event/ghost_role/fugitives/proc/gear_fugitive(mob/dead/selected, turf/landing_turf, backstory) //spawns normal fugitive var/datum/mind/player_mind = new /datum/mind(selected.key) player_mind.active = TRUE var/mob/living/carbon/human/S = new(landing_turf) @@ -88,7 +88,7 @@ return S //special spawn for one member. it can be used for a special mob or simply to give one normal member special items. -/datum/round_event/ghost_role/fugitives/proc/gear_fugitive_leader(var/mob/dead/leader, var/turf/landing_turf, backstory) +/datum/round_event/ghost_role/fugitives/proc/gear_fugitive_leader(mob/dead/leader, turf/landing_turf, backstory) var/datum/mind/player_mind = new /datum/mind(leader.key) player_mind.active = TRUE switch(backstory) diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 1fc7595d8433..4e2bc5c2ebaa 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -45,7 +45,7 @@ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' righthand_file = 'icons/mob/inhands/items_righthand.dmi' -/obj/item/storage/spooky/Initialize() +/obj/item/storage/spooky/Initialize(mapload) . = ..() for(var/distrobuteinbag in 0 to 5) var/type = pick(/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull, diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index 9cd81d2bd3f0..4481de9b7d76 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -66,7 +66,7 @@ resistance_flags = FLAMMABLE w_class = WEIGHT_CLASS_TINY -/obj/item/valentine/Initialize() +/obj/item/valentine/Initialize(mapload) . = ..() message = pick(strings(VALENTINE_FILE, "valentines")) @@ -106,7 +106,7 @@ list_reagents = list(/datum/reagent/consumable/sugar = 2) junkiness = 5 -/obj/item/reagent_containers/food/snacks/candyheart/Initialize() +/obj/item/reagent_containers/food/snacks/candyheart/Initialize(mapload) . = ..() desc = pick(strings(VALENTINE_FILE, "candyhearts")) icon_state = pick("candyheart", "candyheart2", "candyheart3", "candyheart4") diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index cae79366ae20..898b747cd1e2 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -47,7 +47,7 @@ var/festive_tree = /obj/structure/flora/tree/pine/xmas var/christmas_tree = /obj/structure/flora/tree/pine/xmas/presents -/obj/effect/spawner/xmastree/Initialize() +/obj/effect/spawner/xmastree/Initialize(mapload) ..() if((CHRISTMAS in SSevents.holidays) && christmas_tree) new christmas_tree(get_turf(src)) diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 9ba61b2b7dfa..4fa101792923 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -299,7 +299,7 @@ var/sending_timer var/cargo_hold_id -/obj/machinery/computer/piratepad_control/Initialize() +/obj/machinery/computer/piratepad_control/Initialize(mapload) ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 5f96b5b052f8..328a3bba45fe 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -266,7 +266,7 @@ name = "Objectives of a Bee Liberation Front Operative" info = "Objective #1. Liberate all bees on the NT transport vessel 2416/B. Success!
    Objective #2. Escape alive. Failed." -/obj/machinery/syndicatebomb/shuttle_loan/Initialize() +/obj/machinery/syndicatebomb/shuttle_loan/Initialize(mapload) . = ..() setAnchored(TRUE) timer_set = rand(480, 600) //once the supply shuttle docks (after 5 minutes travel time), players have between 3-5 minutes to defuse the bomb diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 5cb3fc866958..cacd4166a04f 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -281,7 +281,7 @@ var/datum/spacevine_controller/master = null var/list/mutations = list() -/obj/structure/spacevine/Initialize() +/obj/structure/spacevine/Initialize(mapload) . = ..() add_atom_colour("#ffffff", FIXED_COLOUR_PRIORITY) @@ -374,7 +374,7 @@ var/list/vine_mutations_list var/mutativeness = 1 -/datum/spacevine_controller/New(turf/location, list/muts, potency, production, var/datum/round_event/event = null) +/datum/spacevine_controller/New(turf/location, list/muts, potency, production, datum/round_event/event = null) vines = list() growth_queue = list() var/obj/structure/spacevine/SV = spawn_spacevine_piece(location, null, muts) diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index 63de076fd02d..1a25f8437bf5 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -42,7 +42,7 @@ /obj/item/projectile/magic/death, /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/fireball, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) -/mob/living/simple_animal/hostile/carp/ranged/Initialize() +/mob/living/simple_animal/hostile/carp/ranged/Initialize(mapload) projectiletype = pick(allowed_projectile_types) . = ..() diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm index 132e446a073c..775baf44fd08 100644 --- a/code/modules/fields/fields.dm +++ b/code/modules/fields/fields.dm @@ -285,7 +285,7 @@ var/datum/proximity_monitor/advanced/current = null var/mob/listeningTo -/obj/item/multitool/field_debug/Initialize() +/obj/item/multitool/field_debug/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index 15e919c6b83c..a89f8d6d2de1 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -91,7 +91,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /obj/effect/hallucination/singularity_act() return -/obj/effect/hallucination/simple/Initialize(mapload, var/mob/living/carbon/T) +/obj/effect/hallucination/simple/Initialize(mapload, mob/living/carbon/T) . = ..() target = T current_image = GetImage() @@ -1136,7 +1136,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /obj/effect/hallucination/danger/anomaly name = "flux wave anomaly" -/obj/effect/hallucination/danger/anomaly/Initialize() +/obj/effect/hallucination/danger/anomaly/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index ca3bb42c8a17..8fa654b02334 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -484,7 +484,7 @@ list_reagents = list(/datum/reagent/consumable/rootbeer = 30) foodtype = SUGAR -/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer/Initialize() +/obj/item/reagent_containers/food/drinks/soda_cans/rootbeer/Initialize(mapload) icon_state = pick("Rootbeer_Mug","Rootbeer_AW","Rootbeer_Barq") . = ..() @@ -510,7 +510,7 @@ list_reagents = list(/datum/reagent/consumable/lemon_lime = 30) foodtype = FRUIT -/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize() +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime/Initialize(mapload) . = ..() name = "lemon-lime soda" @@ -609,7 +609,7 @@ var/static/list/descs = list("The entire label seems to just be a legal disclaimer.","The label reads off over 200 possible flavors."\ , "The date on the cap reads off that the bottle expired a decade ago...") -/obj/item/reagent_containers/food/drinks/soda_cans/mystery/Initialize() +/obj/item/reagent_containers/food/drinks/soda_cans/mystery/Initialize(mapload) list_reagents = list(get_random_reagent_id() = 30) . = ..() if(prob(20)) @@ -632,7 +632,7 @@ var/random_sprite = TRUE -/obj/item/reagent_containers/food/drinks/colocup/Initialize() +/obj/item/reagent_containers/food/drinks/colocup/Initialize(mapload) .=..() pixel_x = rand(-4,4) pixel_y = rand(-4,4) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 74af5070fc36..0a0d75ec7aaf 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -173,7 +173,7 @@ sharpness = SHARP_EDGED var/static/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken") -/obj/item/broken_bottle/Initialize() +/obj/item/broken_bottle/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 200, 55) @@ -276,7 +276,7 @@ icon_state = "absinthebottle" list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100) -/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/absinthe/Initialize(mapload) . = ..() redact() @@ -349,7 +349,7 @@ icon_state = "sakebottle" list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) -/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize() +/obj/item/reagent_containers/food/drinks/bottle/sake/Initialize(mapload) . = ..() if(prob(10)) name = "Fluffy Tail Sake" diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm index 0c98dfe90b81..9f99850c2451 100644 --- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm @@ -79,7 +79,7 @@ desc = "A shot glass - the universal symbol for bad decisions." return -/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize() +/obj/item/reagent_containers/food/drinks/drinkingglass/filled/Initialize(mapload) . = ..() on_reagent_change(ADD_REAGENT) diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index d3c4e72de32e..593fe85ba1b3 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -40,7 +40,7 @@ AddComponent(/datum/component/bakeable, /obj/item/reagent_containers/food/snacks/badrecipe, rand(25 SECONDS, 40 SECONDS), FALSE) return -/obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M) +/obj/item/reagent_containers/food/proc/checkLiked(fraction, mob/M) if(last_check_time + 50 < world.time) if(ishuman(M)) var/mob/living/carbon/human/H = M diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 786d0a8dad74..ecd32b01a01c 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -28,7 +28,7 @@ ) var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters. -/obj/item/reagent_containers/food/condiment/Initialize() +/obj/item/reagent_containers/food/condiment/Initialize(mapload) . = ..() //possible_states = typelist("possible_states", possible_states) // yogs -- commented out initialize_possible_states() // yogs diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index b5963cbad589..a7a7f9c2c3c1 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -295,7 +295,7 @@ icon = 'icons/obj/food/soupsalad.dmi' icon_state = "wishsoup" -/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize() +/obj/item/reagent_containers/food/snacks/customizable/soup/Initialize(mapload) . = ..() eatverb = pick("slurp","sip","inhale","drink") diff --git a/code/modules/food_and_drinks/food/snacks.dm b/code/modules/food_and_drinks/food/snacks.dm index 67fbd04f12ab..aba4a13b76f4 100644 --- a/code/modules/food_and_drinks/food/snacks.dm +++ b/code/modules/food_and_drinks/food/snacks.dm @@ -19,7 +19,7 @@ Here is an example of the new formatting for anyone who wants to add more food i name = "Xenoburger" //Name that displays in the UI. desc = "Smells caustic. Tastes like heresy." //Duh icon_state = "xburger" //Refers to an icon in food.dmi -/obj/item/reagent_containers/food/snacks/xenoburger/Initialize() //Don't mess with this. | nO I WILL MESS WITH THIS +/obj/item/reagent_containers/food/snacks/xenoburger/Initialize(mapload) //Don't mess with this. | nO I WILL MESS WITH THIS . = ..() //Same here. reagents.add_reagent(/datum/reagent/xenomicrobes, 10) //This is what is in the food item. you may copy/paste reagents.add_reagent(/datum/reagent/consumable/nutriment, 2) //this line of code for all the contents. diff --git a/code/modules/food_and_drinks/food/snacks_bread.dm b/code/modules/food_and_drinks/food/snacks_bread.dm index 6a1b76417add..d856b69202a3 100644 --- a/code/modules/food_and_drinks/food/snacks_bread.dm +++ b/code/modules/food_and_drinks/food/snacks_bread.dm @@ -213,7 +213,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("butter", "exotic butter") -/obj/item/reagent_containers/food/snacks/butterdog/Initialize() +/obj/item/reagent_containers/food/snacks/butterdog/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 80) diff --git a/code/modules/food_and_drinks/food/snacks_burgers.dm b/code/modules/food_and_drinks/food/snacks_burgers.dm index aeefecf45357..598d6ef913d2 100644 --- a/code/modules/food_and_drinks/food/snacks_burgers.dm +++ b/code/modules/food_and_drinks/food/snacks_burgers.dm @@ -13,7 +13,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment/vitamin = 1) foodtype = GRAIN | MEAT -/obj/item/reagent_containers/food/snacks/burger/plain/Initialize() +/obj/item/reagent_containers/food/snacks/burger/plain/Initialize(mapload) . = ..() if(prob(1)) new/obj/effect/particle_effect/fluid/smoke(get_turf(src)) diff --git a/code/modules/food_and_drinks/food/snacks_cheese.dm b/code/modules/food_and_drinks/food/snacks_cheese.dm index f5203a2ebf4d..fabe656c5407 100644 --- a/code/modules/food_and_drinks/food/snacks_cheese.dm +++ b/code/modules/food_and_drinks/food/snacks_cheese.dm @@ -258,7 +258,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1) tastes = list("bitter salt" = 1) -/obj/item/reagent_containers/food/snacks/cheesewheel/preparmesan/Initialize() +/obj/item/reagent_containers/food/snacks/cheesewheel/preparmesan/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(ageCheese)), 20 MINUTES) diff --git a/code/modules/food_and_drinks/food/snacks_egg.dm b/code/modules/food_and_drinks/food/snacks_egg.dm index 296272cb8470..7875eb918f9f 100644 --- a/code/modules/food_and_drinks/food/snacks_egg.dm +++ b/code/modules/food_and_drinks/food/snacks_egg.dm @@ -39,7 +39,7 @@ /obj/item/reagent_containers/food/snacks/egg/gland desc = "An egg! It looks weird..." -/obj/item/reagent_containers/food/snacks/egg/gland/Initialize() +/obj/item/reagent_containers/food/snacks/egg/gland/Initialize(mapload) . = ..() reagents.add_reagent(get_random_reagent_id(), 15) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index d24e28d79088..4beea21141c5 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -258,7 +258,7 @@ foodtype = MEAT | RAW w_class = WEIGHT_CLASS_SMALL -/obj/item/reagent_containers/food/snacks/raw_sausage/Initialize() +/obj/item/reagent_containers/food/snacks/raw_sausage/Initialize(mapload) . = ..() eatverb = pick("bite","chew","nibble","gobble","chomp") @@ -277,7 +277,7 @@ var/roasted = FALSE burns_on_grill = TRUE -/obj/item/reagent_containers/food/snacks/sausage/Initialize() +/obj/item/reagent_containers/food/snacks/sausage/Initialize(mapload) . = ..() eatverb = pick("bite","chew","nibble","gobble","chomp") @@ -351,7 +351,7 @@ tastes = list("soy" = 1, "vegetables" = 1) foodtype = VEGETABLES -/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize() +/obj/item/reagent_containers/food/snacks/stewedsoymeat/Initialize(mapload) . = ..() eatverb = pick("slurp","sip","inhale","drink") @@ -375,7 +375,7 @@ foodtype = MEAT var/mob/living/nugget_man -/obj/item/reagent_containers/food/snacks/nugget/Initialize() +/obj/item/reagent_containers/food/snacks/nugget/Initialize(mapload) . = ..() var/shape = pick("lump", "star", "lizard", "corgi") desc = "A 'chicken' nugget vaguely shaped like a [shape]." @@ -405,7 +405,7 @@ tastes = list("fish" = 1,"cruelty" = 2) foodtype = MEAT -/obj/item/reagent_containers/food/snacks/dolphinmeat/Initialize() +/obj/item/reagent_containers/food/snacks/dolphinmeat/Initialize(mapload) . = ..() eatverb = pick("bite","chew","choke down","gnaw","swallow","chomp") @@ -418,7 +418,7 @@ tastes = list("meat" = 5, "clowns" = 3, "sixteen teslas" = 1) foodtype = MEAT -/obj/item/reagent_containers/food/snacks/meatclown/Initialize() +/obj/item/reagent_containers/food/snacks/meatclown/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 30) diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm index 9aca4168739f..6d95f6e491ed 100644 --- a/code/modules/food_and_drinks/food/snacks_other.dm +++ b/code/modules/food_and_drinks/food/snacks_other.dm @@ -68,7 +68,7 @@ tastes = list("popcorn" = 3, "butter" = 1) foodtype = JUNKFOOD -/obj/item/reagent_containers/food/snacks/popcorn/Initialize() +/obj/item/reagent_containers/food/snacks/popcorn/Initialize(mapload) . = ..() eatverb = pick("bite","nibble","gnaw","gobble","chomp") @@ -137,7 +137,7 @@ filling_color = "#8B4513" foodtype = GROSS -/obj/item/reagent_containers/food/snacks/badrecipe/Initialize() +/obj/item/reagent_containers/food/snacks/badrecipe/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ITEM_GRILLED, PROC_REF(OnGrill)) @@ -429,7 +429,7 @@ tastes = list("candy" = 1) foodtype = JUNKFOOD | SUGAR -/obj/item/reagent_containers/food/snacks/lollipop/Initialize() +/obj/item/reagent_containers/food/snacks/lollipop/Initialize(mapload) . = ..() head = mutable_appearance('icons/obj/lollipop.dmi', "lollipop_head") change_head_color(rgb(rand(0, 255), rand(0, 255), rand(0, 255))) @@ -448,7 +448,7 @@ /obj/item/reagent_containers/food/snacks/lollipop/cyborg var/spamchecking = TRUE -/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize() +/obj/item/reagent_containers/food/snacks/lollipop/cyborg/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) @@ -469,14 +469,14 @@ tastes = list("candy") foodtype = JUNKFOOD -/obj/item/reagent_containers/food/snacks/gumball/Initialize() +/obj/item/reagent_containers/food/snacks/gumball/Initialize(mapload) . = ..() color = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) /obj/item/reagent_containers/food/snacks/gumball/cyborg var/spamchecking = TRUE -/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize() +/obj/item/reagent_containers/food/snacks/gumball/cyborg/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(spamcheck)), 1200) diff --git a/code/modules/food_and_drinks/food/snacks_pastry.dm b/code/modules/food_and_drinks/food/snacks_pastry.dm index e9fc9463db46..dc69826ac4d3 100644 --- a/code/modules/food_and_drinks/food/snacks_pastry.dm +++ b/code/modules/food_and_drinks/food/snacks_pastry.dm @@ -16,7 +16,7 @@ var/is_frosted = FALSE var/extra_reagent = null -/obj/item/reagent_containers/food/snacks/donut/Initialize() +/obj/item/reagent_containers/food/snacks/donut/Initialize(mapload) . = ..() if(prob(30)) frost_donut() @@ -52,7 +52,7 @@ bitesize = 10 tastes = list("donut" = 3, "chaos" = 1) -/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize() +/obj/item/reagent_containers/food/snacks/donut/chaos/Initialize(mapload) . = ..() extra_reagent = pick(/datum/reagent/consumable/nutriment, /datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/drug/krokodil, /datum/reagent/toxin/plasma, /datum/reagent/consumable/coco, /datum/reagent/toxin/slimejelly, /datum/reagent/consumable/banana, /datum/reagent/consumable/berryjuice, /datum/reagent/medicine/omnizine) reagents.add_reagent(extra_reagent, 3) @@ -88,7 +88,7 @@ tastes = list("jelly" = 1, "donut" = 3) foodtype = JUNKFOOD | GRAIN | FRIED | FRUIT | SUGAR | BREAKFAST -/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize() +/obj/item/reagent_containers/food/snacks/donut/jelly/Initialize(mapload) . = ..() if(extra_reagent) reagents.add_reagent(extra_reagent, 3) @@ -457,7 +457,7 @@ tastes = list("mushroom" = 1, "biscuit" = 1) foodtype = GRAIN | VEGETABLES -/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize() +/obj/item/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize(mapload) var/fey = prob(10) if(fey) name = "exceptional plump helmet biscuit" @@ -649,7 +649,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/consumable/cinnamon = 5, /datum/reagent/consumable/sugar = 5) tastes = list("lost dreams" = 1, "cinnamon" = 1) -/obj/item/reagent_containers/food/snacks/pancakes/Initialize() +/obj/item/reagent_containers/food/snacks/pancakes/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index 164d00bf7b13..cee822f4d353 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -116,7 +116,7 @@ tastes = list("pie" = 1, "mushroom" = 1) foodtype = GRAIN | VEGETABLES -/obj/item/reagent_containers/food/snacks/pie/plump_pie/Initialize() +/obj/item/reagent_containers/food/snacks/pie/plump_pie/Initialize(mapload) . = ..() var/fey = prob(10) if(fey) diff --git a/code/modules/food_and_drinks/food/snacks_pizza.dm b/code/modules/food_and_drinks/food/snacks_pizza.dm index f08bf14fca02..19ade2da4290 100644 --- a/code/modules/food_and_drinks/food/snacks_pizza.dm +++ b/code/modules/food_and_drinks/food/snacks_pizza.dm @@ -43,7 +43,7 @@ /obj/item/reagent_containers/food/snacks/pizza/margherita/raw/MakeBakeable() AddComponent(/datum/component/bakeable, /obj/item/reagent_containers/food/snacks/pizza/margherita, rand(70 SECONDS, 80 SECONDS), TRUE, TRUE) -/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize() +/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize(mapload) bonus_reagents += list(/datum/reagent/nanomachines = 70) return ..() diff --git a/code/modules/food_and_drinks/food/snacks_salad.dm b/code/modules/food_and_drinks/food/snacks_salad.dm index 5db8415e8ecb..21b0ea2f24b1 100644 --- a/code/modules/food_and_drinks/food/snacks_salad.dm +++ b/code/modules/food_and_drinks/food/snacks_salad.dm @@ -9,7 +9,7 @@ tastes = list("leaves" = 1) foodtype = VEGETABLES -/obj/item/reagent_containers/food/snacks/salad/Initialize() +/obj/item/reagent_containers/food/snacks/salad/Initialize(mapload) . = ..() eatverb = pick("devour","nibble","gnaw","gobble","chomp") //who the fuck gnaws and devours on a salad @@ -172,7 +172,7 @@ foodtype = GRAIN | SEAFOOD -/obj/item/reagent_containers/food/snacks/salad/friedrice/shrimp/Initialize() +/obj/item/reagent_containers/food/snacks/salad/friedrice/shrimp/Initialize(mapload) . = ..() if(prob(10)) name = "rice fried shrimp" diff --git a/code/modules/food_and_drinks/food/snacks_seafood.dm b/code/modules/food_and_drinks/food/snacks_seafood.dm index 951c0aa319e6..7f89f997971d 100644 --- a/code/modules/food_and_drinks/food/snacks_seafood.dm +++ b/code/modules/food_and_drinks/food/snacks_seafood.dm @@ -19,7 +19,7 @@ tastes = list("fish" = 1) foodtype = SEAFOOD | GROSS -/obj/item/reagent_containers/food/snacks/carpmeat/Initialize() +/obj/item/reagent_containers/food/snacks/carpmeat/Initialize(mapload) . = ..() eatverb = pick("bite","chew","gnaw","swallow","chomp") diff --git a/code/modules/food_and_drinks/food/snacks_soup.dm b/code/modules/food_and_drinks/food/snacks_soup.dm index 2959386cfd45..9ccb9ac5bfd2 100644 --- a/code/modules/food_and_drinks/food/snacks_soup.dm +++ b/code/modules/food_and_drinks/food/snacks_soup.dm @@ -8,7 +8,7 @@ tastes = list("tasteless soup" = 1) foodtype = VEGETABLES -/obj/item/reagent_containers/food/snacks/soup/Initialize() +/obj/item/reagent_containers/food/snacks/soup/Initialize(mapload) . = ..() eatverb = pick("slurp","sip","inhale","drink") @@ -19,7 +19,7 @@ list_reagents = list(/datum/reagent/water = 10) tastes = list("wishes" = 1) -/obj/item/reagent_containers/food/snacks/soup/wish/Initialize() +/obj/item/reagent_containers/food/snacks/soup/wish/Initialize(mapload) . = ..() var/wish_true = prob(25) if(wish_true) @@ -99,7 +99,7 @@ list_reagents = list(/datum/reagent/consumable/nutriment = 6) tastes = list("chaos" = 1) -/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize() +/obj/item/reagent_containers/food/snacks/soup/mystery/Initialize(mapload) . = ..() extra_reagent = pick(/datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/medicine/omnizine, /datum/reagent/consumable/banana, /datum/reagent/blood, /datum/reagent/toxin/slimejelly, /datum/reagent/toxin, /datum/reagent/consumable/banana, /datum/reagent/carbon, /datum/reagent/medicine/oculine) bonus_reagents = list(/datum/reagent/consumable/nutriment = 6) @@ -174,7 +174,7 @@ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 5) foodtype = VEGETABLES -/obj/item/reagent_containers/food/snacks/soup/beet/Initialize() +/obj/item/reagent_containers/food/snacks/soup/beet/Initialize(mapload) . = ..() name = pick("borsch","bortsch","borstch","borsh","borshch","borscht") tastes = list(name = 1) diff --git a/code/modules/food_and_drinks/food/snacks_spaghetti.dm b/code/modules/food_and_drinks/food/snacks_spaghetti.dm index b568b23c9d5b..3b35fe626ece 100644 --- a/code/modules/food_and_drinks/food/snacks_spaghetti.dm +++ b/code/modules/food_and_drinks/food/snacks_spaghetti.dm @@ -6,7 +6,7 @@ filling_color = "#F0E68C" foodtype = GRAIN -/obj/item/reagent_containers/food/snacks/spaghetti/Initialize() +/obj/item/reagent_containers/food/snacks/spaghetti/Initialize(mapload) . = ..() if(!cooked_type) // This isn't cooked, why would you put uncooked spaghetti in your pocket? var/list/display_message = list( diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 12a7acb960b8..f757aad4fcf1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -56,7 +56,7 @@ God bless America. )) var/datum/looping_sound/deep_fryer/fry_loop -/obj/machinery/deepfryer/Initialize() +/obj/machinery/deepfryer/Initialize(mapload) . = ..() create_reagents(50, OPENCONTAINER) reagents.add_reagent(/datum/reagent/consumable/cooking_oil, 25) diff --git a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm index 962a8de3756b..f5bf4f98449f 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm @@ -17,7 +17,7 @@ var/list/stored_food = list() var/obj/item/reagent_containers/mixer -/obj/machinery/food_cart/Initialize() +/obj/machinery/food_cart/Initialize(mapload) . = ..() create_reagents(LIQUID_CAPACIY, OPENCONTAINER | NO_REACT) mixer = new /obj/item/reagent_containers(src, MIXER_CAPACITY) diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 2e9d001b6096..756db185425b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -16,7 +16,7 @@ var/ignore_clothing = FALSE -/obj/machinery/gibber/Initialize() +/obj/machinery/gibber/Initialize(mapload) . = ..() add_overlay("grjam") diff --git a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm index efd6c0c36d06..56065b62c0c0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/griddle.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/griddle.dm @@ -21,7 +21,7 @@ ///How many shit fits on the griddle? var/max_items = 8 -/obj/machinery/griddle/Initialize() +/obj/machinery/griddle/Initialize(mapload) . = ..() end_processing() //doesn't start on grill_loop = new(list(src), FALSE) diff --git a/code/modules/food_and_drinks/kitchen_machinery/grill.dm b/code/modules/food_and_drinks/kitchen_machinery/grill.dm index 2bce876dd710..ce0259a5c6c0 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/grill.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/grill.dm @@ -16,7 +16,7 @@ var/grill_time = 0 var/datum/looping_sound/grill/grill_loop -/obj/machinery/grill/Initialize() +/obj/machinery/grill/Initialize(mapload) . = ..() grill_loop = new(list(src), FALSE) diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index f4833d0dd522..4f79c5ebddde 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -60,7 +60,7 @@ return "vanilla" -/obj/machinery/icecream_vat/Initialize() +/obj/machinery/icecream_vat/Initialize(mapload) . = ..() while(product_types.len < 6) product_types.Add(5) @@ -177,12 +177,12 @@ foodtype = GRAIN tastes = list("cold" = 6, "creamy" = 4) -/obj/item/reagent_containers/food/snacks/icecream/Initialize() +/obj/item/reagent_containers/food/snacks/icecream/Initialize(mapload) . = ..() create_reagents(20) reagents.add_reagent(/datum/reagent/consumable/nutriment, 4) -/obj/item/reagent_containers/food/snacks/icecream/proc/set_cone_type(var/cone_name) +/obj/item/reagent_containers/food/snacks/icecream/proc/set_cone_type(cone_name) cone_type = cone_name icon_state = "icecream_cone_[cone_name]" switch (cone_type) @@ -194,7 +194,7 @@ desc = "Delicious [cone_name] cone, but no ice cream." -/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(var/flavour_name) +/obj/item/reagent_containers/food/snacks/icecream/proc/add_ice_cream(flavour_name) name = "[flavour_name] icecream" src.add_overlay("icecream_[flavour_name]") switch (flavour_name) // adding the actual reagents advertised in the ingredient list @@ -219,7 +219,7 @@ reagents.add_reagent(/datum/reagent/liquidgibs, 2) ice_creamed = 1 -/obj/item/reagent_containers/food/snacks/icecream/proc/add_mob_flavor(var/mob/M) +/obj/item/reagent_containers/food/snacks/icecream/proc/add_mob_flavor(mob/M) add_ice_cream("mob") name = "[M.name] icecream" diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm index 8c49d584ed36..c32488db9083 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm @@ -32,7 +32,7 @@ var/static/list/radial_options = list("eject" = radial_eject, "use" = radial_use) var/static/list/ai_radial_options = list("eject" = radial_eject, "use" = radial_use, "examine" = radial_examine) -/obj/machinery/microwave/Initialize() +/obj/machinery/microwave/Initialize(mapload) . = ..() wires = new /datum/wires/microwave(src) create_reagents(100) diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 034a2f79e5e4..56580bd8abb9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -23,7 +23,7 @@ */ var/static/list/processor_inputs -/obj/machinery/processor/Initialize() +/obj/machinery/processor/Initialize(mapload) . = ..() if(processor_inputs) return @@ -170,7 +170,7 @@ name = "slime processor" desc = "An industrial grinder with a sticker saying appropriated for science department. Keep hands clear of intake area while operating." -/obj/machinery/processor/slime/Initialize() +/obj/machinery/processor/slime/Initialize(mapload) . = ..() var/obj/item/circuitboard/machine/B = new /obj/item/circuitboard/machine/processor/slime(null) B.apply_default_parts(src) diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 4634feb216e1..f85e1aff0663 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -36,7 +36,7 @@ var/power_wire_cut = FALSE var/list/slogan_list = list() -/obj/machinery/smartfridge/Initialize() +/obj/machinery/smartfridge/Initialize(mapload) . = ..() create_reagents(100, NO_REACT) @@ -310,7 +310,7 @@ return TRUE ///Really simple proc, just moves the object "O" into the hands of mob "M" if able, done so I could modify the proc a little for the organ fridge -/obj/machinery/smartfridge/proc/dispense(obj/item/O, var/mob/M) +/obj/machinery/smartfridge/proc/dispense(obj/item/O, mob/M) if(!M.put_in_hands(O)) O.forceMove(drop_location()) adjust_item_drop_location(O) @@ -415,7 +415,7 @@ pitches = FALSE var/drying = FALSE -/obj/machinery/smartfridge/drying_rack/Initialize() +/obj/machinery/smartfridge/drying_rack/Initialize(mapload) . = ..() if(component_parts && component_parts.len) component_parts.Cut() @@ -607,7 +607,7 @@ var/obj/item/organ/organ = O organ.organ_flags |= ORGAN_FROZEN -/obj/machinery/smartfridge/organ/dispense(obj/item/O, var/mob/M) +/obj/machinery/smartfridge/organ/dispense(obj/item/O, mob/M) var/obj/item/organ/organ = O organ.organ_flags &= ~ORGAN_FROZEN ..() diff --git a/code/modules/food_and_drinks/pizzabox.dm b/code/modules/food_and_drinks/pizzabox.dm index 31ef16bbfad3..15d995943de2 100644 --- a/code/modules/food_and_drinks/pizzabox.dm +++ b/code/modules/food_and_drinks/pizzabox.dm @@ -29,7 +29,7 @@ var/const/BOMB_TIMER_MIN = 1 var/const/BOMB_TIMER_MAX = 20 -/obj/item/pizzabox/Initialize() +/obj/item/pizzabox/Initialize(mapload) . = ..() update_icon() @@ -265,14 +265,14 @@ wires = null update_icon() -/obj/item/pizzabox/bomb/Initialize() +/obj/item/pizzabox/bomb/Initialize(mapload) . = ..() var/randompizza = pick(subtypesof(/obj/item/reagent_containers/food/snacks/pizza)) pizza = new randompizza(src) bomb = new(src) wires = new /datum/wires/explosive/pizza(src) -/obj/item/pizzabox/margherita/Initialize() +/obj/item/pizzabox/margherita/Initialize(mapload) . = ..() AddPizza() boxtag = "Margherita Deluxe" @@ -283,37 +283,37 @@ /obj/item/pizzabox/margherita/robo/AddPizza() pizza = new /obj/item/reagent_containers/food/snacks/pizza/margherita/robo(src) -/obj/item/pizzabox/vegetable/Initialize() +/obj/item/pizzabox/vegetable/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/vegetable(src) boxtag = "Gourmet Vegatable" -/obj/item/pizzabox/mushroom/Initialize() +/obj/item/pizzabox/mushroom/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/mushroom(src) boxtag = "Mushroom Special" -/obj/item/pizzabox/meat/Initialize() +/obj/item/pizzabox/meat/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/meat(src) boxtag = "Meatlover's Supreme" -/obj/item/pizzabox/pineapple/Initialize() +/obj/item/pizzabox/pineapple/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/pineapple(src) boxtag = "Honolulu Chew" -/obj/item/pizzabox/seafood/Initialize() +/obj/item/pizzabox/seafood/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/seafood(src) boxtag = "Ahi King" -/obj/item/pizzabox/sassysage/Initialize() +/obj/item/pizzabox/sassysage/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/sassysage(src) boxtag = "Meatball Supreme" -/obj/item/pizzabox/donkpocket/Initialize() +/obj/item/pizzabox/donkpocket/Initialize(mapload) . = ..() pizza = new /obj/item/reagent_containers/food/snacks/pizza/donkpocket(src) boxtag = "Donk Pocket Special" @@ -334,7 +334,7 @@ /obj/item/reagent_containers/food/snacks/pizza/dank = 0.1) //pizzas here are weighted by chance to be someone's favorite var/static/list/pizza_preferences -/obj/item/pizzabox/infinite/Initialize() +/obj/item/pizzabox/infinite/Initialize(mapload) . = ..() if(!pizza_preferences) pizza_preferences = list() diff --git a/code/modules/goals/station_goals/dna_vault.dm b/code/modules/goals/station_goals/dna_vault.dm index 36ebf6e9125e..4548ed43218e 100644 --- a/code/modules/goals/station_goals/dna_vault.dm +++ b/code/modules/goals/station_goals/dna_vault.dm @@ -147,7 +147,7 @@ var/list/obj/structure/fillers = list() -/obj/machinery/dna_vault/Initialize() +/obj/machinery/dna_vault/Initialize(mapload) //TODO: Replace this,bsa and gravgen with some big machinery datum var/list/occupied = list() for(var/direct in list(EAST,WEST,SOUTHEAST,SOUTHWEST)) diff --git a/code/modules/goals/station_goals/shield.dm b/code/modules/goals/station_goals/shield.dm index fa8c89811907..f981ad6066a1 100644 --- a/code/modules/goals/station_goals/shield.dm +++ b/code/modules/goals/station_goals/shield.dm @@ -95,7 +95,7 @@ var/static/gid = 0 var/id = 0 -/obj/machinery/satellite/Initialize() +/obj/machinery/satellite/Initialize(mapload) . = ..() id = gid++ diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 4677a15fec89..64b76dd43476 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -66,7 +66,7 @@ icon = 'icons/mob/easter.dmi' icon_state = "basket" -/obj/item/storage/bag/easterbasket/Initialize() +/obj/item/storage/bag/easterbasket/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/egg, /obj/item/reagent_containers/food/snacks/chocolateegg, /obj/item/reagent_containers/food/snacks/boiledegg)) @@ -109,7 +109,7 @@ /obj/item/reagent_containers/food/snacks/egg/loaded containsPrize = TRUE -/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize() +/obj/item/reagent_containers/food/snacks/egg/loaded/Initialize(mapload) . = ..() var/eggcolor = pick("blue","green","mime","orange","purple","rainbow","red","yellow") icon_state = "egg-[eggcolor]" diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index 38250822ce07..9cb62742289e 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -34,7 +34,7 @@ var/trapped = 0 var/mob/trapped_mob -/obj/structure/closet/initialize() +/obj/structure/closet/Initialize(mapload) ..() if(prob(30)) set_spooky_trap() @@ -129,7 +129,7 @@ layer = 4 var/timer = 0 -/mob/living/simple_animal/shade/howling_ghost/Initialize() +/mob/living/simple_animal/shade/howling_ghost/Initialize(mapload) . = ..() icon_state = pick("ghost","ghostian","ghostian2","ghostking","ghost1","ghost2") icon_living = icon_state @@ -189,7 +189,7 @@ unsuitable_atmos_damage = 0 var/timer -/mob/living/simple_animal/hostile/retaliate/clown/insane/Initialize() +/mob/living/simple_animal/hostile/retaliate/clown/insane/Initialize(mapload) . = ..() timer = rand(5,15) status_flags = (status_flags | GODMODE) diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index 0897a4768918..87d2981dd78c 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -55,7 +55,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars, list( return O -/area/proc/copy_contents_to(var/area/A , var/platingRequired = 0, var/nerf_weapons = 0 ) +/area/proc/copy_contents_to(area/A , platingRequired = 0, nerf_weapons = 0 ) //Takes: Area. Optional: If it should copy to areas that don't have plating //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. diff --git a/code/modules/holodeck/holo_effect.dm b/code/modules/holodeck/holo_effect.dm index fee0b2b7c91f..64cc5331060e 100644 --- a/code/modules/holodeck/holo_effect.dm +++ b/code/modules/holodeck/holo_effect.dm @@ -9,18 +9,18 @@ icon_state = "x2" invisibility = INVISIBILITY_ABSTRACT -/obj/effect/holodeck_effect/proc/activate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/proc/activate(obj/machinery/computer/holodeck/HC) return -/obj/effect/holodeck_effect/proc/deactivate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/proc/deactivate(obj/machinery/computer/holodeck/HC) qdel(src) return // Called by the holodeck computer as long as the program is running -/obj/effect/holodeck_effect/proc/tick(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/proc/tick(obj/machinery/computer/holodeck/HC) return -/obj/effect/holodeck_effect/proc/safety(var/active) +/obj/effect/holodeck_effect/proc/safety(active) return @@ -30,7 +30,7 @@ icon_state = "deck_nanotrasen_full" var/obj/item/toy/cards/deck/D -/obj/effect/holodeck_effect/cards/activate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/cards/activate(obj/machinery/computer/holodeck/HC) D = new(loc) safety(!(HC.obj_flags & EMAGGED)) D.holo = HC @@ -55,7 +55,7 @@ D.card_attack_verb = list("attacked", "sliced", "diced", "slashed", "cut") -/obj/effect/holodeck_effect/sparks/activate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/sparks/activate(obj/machinery/computer/holodeck/HC) var/turf/T = get_turf(src) if(T) var/datum/effect_system/spark_spread/s = new @@ -70,7 +70,7 @@ var/mobtype = /mob/living/simple_animal/hostile/carp/holocarp var/mob/mob = null -/obj/effect/holodeck_effect/mobspawner/activate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/mobspawner/activate(obj/machinery/computer/holodeck/HC) if(islist(mobtype)) mobtype = pick(mobtype) mob = new mobtype(loc) @@ -80,7 +80,7 @@ mob.vars[v] = null return mob -/obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC) +/obj/effect/holodeck_effect/mobspawner/deactivate(obj/machinery/computer/holodeck/HC) if(mob) HC.derez(mob) qdel(src) @@ -101,7 +101,7 @@ /obj/effect/holodeck_effect/mobspawner/penguin mobtype = /mob/living/simple_animal/pet/penguin/emperor -/obj/effect/holodeck_effect/mobspawner/penguin/Initialize() +/obj/effect/holodeck_effect/mobspawner/penguin/Initialize(mapload) if(prob(1)) mobtype = /mob/living/simple_animal/pet/penguin/emperor/shamebrero return ..() diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 95b12ccbcef0..27220da6be7c 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -27,12 +27,12 @@ var/active = FALSE var/saber_color -/obj/item/holo/esword/green/Initialize() +/obj/item/holo/esword/green/Initialize(mapload) . = ..() saber_color = "green" -/obj/item/holo/esword/red/Initialize() +/obj/item/holo/esword/red/Initialize(mapload) . = ..() saber_color = "red" @@ -44,7 +44,7 @@ /obj/item/holo/esword/attack(target as mob, mob/user as mob) ..() -/obj/item/holo/esword/Initialize() +/obj/item/holo/esword/Initialize(mapload) . = ..() saber_color = pick("red","blue","green","purple") diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index d3ef8bae7ae9..94588436d409 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -30,7 +30,7 @@ bullet_bounce_sound = null tiled_dirt = FALSE -/turf/open/floor/holofloor/grass/Initialize() +/turf/open/floor/holofloor/grass/Initialize(mapload) . = ..() if(src.type == /turf/open/floor/holofloor/grass) //don't want grass subtypes getting the icon state, icon_state = "grass[rand(1,4)]" @@ -64,7 +64,7 @@ icon_state = "asteroid0" tiled_dirt = FALSE -/turf/open/floor/holofloor/asteroid/Initialize() +/turf/open/floor/holofloor/asteroid/Initialize(mapload) icon_state = "asteroid[rand(0, 12)]" . = ..() @@ -74,7 +74,7 @@ icon_state = "basalt0" tiled_dirt = FALSE -/turf/open/floor/holofloor/basalt/Initialize() +/turf/open/floor/holofloor/basalt/Initialize(mapload) . = ..() if(prob(15)) icon_state = "basalt[rand(0, 12)]" @@ -85,7 +85,7 @@ icon = 'icons/turf/space.dmi' icon_state = "0" -/turf/open/floor/holofloor/space/Initialize() +/turf/open/floor/holofloor/space/Initialize(mapload) icon_state = SPACE_ICON_STATE // so realistic . = ..() @@ -96,11 +96,11 @@ bullet_bounce_sound = null tiled_dirt = FALSE -/turf/open/floor/holofloor/hyperspace/Initialize() +/turf/open/floor/holofloor/hyperspace/Initialize(mapload) icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]" . = ..() -/turf/open/floor/holofloor/hyperspace/ns/Initialize() +/turf/open/floor/holofloor/hyperspace/ns/Initialize(mapload) . = ..() icon_state = "speedspace_ns_[(x + 5*y + (y%2+1)*7)%15+1]" @@ -115,7 +115,7 @@ bullet_bounce_sound = null tiled_dirt = FALSE -/turf/open/floor/holofloor/carpet/Initialize() +/turf/open/floor/holofloor/carpet/Initialize(mapload) . = ..() addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/, update_icon)), 1) diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index e4e7cf21197f..5c819c18bb24 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -40,7 +40,7 @@ var/bee_resources = 0 -/obj/structure/beebox/Initialize() +/obj/structure/beebox/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) @@ -58,7 +58,7 @@ var/random_reagent = FALSE -/obj/structure/beebox/premade/Initialize() +/obj/structure/beebox/premade/Initialize(mapload) . = ..() icon_state = "beebox" diff --git a/code/modules/hydroponics/beekeeping/honey_frame.dm b/code/modules/hydroponics/beekeeping/honey_frame.dm index 370b31da177e..3cc3f9806dc1 100644 --- a/code/modules/hydroponics/beekeeping/honey_frame.dm +++ b/code/modules/hydroponics/beekeeping/honey_frame.dm @@ -7,7 +7,7 @@ var/honeycomb_capacity = 10 //10 Honeycomb per frame by default, researchable frames perhaps? -/obj/item/honey_frame/Initialize() +/obj/item/honey_frame/Initialize(mapload) . = ..() pixel_x = rand(8,-8) pixel_y = rand(8,-8) diff --git a/code/modules/hydroponics/beekeeping/honeycomb.dm b/code/modules/hydroponics/beekeeping/honeycomb.dm index daa22c4f850f..1cf097c98ed6 100644 --- a/code/modules/hydroponics/beekeeping/honeycomb.dm +++ b/code/modules/hydroponics/beekeeping/honeycomb.dm @@ -13,7 +13,7 @@ grind_results = list() var/honey_color = "" -/obj/item/reagent_containers/honeycomb/Initialize() +/obj/item/reagent_containers/honeycomb/Initialize(mapload) . = ..() pixel_x = rand(8,-8) pixel_y = rand(8,-8) diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm index 9d828aa4f92d..eb2625ad9658 100644 --- a/code/modules/hydroponics/biogenerator.dm +++ b/code/modules/hydroponics/biogenerator.dm @@ -18,7 +18,7 @@ /// Currently selected category in the UI var/selected_cat -/obj/machinery/biogenerator/Initialize() +/obj/machinery/biogenerator/Initialize(mapload) . = ..() stored_research = new /datum/techweb/specialized/autounlocking/biogenerator create_reagents(1000) diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm index 7d0ad8e0676c..efc99f269478 100644 --- a/code/modules/hydroponics/fermenting_barrel.dm +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -10,7 +10,7 @@ var/open = FALSE var/speed_multiplier = 1 //How fast it distills. Defaults to 100% (1.0). Lower is better. -/obj/structure/fermenting_barrel/Initialize() +/obj/structure/fermenting_barrel/Initialize(mapload) // Bluespace beakers, but without the portability or efficiency in circuits. create_reagents(300, DRAINABLE | AMOUNT_VISIBLE) . = ..() diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm index 689cb7242bda..14f4baaf914b 100644 --- a/code/modules/hydroponics/gene_modder.dm +++ b/code/modules/hydroponics/gene_modder.dm @@ -250,7 +250,7 @@ popup.open() -/obj/machinery/plantgenes/Topic(var/href, var/list/href_list) +/obj/machinery/plantgenes/Topic(href, list/href_list) if(..()) return usr.set_machine(src) @@ -434,7 +434,7 @@ var/read_only = 0 //Well, it's still a floppy disk obj_flags = UNIQUE_RENAME -/obj/item/disk/plantgene/Initialize() +/obj/item/disk/plantgene/Initialize(mapload) . = ..() update_icon() src.pixel_x = rand(-5, 5) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 7e3fa3f495b7..fc0ec74bd1c4 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -132,6 +132,6 @@ name = "synthesized banana peel" desc = "A synthetic banana peel." -/obj/item/grown/bananapeel/specialpeel/Initialize() +/obj/item/grown/bananapeel/specialpeel/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 40) diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 466bbce3458f..9099e20bfb5c 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -60,7 +60,7 @@ wine_power = 70 //Water to wine, baby. wine_flavor = "divinity" -/obj/item/reagent_containers/food/snacks/grown/holymelon/Initialize() +/obj/item/reagent_containers/food/snacks/grown/holymelon/Initialize(mapload) . = ..() var/uses = 1 if(seed) diff --git a/code/modules/hydroponics/grown/rainbow_bunch.dm b/code/modules/hydroponics/grown/rainbow_bunch.dm index fb63763aa62c..d5875b8d04ca 100644 --- a/code/modules/hydroponics/grown/rainbow_bunch.dm +++ b/code/modules/hydroponics/grown/rainbow_bunch.dm @@ -31,7 +31,7 @@ throw_range = 3 attack_verb = list("pompfed") -/obj/item/reagent_containers/food/snacks/grown/rainbow_flower/Initialize() +/obj/item/reagent_containers/food/snacks/grown/rainbow_flower/Initialize(mapload) . = ..() var/flower_color = rand(1,8) switch(flower_color) diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm index 75505202da1a..cc4da4c6e5e5 100644 --- a/code/modules/hydroponics/grown/random.dm +++ b/code/modules/hydroponics/grown/random.dm @@ -12,7 +12,7 @@ icon_harvest = "xpod-harvest" growthstages = 4 -/obj/item/seeds/random/Initialize() +/obj/item/seeds/random/Initialize(mapload) . = ..() randomize_stats() if(prob(60)) @@ -28,7 +28,7 @@ icon_state = "crunchy" bitesize_mod = 2 -/obj/item/reagent_containers/food/snacks/grown/random/Initialize() +/obj/item/reagent_containers/food/snacks/grown/random/Initialize(mapload) . = ..() wine_power = rand(10,150) if(prob(1)) diff --git a/code/modules/hydroponics/grown/replicapod.dm b/code/modules/hydroponics/grown/replicapod.dm index 2902ce96937e..5f4f22638b21 100644 --- a/code/modules/hydroponics/grown/replicapod.dm +++ b/code/modules/hydroponics/grown/replicapod.dm @@ -24,7 +24,7 @@ var/list/quirks = null var/contains_sample = 0 -/obj/item/seeds/replicapod/Initialize() +/obj/item/seeds/replicapod/Initialize(mapload) . = ..() create_reagents(volume, INJECTABLE|DRAWABLE) diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm index bc7dc006be89..ed2ee4cc604a 100644 --- a/code/modules/hydroponics/grown/towercap.dm +++ b/code/modules/hydroponics/grown/towercap.dm @@ -162,7 +162,7 @@ /obj/structure/bonfire/dense density = TRUE -/obj/structure/bonfire/prelit/Initialize() +/obj/structure/bonfire/prelit/Initialize(mapload) . = ..() StartBurning() diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm index 752a81ad3213..7c5e639730d1 100644 --- a/code/modules/hydroponics/growninedible.dm +++ b/code/modules/hydroponics/growninedible.dm @@ -8,7 +8,7 @@ resistance_flags = FLAMMABLE var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. -/obj/item/grown/Initialize(newloc, obj/item/seeds/new_seed) +/obj/item/grown/Initialize(mapload, newloc, obj/item/seeds/new_seed) . = ..() create_reagents(50) diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm index 0e6235a60524..97b78a364f38 100644 --- a/code/modules/hydroponics/hydroitemdefines.dm +++ b/code/modules/hydroponics/hydroitemdefines.dm @@ -100,7 +100,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' sharpness = SHARP_EDGED -/obj/item/hatchet/Initialize() +/obj/item/hatchet/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 70, 100) @@ -140,7 +140,7 @@ sharpness = SHARP_POINTY var/swiping = FALSE -/obj/item/scythe/Initialize() +/obj/item/scythe/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 90, 105) @@ -180,7 +180,7 @@ amount_per_transfer_from_this = 10 possible_transfer_amounts = list(1,2,5,10,15,25,50) -/obj/item/reagent_containers/glass/bottle/nutrient/Initialize() +/obj/item/reagent_containers/glass/bottle/nutrient/Initialize(mapload) . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index ecf0626b8c07..f0acd1979f1f 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -23,7 +23,7 @@ /datum/plant_gene/core/proc/apply_stat(obj/item/seeds/S) return -/datum/plant_gene/core/New(var/i = null) +/datum/plant_gene/core/New(i = null) ..() if(!isnull(i)) value = i diff --git a/code/modules/hydroponics/sample.dm b/code/modules/hydroponics/sample.dm index a924c02d944a..6ff2aeefcf54 100644 --- a/code/modules/hydroponics/sample.dm +++ b/code/modules/hydroponics/sample.dm @@ -5,7 +5,7 @@ yield = -1 var/sample_color = "#FFFFFF" -/obj/item/seeds/sample/Initialize() +/obj/item/seeds/sample/Initialize(mapload) . = ..() if(sample_color) var/mutable_appearance/filling = mutable_appearance(icon, "sample-filling") diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index 2d6e25c16c3d..3d6bbf6b2ed9 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -36,7 +36,7 @@ var/weed_rate = 1 //If the chance below passes, then this many weeds sprout during growth var/weed_chance = 5 //Percentage chance per tray update to grow weeds -/obj/item/seeds/Initialize(loc, nogenes = 0) +/obj/item/seeds/Initialize(mapload, loc, nogenes = 0) . = ..() pixel_x = rand(-8, 8) pixel_y = rand(-8, 8) @@ -169,7 +169,7 @@ return result -/obj/item/seeds/proc/prepare_result(var/obj/item/T) +/obj/item/seeds/proc/prepare_result(obj/item/T) if(!T.reagents) CRASH("[T] has no reagents.") diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index e38ea5d4f973..7394c38f8656 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -84,7 +84,7 @@ custom_price = 125 instrument_range = 1 -/obj/item/instrument/piano_synth/headphones/Initialize() +/obj/item/instrument/piano_synth/headphones/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_SONG_START, PROC_REF(start_playing)) RegisterSignal(src, COMSIG_SONG_END, PROC_REF(stop_playing)) @@ -155,7 +155,7 @@ force = 0 attack_verb = list("play", "jazz", "trumpet", "mourn", "doot", "spook") -/obj/item/instrument/trumpet/spectral/Initialize() +/obj/item/instrument/trumpet/spectral/Initialize(mapload) . = ..() AddComponent(/datum/component/spooky) @@ -176,7 +176,7 @@ force = 0 attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked") -/obj/item/instrument/saxophone/spectral/Initialize() +/obj/item/instrument/saxophone/spectral/Initialize(mapload) . = ..() AddComponent(/datum/component/spooky) @@ -198,7 +198,7 @@ force = 0 attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked") -/obj/item/instrument/trombone/spectral/Initialize() +/obj/item/instrument/trombone/spectral/Initialize(mapload) . = ..() AddComponent(/datum/component/spooky) diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 9d1a12983304..2b5bed7e8722 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -215,7 +215,7 @@ dna.species.before_equip_job(equipping, src, visual_only) equipOutfit(equipping.outfit, visual_only) -/datum/job/proc/announce_head(var/mob/living/carbon/human/H, var/channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. +/datum/job/proc/announce_head(mob/living/carbon/human/H, channels) //tells the given channel that the given mob is the new department head. See communications.dm for valid channels. if(H && GLOB.announcement_systems.len) //timer because these should come after the captain announcement SSticker.OnRoundstart(CALLBACK(GLOBAL_PROC, PROC_REF(_addtimer_here), CALLBACK(pick(GLOB.announcement_systems), /obj/machinery/announcement_system/proc/announce, "NEWHEAD", H.real_name, H.job, channels), 1)) diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 41cdc23ad7f1..96a0e48e28d7 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -165,7 +165,7 @@ GLOBAL_LIST_INIT(available_depts_sec, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICA //The helmet is necessary because /obj/item/clothing/head/helmet/sec is overwritten in the chameleon list by the standard helmet, which has the same name and icon state -/obj/item/radio/headset/headset_sec/alt/department/Initialize() +/obj/item/radio/headset/headset_sec/alt/department/Initialize(mapload) . = ..() wires = new/datum/wires/radio(src) secure_radio_connections = new diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index 5a82457db236..c72e6ad164e1 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(available_depts_eng, list(ENG_DEPT_MEDICAL, ENG_DEPT_SCIENCE, E head = null internals_slot = ITEM_SLOT_SUITSTORE -/obj/item/radio/headset/headset_eng/department/Initialize() +/obj/item/radio/headset/headset_eng/department/Initialize(mapload) . = ..() wires = new/datum/wires/radio(src) secure_radio_connections = new diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 3841c9f28b5d..e290afea18e8 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -162,7 +162,7 @@ GLOBAL_PROTECT(exp_specialmap) //this is necessary because antags happen before job datums are handed out, but NOT before they come into existence //so I can't simply use job datum.department_head straight from the mind datum, laaaaame. -/proc/get_department_heads(var/job_title) +/proc/get_department_heads(job_title) if(!job_title) return list() @@ -219,7 +219,7 @@ GLOBAL_PROTECT(exp_specialmap) // yogs end return job -/proc/get_alternate_titles(var/job) +/proc/get_alternate_titles(job) var/list/jobs = SSjob.occupations var/list/titles = list() diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index e12218a09bbe..ecc628ceee93 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -213,7 +213,7 @@ Key procs /// Copies all languages from the supplied atom/language holder. Source should be overridden when you /// do not want the language overwritten by later atom updates or want to avoid blocked languages. -/datum/language_holder/proc/copy_languages(var/datum/language_holder/from_holder, source_override) +/datum/language_holder/proc/copy_languages(datum/language_holder/from_holder, source_override) if(source_override) //No blocked languages here, for now only used by ling absorb. for(var/language in from_holder.understood_languages) grant_language(language, TRUE, FALSE, source_override) diff --git a/code/modules/language/ratvarian.dm b/code/modules/language/ratvarian.dm index b924d2fc79df..dfd61080e859 100644 --- a/code/modules/language/ratvarian.dm +++ b/code/modules/language/ratvarian.dm @@ -10,10 +10,10 @@ spans = list(SPAN_ROBOT) icon_state = "ratvar" -/datum/language/ratvar/scramble(var/input) +/datum/language/ratvar/scramble(input) . = text2ratvar(input) /datum/language/ratvar/get_spoken_verb(msg_end) if(!msg_end) return pick(random_speech_verbs) - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index c1d040f74847..e11fa80ceebc 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -149,7 +149,7 @@ /obj/structure/bookcase/manuals/medical name = "medical manuals bookcase" -/obj/structure/bookcase/manuals/medical/Initialize() +/obj/structure/bookcase/manuals/medical/Initialize(mapload) . = ..() new /obj/item/book/manual/wiki/medical_cloning(src) update_icon() @@ -158,7 +158,7 @@ /obj/structure/bookcase/manuals/engineering name = "engineering manuals bookcase" -/obj/structure/bookcase/manuals/engineering/Initialize() +/obj/structure/bookcase/manuals/engineering/Initialize(mapload) . = ..() new /obj/item/book/manual/wiki/engineering_construction(src) new /obj/item/book/manual/wiki/engineering_hacking(src) @@ -171,7 +171,7 @@ /obj/structure/bookcase/manuals/research_and_development name = "\improper R&D manuals bookcase" -/obj/structure/bookcase/manuals/research_and_development/Initialize() +/obj/structure/bookcase/manuals/research_and_development/Initialize(mapload) . = ..() new /obj/item/book/manual/wiki/research_and_development(src) update_icon() diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 8fe1ddea80e7..df14cfc41513 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -363,7 +363,7 @@ GLOBAL_LIST_EMPTY(checkouts) pass_flags = PASSTABLE librarianconsole = TRUE -/obj/machinery/computer/libraryconsole/bookmanagement/Initialize() +/obj/machinery/computer/libraryconsole/bookmanagement/Initialize(mapload) . = ..() if(circuit) circuit.name = "Book Inventory Management Console (Machine Board)" diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm index 193e6e6ba2d3..97f9366e0732 100644 --- a/code/modules/library/random_books.dm +++ b/code/modules/library/random_books.dm @@ -1,7 +1,7 @@ /obj/item/book/manual/random icon_state = "random_book" -/obj/item/book/manual/random/Initialize() +/obj/item/book/manual/random/Initialize(mapload) ..() var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki) var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books) @@ -13,7 +13,7 @@ var/amount = 1 var/category = null -/obj/item/book/random/Initialize() +/obj/item/book/random/Initialize(mapload) ..() create_random_books(amount, src.loc, TRUE, category) return INITIALIZE_HINT_QDEL diff --git a/code/modules/lighting/lighting_area.dm b/code/modules/lighting/lighting_area.dm index 58e9a4337a55..ce3b6b70f4c9 100644 --- a/code/modules/lighting/lighting_area.dm +++ b/code/modules/lighting/lighting_area.dm @@ -2,7 +2,7 @@ luminosity = TRUE var/dynamic_lighting = DYNAMIC_LIGHTING_ENABLED -/area/proc/set_dynamic_lighting(var/new_dynamic_lighting = DYNAMIC_LIGHTING_ENABLED) +/area/proc/set_dynamic_lighting(new_dynamic_lighting = DYNAMIC_LIGHTING_ENABLED) if (new_dynamic_lighting == dynamic_lighting) return FALSE @@ -27,4 +27,4 @@ if("dynamic_lighting") set_dynamic_lighting(var_value) return TRUE - return ..() \ No newline at end of file + return ..() diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 65749bbaa8b9..55b14cb513d7 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -20,7 +20,7 @@ // The proc you should always use to set the light of this atom. // Nonesensical value for l_color default, so we can detect if it gets set to null. #define NONSENSICAL_VALUE -99999 -/atom/proc/set_light(var/l_range, var/l_power, var/l_color = NONSENSICAL_VALUE) +/atom/proc/set_light(l_range, l_power, l_color = NONSENSICAL_VALUE) if(l_range > 0 && l_range < MINIMUM_USEFUL_LIGHT_RANGE) l_range = MINIMUM_USEFUL_LIGHT_RANGE //Brings the range up to 1.4, which is just barely brighter than the soft lighting that surrounds players. if (l_power != null) @@ -73,7 +73,7 @@ // Should always be used to change the opacity of an atom. // It notifies (potentially) affected light sources so they can update (if needed). -/atom/proc/set_opacity(var/new_opacity) +/atom/proc/set_opacity(new_opacity) if (new_opacity == opacity) return diff --git a/code/modules/lighting/lighting_corner.dm b/code/modules/lighting/lighting_corner.dm index a19f2e23bc26..187c07332885 100644 --- a/code/modules/lighting/lighting_corner.dm +++ b/code/modules/lighting/lighting_corner.dm @@ -28,7 +28,7 @@ ///whether we are to be added to SSlighting's corners_queue list for an update var/needs_update = FALSE -/datum/lighting_corner/New(var/turf/new_turf, var/diagonal) +/datum/lighting_corner/New(turf/new_turf, diagonal) . = ..() save_master(new_turf, turn(diagonal, 180)) diff --git a/code/modules/lighting/lighting_source.dm b/code/modules/lighting/lighting_source.dm index 13164805fdec..5faef235d771 100644 --- a/code/modules/lighting/lighting_source.dm +++ b/code/modules/lighting/lighting_source.dm @@ -38,7 +38,7 @@ var/needs_update = LIGHTING_NO_UPDATE -/datum/light_source/New(var/atom/owner, var/atom/top) +/datum/light_source/New(atom/owner, atom/top) source_atom = owner // Set our new owner. LAZYADD(source_atom.light_sources, src) top_atom = top @@ -80,7 +80,7 @@ // This proc will cause the light source to update the top atom, and add itself to the update queue. -/datum/light_source/proc/update(var/atom/new_top_atom) +/datum/light_source/proc/update(atom/new_top_atom) // This top atom is different. if (new_top_atom && new_top_atom != top_atom) if(top_atom != source_atom && top_atom.light_sources) // Remove ourselves from the light sources of that top atom. @@ -137,7 +137,7 @@ REMOVE_CORNER(corner) LAZYREMOVE(corner.affecting, src) -/datum/light_source/proc/recalc_corner(var/datum/lighting_corner/corner) +/datum/light_source/proc/recalc_corner(datum/lighting_corner/corner) LAZYINITLIST(effect_str) if (effect_str[corner]) // Already have one. REMOVE_CORNER(corner) diff --git a/code/modules/lighting/lighting_turf.dm b/code/modules/lighting/lighting_turf.dm index a99698ff33be..406ed0ae09d0 100644 --- a/code/modules/lighting/lighting_turf.dm +++ b/code/modules/lighting/lighting_turf.dm @@ -40,7 +40,7 @@ new/datum/lighting_object(src) // Used to get a scaled lumcount. -/turf/proc/get_lumcount(var/minlum = 0, var/maxlum = 1) +/turf/proc/get_lumcount(minlum = 0, maxlum = 1) if (!lighting_object) return 1 @@ -94,7 +94,7 @@ recalc_atom_opacity() // Make sure to do this before reconsider_lights(), incase we're on instant updates. reconsider_lights() -/turf/proc/change_area(var/area/old_area, var/area/new_area) +/turf/proc/change_area(area/old_area, area/new_area) if(SSlighting.initialized) if (new_area.dynamic_lighting != old_area.dynamic_lighting) if (new_area.dynamic_lighting) diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 703f47e6f33d..4a8a2064af37 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -12,7 +12,7 @@ layer = POINT_LAYER -/obj/effect/baseturf_helper/Initialize() +/obj/effect/baseturf_helper/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD @@ -92,7 +92,7 @@ icon_state = "" var/late = FALSE -/obj/effect/mapping_helpers/Initialize() +/obj/effect/mapping_helpers/Initialize(mapload) ..() return late ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_QDEL @@ -177,7 +177,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /obj/effect/mapping_helpers/no_lava icon_state = "no_lava" -/obj/effect/mapping_helpers/no_lava/Initialize() +/obj/effect/mapping_helpers/no_lava/Initialize(mapload) . = ..() var/turf/T = get_turf(src) T.flags_1 |= NO_LAVA_GEN_1 @@ -255,7 +255,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) late = FALSE icon_state = "teleport_anchor" -/obj/effect/mapping_helpers/teleport_anchor/Initialize() //add the tile it is on to areas prefered teleportaiton list +/obj/effect/mapping_helpers/teleport_anchor/Initialize(mapload) //add the tile it is on to areas prefered teleportaiton list . = ..() var/area/a = get_area(loc) a.teleport_anchors += loc @@ -266,7 +266,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) /// List of traits to add to this. var/list/traits_to_add = list() -/obj/effect/mapping_helpers/ztrait_injector/Initialize() +/obj/effect/mapping_helpers/ztrait_injector/Initialize(mapload) . = ..() var/datum/space_level/level = SSmapping.z_list[z] if(!level || !length(traits_to_add)) diff --git a/code/modules/mapping/minimap.dm b/code/modules/mapping/minimap.dm index 6b7293ade551..084a8b3697cd 100644 --- a/code/modules/mapping/minimap.dm +++ b/code/modules/mapping/minimap.dm @@ -102,7 +102,7 @@ name = "station map" desc = "A handy map showing the locations of all the departments on the station so you don't get lost" -/obj/item/map/station/Initialize() +/obj/item/map/station/Initialize(mapload) ..() minimaps += SSmapping.station_minimaps update_icon() diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index de06cbb79ed5..13adbf0f75c5 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -11,7 +11,7 @@ var/codelen = 4 tamperproof = 90 -/obj/structure/closet/crate/secure/loot/Initialize() +/obj/structure/closet/crate/secure/loot/Initialize(mapload) . = ..() var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0") code = "" diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 53df484842e2..164b6116a921 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -43,7 +43,7 @@ /// Calibration of the probe var/calibration = 1 -/obj/machinery/computer/auxiliary_base/Initialize() +/obj/machinery/computer/auxiliary_base/Initialize(mapload) . = ..() radio = new /obj/item/radio(src) radio.frequency = radio_freq diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index efb92142f8e4..a30e1c68ade9 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -7,12 +7,12 @@ var/area/starting_area invisibility = 0 //Not invisible -/mob/camera/aiEye/remote/base_construction/Initialize() +/mob/camera/aiEye/remote/base_construction/Initialize(mapload) . = ..() starting_area = get_area(loc) - icon_state = "construction_drone" // Overrides /mob/camera/aiEye/Initialize() in \modules\mob\living\silicon\ai\freelook\eye + icon_state = "construction_drone" // Overrides /mob/camera/aiEye/Initialize(mapload) in \modules\mob\living\silicon\ai\freelook\eye -/mob/camera/aiEye/remote/base_construction/setLoc(var/t) +/mob/camera/aiEye/remote/base_construction/setLoc(t) var/area/curr_area = get_area(t) if(curr_area == starting_area || istype(curr_area, /area/shuttle/auxiliary_base)) return ..() @@ -51,7 +51,7 @@ light_color = LIGHT_COLOR_PINK -/obj/machinery/computer/camera_advanced/base_construction/Initialize() +/obj/machinery/computer/camera_advanced/base_construction/Initialize(mapload) . = ..() RCD = new(src) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 95e51c784a7a..aa1adf0be3d4 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -48,11 +48,11 @@ H.update_hair() H.update_body() -/obj/item/clothing/suit/hooded/explorer/Initialize() +/obj/item/clothing/suit/hooded/explorer/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) -/obj/item/clothing/head/hooded/explorer/Initialize() +/obj/item/clothing/head/hooded/explorer/Initialize(mapload) . = ..() AddComponent(/datum/component/armor_plate) @@ -76,7 +76,7 @@ ..() w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL -/obj/item/clothing/mask/gas/explorer/folded/Initialize() +/obj/item/clothing/mask/gas/explorer/folded/Initialize(mapload) . = ..() adjustmask() @@ -92,7 +92,7 @@ armor = list(MELEE = 75, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 75, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/organ/regenerative_core/legion, /obj/item/kitchen/knife/combat) -/obj/item/clothing/suit/space/hostile_environment/Initialize() +/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload) . = ..() AddComponent(/datum/component/spraycan_paintable) START_PROCESSING(SSobj, src) @@ -121,7 +121,7 @@ armor = list(MELEE = 75, BULLET = 10, LASER = 10, ENERGY =10, BOMB = 75, BIO = 100, RAD = 60, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | LAVA_PROOF -/obj/item/clothing/head/helmet/space/hostile_environment/Initialize() +/obj/item/clothing/head/helmet/space/hostile_environment/Initialize(mapload) . = ..() AddComponent(/datum/component/spraycan_paintable) update_icon() diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 8ce5c4f88b81..fad185b85682 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -32,7 +32,7 @@ icon_state = "mining_hammer[wielded]" return -/obj/item/twohanded/kinetic_crusher/Initialize() +/obj/item/twohanded/kinetic_crusher/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 1af12253873b..69ac8135bf1c 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -43,7 +43,7 @@ var/current_cooldown = 0 var/range = 7 -/obj/item/t_scanner/adv_mining_scanner/cyborg/Initialize() +/obj/item/t_scanner/adv_mining_scanner/cyborg/Initialize(mapload) . = ..() toggle_on() @@ -88,7 +88,7 @@ pixel_x = -224 pixel_y = -224 -/obj/effect/temp_visual/mining_overlay/Initialize() +/obj/effect/temp_visual/mining_overlay/Initialize(mapload) . = ..() animate(src, alpha = 0, time = duration, easing = EASE_IN) diff --git a/code/modules/mining/equipment/mining_charges.dm b/code/modules/mining/equipment/mining_charges.dm index bbe6fda05187..9134c61d4717 100644 --- a/code/modules/mining/equipment/mining_charges.dm +++ b/code/modules/mining/equipment/mining_charges.dm @@ -8,7 +8,7 @@ alert_admins = FALSE var/hacked = FALSE -/obj/item/grenade/plastic/miningcharge/Initialize() +/obj/item/grenade/plastic/miningcharge/Initialize(mapload) . = ..() plastic_overlay = mutable_appearance(icon, "[icon_state]_active", ON_EDGED_TURF_LAYER) diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm index 919e3e49cbd1..4ab94737a7e1 100644 --- a/code/modules/mining/equipment/mining_tools.dm +++ b/code/modules/mining/equipment/mining_tools.dm @@ -75,7 +75,7 @@ desc = "An integrated electric mining drill." flags_1 = NONE -/obj/item/pickaxe/drill/cyborg/Initialize() +/obj/item/pickaxe/drill/cyborg/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT) @@ -132,7 +132,7 @@ attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked") sharpness = SHARP_EDGED -/obj/item/shovel/Initialize() +/obj/item/shovel/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely. diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm index b5e179ce4912..2a5a7e004690 100644 --- a/code/modules/mining/equipment/regenerative_core.dm +++ b/code/modules/mining/equipment/regenerative_core.dm @@ -30,7 +30,7 @@ var/inert = 0 var/preserved = 0 -/obj/item/organ/regenerative_core/Initialize() +/obj/item/organ/regenerative_core/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(inert_check)), 2400) @@ -132,7 +132,7 @@ desc = "A strange rock that crackles with power. It can be used to heal quickly, but it will rapidly decay into uselessness. Radiation found in active space installments will slow its healing effects." icon_state = "legion_soul" -/obj/item/organ/regenerative_core/legion/Initialize() +/obj/item/organ/regenerative_core/legion/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index dac460ed9ee8..2e4f39e8f4a7 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -112,7 +112,7 @@ layer = ABOVE_ALL_MOB_LAYER duration = 0.4 SECONDS -/obj/effect/temp_visual/resonance_crush/Initialize() +/obj/effect/temp_visual/resonance_crush/Initialize(mapload) . = ..() transform = matrix()*1.5 animate(src, transform = matrix()*0.1, alpha = 50, time = 0.4 SECONDS) diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index e4f7f6056887..8baa359fe742 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -321,7 +321,7 @@ /obj/item/nuke_core, /obj/item/bikehorn) -/obj/item/fakeartefact/Initialize() +/obj/item/fakeartefact/Initialize(mapload) . = ..() var/obj/item/I = pick(possible) name = initial(I.name) diff --git a/code/modules/mining/equipment/upgrades.dm b/code/modules/mining/equipment/upgrades.dm index 03b1c92ad4e8..d990070d4beb 100644 --- a/code/modules/mining/equipment/upgrades.dm +++ b/code/modules/mining/equipment/upgrades.dm @@ -14,7 +14,7 @@ w_class = WEIGHT_CLASS_NORMAL var/inert = FALSE -/obj/item/magmite_parts/Initialize() +/obj/item/magmite_parts/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(go_inert)), 10 MINUTES) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index 11a91f89f3f2..0340a2dd7db2 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -167,7 +167,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) density = FALSE var/beacon_network = "station" -/obj/structure/extraction_point/Initialize() +/obj/structure/extraction_point/Initialize(mapload) . = ..() name += " ([rand(100,999)]) ([get_area_name(src, TRUE)])" GLOB.total_extraction_beacons += src diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index a237ac07db67..5537815845e8 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -16,7 +16,7 @@ GLOBAL_LIST(labor_sheet_values) /// Needed to send messages to sec radio var/obj/item/radio/Radio -/obj/machinery/mineral/labor_claim_console/Initialize() +/obj/machinery/mineral/labor_claim_console/Initialize(mapload) . = ..() Radio = new/obj/item/radio(src) Radio.listening = FALSE diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 30b37f99f25d..cf6f2513c237 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -23,7 +23,7 @@ var/regrowth_time_low = 8 MINUTES var/regrowth_time_high = 16 MINUTES -/obj/structure/flora/ash/Initialize() +/obj/structure/flora/ash/Initialize(mapload) . = ..() base_icon = "[icon_state][rand(1, 4)]" icon_state = base_icon @@ -160,7 +160,7 @@ seed = /obj/item/seeds/lavaland/polypore distill_reagent = /datum/reagent/consumable/ethanol/polyporepop -/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize() +/obj/item/reagent_containers/food/snacks/grown/ash_flora/Initialize(mapload) . = ..() pixel_x = rand(-4, 4) pixel_y = rand(-4, 4) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index e95f33384076..f9c695e2e838 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(aide_list) icon_state = "datadisk1" var/modkit_design = /datum/design/unique_modkit -/obj/item/disk/design_disk/modkit_disc/Initialize() +/obj/item/disk/design_disk/modkit_disc/Initialize(mapload) . = ..() blueprints[1] = new modkit_design @@ -277,7 +277,7 @@ GLOBAL_LIST_EMPTY(aide_list) wisp.forceMove(src) SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned") -/obj/item/wisp_lantern/Initialize() +/obj/item/wisp_lantern/Initialize(mapload) . = ..() wisp = new(src) @@ -381,7 +381,7 @@ GLOBAL_LIST_EMPTY(aide_list) icon_state = "red_cube" teleport_color = "#FD3F48" -/obj/item/warp_cube/red/Initialize() +/obj/item/warp_cube/red/Initialize(mapload) . = ..() if(!linked) var/obj/item/warp_cube/blue = new(src.loc) @@ -460,7 +460,7 @@ GLOBAL_LIST_EMPTY(aide_list) actions_types = list(/datum/action/item_action/immortality) var/cooldown = 0 -/obj/item/immortality_talisman/Initialize() +/obj/item/immortality_talisman/Initialize(mapload) . = ..() AddComponent(/datum/component/anti_magic, TRUE, TRUE, TRUE) @@ -544,7 +544,7 @@ GLOBAL_LIST_EMPTY(aide_list) name = "paradox bag" desc = "Somehow, it's in two places at once." -/obj/item/shared_storage/red/Initialize() +/obj/item/shared_storage/red/Initialize(mapload) . = ..() var/datum/component/storage/STR = AddComponent(/datum/component/storage/concrete) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -975,7 +975,7 @@ GLOBAL_LIST_EMPTY(aide_list) var/summon_cooldown = 0 var/list/mob/dead/observer/spirits -/obj/item/melee/ghost_sword/Initialize() +/obj/item/melee/ghost_sword/Initialize(mapload) . = ..() spirits = list() START_PROCESSING(SSobj, src) diff --git a/code/modules/mining/lavaland/seismicarm.dm b/code/modules/mining/lavaland/seismicarm.dm index ec1c08d457ff..f71d608c5a99 100644 --- a/code/modules/mining/lavaland/seismicarm.dm +++ b/code/modules/mining/lavaland/seismicarm.dm @@ -296,7 +296,7 @@ S.forceMove(T) S.SpinAnimation(0.2 SECONDS, 1) -/obj/item/melee/touch_attack/overcharged_emitter/Initialize() +/obj/item/melee/touch_attack/overcharged_emitter/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) animate(src, alpha = 50, time = 5 SECONDS) diff --git a/code/modules/mining/lavaland/world_anvil.dm b/code/modules/mining/lavaland/world_anvil.dm index 76b08f2ca73a..acf746ba7888 100644 --- a/code/modules/mining/lavaland/world_anvil.dm +++ b/code/modules/mining/lavaland/world_anvil.dm @@ -19,7 +19,7 @@ desc = "An ancient anvil rests at this location." invisibility = 100 -/obj/structure/world_anvil/Initialize() +/obj/structure/world_anvil/Initialize(mapload) . = ..() internal = new /obj/item/gps/internal/world_anvil(src) diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 40bdf71e0fcd..a1694474e173 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -23,7 +23,7 @@ var/machinedir = EAST speed_process = TRUE -/obj/machinery/mineral/processing_unit_console/Initialize() +/obj/machinery/mineral/processing_unit_console/Initialize(mapload) . = ..() machine = locate(/obj/machinery/mineral/processing_unit, get_step(src, machinedir)) if (machine) @@ -83,7 +83,7 @@ var/selected_alloy = null var/datum/techweb/stored_research -/obj/machinery/mineral/processing_unit/Initialize() +/obj/machinery/mineral/processing_unit/Initialize(mapload) . = ..() proximity_monitor = new(src, 1) AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/glass, /datum/material/silver, /datum/material/gold, /datum/material/diamond, /datum/material/plasma, /datum/material/uranium, /datum/material/bananium, /datum/material/titanium, /datum/material/bluespace, /datum/material/dilithium),INFINITY, TRUE, /obj/item/stack) //Yogs: added dilithium diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 20897fa7dab2..cc6dd457f79c 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -10,7 +10,7 @@ var/obj/machinery/mineral/stacking_machine/machine var/machinedir = SOUTHEAST -/obj/machinery/mineral/stacking_unit_console/Initialize() +/obj/machinery/mineral/stacking_unit_console/Initialize(mapload) . = ..() machine = locate(/obj/machinery/mineral/stacking_machine, get_step(src, machinedir)) if (machine) diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index fcd4fe2dc71f..4727e1a51b3b 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -96,7 +96,7 @@ cost = pcost category = cat -/obj/machinery/mineral/equipment_vendor/Initialize() +/obj/machinery/mineral/equipment_vendor/Initialize(mapload) . = ..() build_inventory() @@ -260,7 +260,7 @@ name = "golem ship equipment vendor" circuit = /obj/item/circuitboard/machine/mining_equipment_vendor/golem -/obj/machinery/mineral/equipment_vendor/golem/Initialize() +/obj/machinery/mineral/equipment_vendor/golem/Initialize(mapload) desc += "\nIt seems a few selections have been added." prize_list += list( new /datum/data/mining_equipment("Brute Pill Bottle", /obj/item/storage/pill_bottle/libi, 600, VENDING_MEDS), diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 6d66da9e199c..5ec5b905fb62 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -8,7 +8,7 @@ var/set_luminosity = 8 var/set_cap = 0 -/obj/effect/light_emitter/Initialize() +/obj/effect/light_emitter/Initialize(mapload) . = ..() set_light(set_luminosity, set_cap) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 1c2374ab6c39..e5c97ba85184 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -43,7 +43,7 @@ var/mode = MINEDRONE_COLLECT var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_gun -/mob/living/simple_animal/hostile/mining_drone/Initialize() +/mob/living/simple_animal/hostile/mining_drone/Initialize(mapload) . = ..() stored_gun = new(src) var/datum/action/innate/minedrone/toggle_light/toggle_light_action = new() diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 3f75fe5e85ec..917a36585b4f 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -13,7 +13,7 @@ speed_process = TRUE -/obj/machinery/mineral/mint/Initialize() +/obj/machinery/mineral/mint/Initialize(mapload) . = ..() AddComponent(/datum/component/material_container, list(/datum/material/iron, /datum/material/plasma, /datum/material/silver, /datum/material/gold, /datum/material/uranium, /datum/material/diamond, /datum/material/bananium), MINERAL_MATERIAL_AMOUNT * 50, FALSE, /obj/item/stack) chosen = getmaterialref(chosen) diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm index 56fddac6bd0b..5ac5820a741d 100644 --- a/code/modules/mining/money_bag.dm +++ b/code/modules/mining/money_bag.dm @@ -9,7 +9,7 @@ max_integrity = 100 w_class = WEIGHT_CLASS_BULKY -/obj/item/storage/bag/money/Initialize() +/obj/item/storage/bag/money/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index a950925c99f6..f3cd67f402b5 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ explosion(src,0,1,3,adminlog = notify_admins) qdel(src) -/obj/item/stack/ore/Initialize() +/obj/item/stack/ore/Initialize(mapload) . = ..() pixel_x = rand(0,16)-8 pixel_y = rand(0,8)-8 @@ -378,7 +378,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ else user.visible_message(span_suicide("\the [src] lands on [coinflip]! [user] keeps on living!")) -/obj/item/coin/Initialize() +/obj/item/coin/Initialize(mapload) . = ..() pixel_x = rand(0,16)-8 pixel_y = rand(0,8)-8 @@ -609,7 +609,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ w_class = WEIGHT_CLASS_NORMAL var/list/obj/item/coin/coins //a stack of coins -/obj/item/coinstack/Initialize() +/obj/item/coinstack/Initialize(mapload) . = ..() coins = list() update_icon() diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index 55bcabeb36d1..47a31d258b0d 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -7,7 +7,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) move_resist = INFINITY throwforce = 0 -/mob/dead/Initialize() +/mob/dead/Initialize(mapload) SHOULD_CALL_PARENT(FALSE) if(flags_1 & INITIALIZED_1) stack_trace("Warning: [src]([type]) initialized multiple times!") diff --git a/code/modules/mob/dead/new_player/latejoin_menu.dm b/code/modules/mob/dead/new_player/latejoin_menu.dm index 8d942601ec20..80dd13b9359a 100644 --- a/code/modules/mob/dead/new_player/latejoin_menu.dm +++ b/code/modules/mob/dead/new_player/latejoin_menu.dm @@ -159,7 +159,7 @@ GLOBAL_DATUM_INIT(latejoin_menu, /datum/latejoin_menu, new) return TRUE -/datum/latejoin_menu/proc/check_latejoin_eligibility(mob/dead/new_player/owner, var/use_chat = FALSE) +/datum/latejoin_menu/proc/check_latejoin_eligibility(mob/dead/new_player/owner, use_chat = FALSE) if(!SSticker?.IsRoundInProgress()) if (use_chat) to_chat(owner, span_notice("The round is either not ready, or has already finished...")) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 1d2f88d44a39..921a14d821a7 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -19,7 +19,7 @@ /// Used to track if the player's jobs menu sent a message saying it successfully mounted. var/jobs_menu_mounted = FALSE -/mob/dead/new_player/Initialize() +/mob/dead/new_player/Initialize(mapload) if(client && SSticker.state == GAME_STATE_STARTUP) var/atom/movable/screen/splash/S = new(client, TRUE, TRUE) S.Fade(TRUE) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 6a2fa748730e..d384b82ea898 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -16,7 +16,7 @@ from doing this unless you absolutely know what you are doing, and have defined a conversion in savefile.dm */ -/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female,var/roundstart = FALSE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked +/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female, roundstart = FALSE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked if(!istype(L)) L = list() if(!istype(male)) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 9435c4e2f140..640270573be5 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -66,7 +66,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) // Current Viewrange var/view = 0 -/mob/dead/observer/Initialize() +/mob/dead/observer/Initialize(mapload) set_invisibility(GLOB.observer_default_invisibility) add_verb(src, list( @@ -389,7 +389,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp to_chat(src, "You can no longer be brought back into your body.") return TRUE -/mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source, flashwindow = TRUE) +/mob/dead/observer/proc/notify_cloning(message, sound, atom/source, flashwindow = TRUE) if(flashwindow) window_flash(client) if(message) diff --git a/code/modules/mob/dead/observer/say.dm b/code/modules/mob/dead/observer/say.dm index 0e3dc94844e8..f870a32f463f 100644 --- a/code/modules/mob/dead/observer/say.dm +++ b/code/modules/mob/dead/observer/say.dm @@ -11,7 +11,7 @@ mods[RADIO_EXTENSION] = GLOB.department_radio_keys[mods[RADIO_KEY]] return message -/mob/dead/observer/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/dead/observer/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) message = trim(copytext_char(sanitize(message), 1, MAX_MESSAGE_LEN)) if (!message) return diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index 27b646b0c990..57ed3dd01f24 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -39,7 +39,7 @@ else add_overlay("mmi_dead") -/obj/item/mmi/Initialize() +/obj/item/mmi/Initialize(mapload) . = ..() radio = new(src) //Spawns a radio inside the MMI. radio.broadcasting = FALSE //researching radio mmis turned the robofabs into radios because this didnt start as 0. @@ -267,7 +267,7 @@ override_cyborg_laws = TRUE can_update_laws = FALSE -/obj/item/mmi/syndie/Initialize() +/obj/item/mmi/syndie/Initialize(mapload) . = ..() laws = new /datum/ai_laws/syndicate_override() radio.on = FALSE diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm index e05e1c7fac84..81ada574d608 100644 --- a/code/modules/mob/living/brain/brain.dm +++ b/code/modules/mob/living/brain/brain.dm @@ -8,7 +8,7 @@ possible_a_intents = list(INTENT_HELP, INTENT_HARM) //for mechas speech_span = SPAN_ROBOT -/mob/living/brain/Initialize() +/mob/living/brain/Initialize(mapload) . = ..() create_dna(src) stored_dna.initialize_dna(random_blood_type()) @@ -109,7 +109,7 @@ if(container) . += "[container.type]" -/mob/living/brain/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/brain/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(container && container.rebooting) to_chat(src, span_danger("Speech synthesizers still offine, wait for the reboot process to complete")) return diff --git a/code/modules/mob/living/brain/posibrain.dm b/code/modules/mob/living/brain/posibrain.dm index e7f48ee9991e..ed460f5fab91 100644 --- a/code/modules/mob/living/brain/posibrain.dm +++ b/code/modules/mob/living/brain/posibrain.dm @@ -171,7 +171,7 @@ GLOBAL_VAR(posibrain_notify_cooldown) else . += "[dead_message]" -/obj/item/mmi/posibrain/Initialize() +/obj/item/mmi/posibrain/Initialize(mapload) . = ..() var/area/A = get_area(src) brainmob = new(src) diff --git a/code/modules/mob/living/brain/say.dm b/code/modules/mob/living/brain/say.dm index ea2fa7aa2f84..e4694b6184fe 100644 --- a/code/modules/mob/living/brain/say.dm +++ b/code/modules/mob/living/brain/say.dm @@ -1,4 +1,4 @@ -/mob/living/brain/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/brain/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(!istype(container, /obj/item/mmi) && !istype(loc, /obj/item/reagent_containers/food/snacks/egg)) return //No MMI, and no EGG RP, can't speak, bucko./N else diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index e4d9c172a5af..995728c0f2ad 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -26,7 +26,7 @@ var/static/regex/alien_name_regex = new("alien (larva|sentinel|drone|hunter|praetorian|queen)( \\(\\d+\\))?") blood_volume = BLOOD_VOLUME_XENO //Yogs -- Makes monkeys/xenos have different amounts of blood from normal carbonbois -/mob/living/carbon/alien/Initialize() +/mob/living/carbon/alien/Initialize(mapload) add_verb(src, /mob/living/proc/mob_sleep) add_verb(src, /mob/living/proc/lay_down) 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 4b41954658af..428439fae794 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm @@ -5,7 +5,7 @@ health = 125 icon_state = "aliend" -/mob/living/carbon/alien/humanoid/drone/Initialize() +/mob/living/carbon/alien/humanoid/drone/Initialize(mapload) var/datum/action/cooldown/alien/evolve_to_praetorian/evolution = new(src) evolution.Grant(src) return ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm index 93bef965b91e..b2b2fa1ffabc 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/praetorian.dm @@ -5,7 +5,7 @@ health = 300 icon_state = "alienp" -/mob/living/carbon/alien/humanoid/royal/praetorian/Initialize() +/mob/living/carbon/alien/humanoid/royal/praetorian/Initialize(mapload) real_name = name var/datum/action/cooldown/spell/aoe/repulse/xeno/tail_whip = new(src) 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 9a5b3e0ec149..ae8aad8971c7 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm @@ -5,7 +5,7 @@ health = 150 icon_state = "aliens" -/mob/living/carbon/alien/humanoid/sentinel/Initialize() +/mob/living/carbon/alien/humanoid/sentinel/Initialize(mapload) var/datum/action/cooldown/alien/sneak/sneaky_beaky = new(src) sneaky_beaky.Grant(src) return ..() diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 19b239f15cc0..25777afd2a95 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -102,7 +102,7 @@ ..() //For alien evolution/promotion/queen finder procs. Checks for an active alien of that type -/proc/get_alien_type(var/alienpath) +/proc/get_alien_type(alienpath) for(var/mob/living/carbon/alien/humanoid/A in GLOB.alive_mob_list) if(!istype(A, alienpath)) continue diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index b1cff181442a..4ccdde632602 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -24,7 +24,7 @@ icon_state = "alienq" var/datum/timedevent/time_to_shuttle -/mob/living/carbon/alien/humanoid/royal/queen/Initialize() +/mob/living/carbon/alien/humanoid/royal/queen/Initialize(mapload) if(!is_centcom_level(get_turf(src))) SSshuttle.registerHostileEnvironment(src) //yogs: aliens delay shuttle time_to_shuttle = addtimer(CALLBACK(src, PROC_REF(game_end)), 30 MINUTES, TIMER_STOPPABLE) //yogs: time until shuttle is freed/called diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 75db59ce56fc..051ca6303c80 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -19,7 +19,7 @@ //This is fine right now, if we're adding organ specific damage this needs to be updated -/mob/living/carbon/alien/larva/Initialize() +/mob/living/carbon/alien/larva/Initialize(mapload) var/datum/action/cooldown/alien/larva_evolve/evolution = new(src) evolution.Grant(src) 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 bc5ca285c955..e1d3ef3058f6 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -11,7 +11,7 @@ /// How long does it take to advance one stage? Growth time * 5 = how long till we make a Larva! var/growth_time = 60 SECONDS -/obj/item/organ/body_egg/alien_embryo/Initialize() +/obj/item/organ/body_egg/alien_embryo/Initialize(mapload) . = ..() advance_embryo_stage() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index b26069b08c47..340f9918a803 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -1,7 +1,7 @@ /mob/living/carbon blood_volume = BLOOD_VOLUME_GENERIC -/mob/living/carbon/Initialize() +/mob/living/carbon/Initialize(mapload) . = ..() create_reagents(1000) assign_bodypart_ownership() @@ -1008,7 +1008,7 @@ I.extinguish() //extinguishes our clothes ..() -/mob/living/carbon/fakefire(var/fire_icon = "Generic_mob_burning") +/mob/living/carbon/fakefire(fire_icon = "Generic_mob_burning") var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/OnFire.dmi', fire_icon, -FIRE_LAYER) new_fire_overlay.appearance_flags = RESET_COLOR overlays_standing[FIRE_LAYER] = new_fire_overlay diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 3c4dd8abccb8..646cc121d617 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -5,7 +5,7 @@ icon_state = "human_basic" appearance_flags = KEEP_TOGETHER|TILE_BOUND|PIXEL_SCALE|LONG_GLIDE -/mob/living/carbon/human/Initialize() +/mob/living/carbon/human/Initialize(mapload) add_verb(src, /mob/living/proc/mob_sleep) add_verb(src, /mob/living/proc/lay_down) @@ -1098,12 +1098,12 @@ return hulk_health_check(oldhealth) -/mob/living/carbon/human/adjust_nutrition(var/change) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks +/mob/living/carbon/human/adjust_nutrition(change) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks if(HAS_TRAIT(src, TRAIT_NOHUNGER)) return FALSE return ..() -/mob/living/carbon/human/set_nutrition(var/change) //Seriously fuck you oldcoders. +/mob/living/carbon/human/set_nutrition(change) //Seriously fuck you oldcoders. if(HAS_TRAIT(src, TRAIT_NOHUNGER)) return FALSE return ..() @@ -1131,7 +1131,7 @@ /mob/living/carbon/human/species var/race = null -/mob/living/carbon/human/species/Initialize() +/mob/living/carbon/human/species/Initialize(mapload) . = ..() set_species(race) @@ -1290,7 +1290,7 @@ /mob/living/carbon/human/species/ipc/empty //used for "cloning" ipcs -/mob/living/carbon/human/species/ipc/empty/Initialize() +/mob/living/carbon/human/species/ipc/empty/Initialize(mapload) . = ..() deathsound = null //make it a silent death death() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 23ad8c6561b0..c576f2fdebff 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -124,7 +124,7 @@ return 1 return 0 -/mob/living/carbon/human/proc/check_shields(atom/AM, var/damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0) +/mob/living/carbon/human/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0) var/block_chance_modifier = round(damage / -3) for(var/obj/item/I in held_items) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index 35e39b145243..94be5b849179 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -1044,7 +1044,7 @@ to_chat(H, span_notice("You create a new cardboard golem shell.")) create_brother(H.loc) -/datum/species/golem/cardboard/proc/create_brother(var/location) +/datum/species/golem/cardboard/proc/create_brother(location) new /obj/effect/mob_spawn/human/golem/servant(location, /datum/species/golem/cardboard, owner) last_creation = world.time diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index db684fc5d290..b5ec23277559 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -492,7 +492,7 @@ light_system = MOVABLE_LIGHT light_power = 2.5 -/obj/effect/dummy/luminescent_glow/Initialize() +/obj/effect/dummy/luminescent_glow/Initialize(mapload) . = ..() if(!isliving(loc)) return INITIALIZE_HINT_QDEL diff --git a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm index 3b23b68fa2cf..c5fdec856f51 100644 --- a/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/shadowpeople.dm @@ -225,7 +225,7 @@ bare_wound_bonus = 20 resistance_flags = ACID_PROOF -/obj/item/light_eater/Initialize() +/obj/item/light_eater/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, HAND_REPLACEMENT_TRAIT) AddComponent(/datum/component/butchering, 80, 70) diff --git a/code/modules/mob/living/carbon/human/species_types/snail.dm b/code/modules/mob/living/carbon/human/species_types/snail.dm index eb87a23d485e..2ae3e3999e6c 100644 --- a/code/modules/mob/living/carbon/human/species_types/snail.dm +++ b/code/modules/mob/living/carbon/human/species_types/snail.dm @@ -59,7 +59,7 @@ max_integrity = 200 resistance_flags = FIRE_PROOF | ACID_PROOF -/obj/item/storage/backpack/snail/Initialize() +/obj/item/storage/backpack/snail/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) diff --git a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm index 7d6a52bd115a..4cfe2d44b62d 100644 --- a/code/modules/mob/living/carbon/monkey/combat.dm +++ b/code/modules/mob/living/carbon/monkey/combat.dm @@ -100,7 +100,7 @@ blacklistItems[I] ++ return FALSE -/mob/living/carbon/monkey/proc/pickup_and_wear(var/obj/item/clothing/C) +/mob/living/carbon/monkey/proc/pickup_and_wear(obj/item/clothing/C) if(!equip_to_appropriate_slot(C)) monkeyDrop(get_item_by_slot(C)) // remove the existing item if worn sleep(0.5 SECONDS) @@ -117,7 +117,7 @@ last_special = world.time + CLICK_CD_BREAKOUT cuff_resist(I) -/mob/living/carbon/monkey/proc/should_target(var/mob/living/L) +/mob/living/carbon/monkey/proc/should_target(mob/living/L) if(HAS_TRAIT(src, TRAIT_PACIFISM)) return FALSE @@ -417,11 +417,11 @@ var/mob/living/carbon/monkey/M = AM if(!istype(M) || !M) return - knockOver(M) + knock_over(M) return ..() -/mob/living/carbon/monkey/proc/monkeyDrop(var/obj/item/A) +/mob/living/carbon/monkey/proc/monkeyDrop(obj/item/A) if(A) dropItemToGround(A, TRUE) update_icons() diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 81dcb6862ffb..65c28b5e9f9c 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -158,7 +158,7 @@ /mob/living/carbon/monkey/angry aggressive = TRUE -/mob/living/carbon/monkey/angry/Initialize() +/mob/living/carbon/monkey/angry/Initialize(mapload) . = ..() if(prob(10)) var/obj/item/clothing/head/helmet/justice/escape/helmet = new(src) diff --git a/code/modules/mob/living/carbon/monkey/punpun.dm b/code/modules/mob/living/carbon/monkey/punpun.dm index 64328e31fc74..215ab7415615 100644 --- a/code/modules/mob/living/carbon/monkey/punpun.dm +++ b/code/modules/mob/living/carbon/monkey/punpun.dm @@ -9,7 +9,7 @@ var/list/pet_monkey_names = list("Pun Pun", "Bubbles", "Mojo", "George", "Darwin", "Aldo", "Caeser", "Kanzi", "Kong", "Terk", "Grodd", "Mala", "Bojangles", "Coco", "Able", "Baker", "Scatter", "Norbit", "Travis") var/list/rare_pet_monkey_names = list("Professor Bobo", "Deempisi's Revenge", "Furious George", "King Louie", "Dr. Zaius", "Jimmy Rustles", "Dinner", "Lanky") -/mob/living/carbon/monkey/punpun/Initialize() +/mob/living/carbon/monkey/punpun/Initialize(mapload) Read_Memory() if(ancestor_name) name = ancestor_name diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 3896190cf08b..7d51955714f9 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -83,7 +83,7 @@ apply_overlay(HANDS_LAYER) -/mob/living/carbon/update_fire(var/fire_icon = "Generic_mob_burning") +/mob/living/carbon/update_fire(fire_icon = "Generic_mob_burning") remove_overlay(FIRE_LAYER) if(on_fire || islava(loc)) var/mutable_appearance/new_fire_overlay = mutable_appearance('icons/mob/OnFire.dmi', fire_icon, -FIRE_LAYER) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 8329f44cef14..9495468a8bb0 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -1194,7 +1194,7 @@ //Mobs on Fire end // used by secbot and monkeys Crossed -/mob/living/proc/knockOver(var/mob/living/carbon/C) +/mob/living/proc/knock_over(mob/living/carbon/C) if(C.key) //save us from monkey hordes C.visible_message("[pick( \ "[C] dives out of [src]'s way!", \ diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 6d65b2a9cf78..ca610ff17f0f 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -93,7 +93,7 @@ GLOBAL_LIST_INIT(special_radio_keys, list( return new_msg -/mob/living/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/say(message, bubble_type,list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) var/static/list/crit_allowed_modes = list(WHISPER_MODE = TRUE, MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) var/static/list/unconscious_allowed_modes = list(MODE_CHANGELING = TRUE, MODE_ALIEN = TRUE) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index a022db670b21..b41b16d05d35 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -1056,7 +1056,7 @@ to_chat(src, "Hack complete. \The [apc] is now under your exclusive control.") apc.update_icon() -/mob/living/silicon/ai/verb/deploy_to_shell(var/mob/living/silicon/robot/target) +/mob/living/silicon/ai/verb/deploy_to_shell(mob/living/silicon/robot/target) set category = "AI Commands" set name = "Deploy to Shell" diff --git a/code/modules/mob/living/silicon/ai/decentralized/ai_core_display.dm b/code/modules/mob/living/silicon/ai/decentralized/ai_core_display.dm index d8913bc55830..f80b05bbfed1 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/ai_core_display.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/ai_core_display.dm @@ -13,7 +13,7 @@ var/mode = SD_BLANK var/emotion = "Neutral" -/obj/machinery/status_display/ai_core/Initialize() +/obj/machinery/status_display/ai_core/Initialize(mapload) . = ..() GLOB.ai_core_displays.Add(src) diff --git a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm index 36b861050cc2..ebf7da491931 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/ai_data_core.dm @@ -35,7 +35,7 @@ GLOBAL_VAR_INIT(primary_data_core, null) var/obj/item/stock_parts/cell/integrated_battery -/obj/machinery/ai/data_core/Initialize() +/obj/machinery/ai/data_core/Initialize(mapload) . = ..() GLOB.data_cores += src if(primary && !GLOB.primary_data_core) diff --git a/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm b/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm index 6f4a1b779cab..406632bf187a 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/server_cabinet.dm @@ -172,7 +172,7 @@ GLOBAL_LIST_EMPTY(server_cabinets) . += span_notice("Use a crowbar to remove all currently inserted racks.") -/obj/machinery/ai/server_cabinet/prefilled/Initialize() +/obj/machinery/ai/server_cabinet/prefilled/Initialize(mapload) var/obj/item/server_rack/roundstart/rack = new(src) total_cpu += rack.get_cpu() total_ram += rack.get_ram() diff --git a/code/modules/mob/living/silicon/ai/decentralized/systech/cpu.dm b/code/modules/mob/living/silicon/ai/decentralized/systech/cpu.dm index e8e2a9b165e2..b23d6f3ca907 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/systech/cpu.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/systech/cpu.dm @@ -34,7 +34,7 @@ -/obj/item/ai_cpu/Initialize() +/obj/item/ai_cpu/Initialize(mapload) growth_scale = rand(minimum_growth * 100, maximum_growth * 100) / 100 max_power_multiplier = (rand(minimum_max_power * 100, maximum_max_power * 100) / 100) * power_multiplier diff --git a/code/modules/mob/living/silicon/ai/decentralized/systech/rack.dm b/code/modules/mob/living/silicon/ai/decentralized/systech/rack.dm index a05476826ffb..eff8cde35ca6 100644 --- a/code/modules/mob/living/silicon/ai/decentralized/systech/rack.dm +++ b/code/modules/mob/living/silicon/ai/decentralized/systech/rack.dm @@ -44,7 +44,7 @@ usage += contained_ram * AI_RAM_POWER_USAGE return usage -/obj/item/server_rack/roundstart/Initialize() +/obj/item/server_rack/roundstart/Initialize(mapload) . = ..() var/obj/item/ai_cpu/CPU = new(src) contained_cpus += CPU diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index 0ad2cea4b45f..0486fda51619 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -18,7 +18,7 @@ var/ai_detector_visible = TRUE var/ai_detector_color = COLOR_RED -/mob/camera/aiEye/Initialize() +/mob/camera/aiEye/Initialize(mapload) . = ..() GLOB.aiEyes += src icon_state = "ai_camera[GLOB.ai_list.len % 3]" // Yogs -- multicoloured AI eyes diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 35ea739c3dee..2b5a31dacbcf 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -6,7 +6,7 @@ var/highlighted = FALSE var/mob/camera/aiEye/pic_in_pic/aiEye -/atom/movable/screen/movable/pic_in_pic/ai/Initialize() +/atom/movable/screen/movable/pic_in_pic/ai/Initialize(mapload) . = ..() aiEye = new /mob/camera/aiEye/pic_in_pic() aiEye.screen = src @@ -106,7 +106,7 @@ GLOBAL_DATUM(ai_camera_room_landmark, /obj/effect/landmark/ai_multicam_room) icon = 'icons/mob/landmarks.dmi' icon_state = "x" -/obj/effect/landmark/ai_multicam_room/Initialize() +/obj/effect/landmark/ai_multicam_room/Initialize(mapload) . = ..() qdel(GLOB.ai_camera_room_landmark) GLOB.ai_camera_room_landmark = src diff --git a/code/modules/mob/living/silicon/ai/say.dm b/code/modules/mob/living/silicon/ai/say.dm index 230d44da2c33..d92be393568c 100644 --- a/code/modules/mob/living/silicon/ai/say.dm +++ b/code/modules/mob/living/silicon/ai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/ai/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/silicon/ai/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(parent && istype(parent) && parent.stat != DEAD) //If there is a defined "parent" AI, it is actually an AI, and it is alive, anything the AI tries to say is said by the parent instead. parent.say(message, language) return diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index cbd515e2a634..15f5d1db7ab7 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -98,7 +98,7 @@ GLOB.pai_list -= src return ..() -/mob/living/silicon/pai/Initialize() +/mob/living/silicon/pai/Initialize(mapload) var/obj/item/paicard/P = loc START_PROCESSING(SSfastprocess, src) GLOB.pai_list += src diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index a4929149961b..39558e493662 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -70,7 +70,7 @@ /mob/living/silicon/pai/stripPanelEquip(obj/item/what, mob/who, where) //prevents stripping to_chat(src, span_warning("Your holochassis stutters and warps intensely as you attempt to interact with the object, forcing you to cease lest the field fail.")) -/mob/living/silicon/pai/ignite_mob(var/mob/living/silicon/pai/P) +/mob/living/silicon/pai/ignite_mob(mob/living/silicon/pai/P) return FALSE //No we're not flammable /mob/living/silicon/pai/proc/take_holo_damage(amount) diff --git a/code/modules/mob/living/silicon/pai/say.dm b/code/modules/mob/living/silicon/pai/say.dm index 7c0bd7af7501..bb2f881cd384 100644 --- a/code/modules/mob/living/silicon/pai/say.dm +++ b/code/modules/mob/living/silicon/pai/say.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/pai/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/silicon/pai/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(silent) to_chat(src, span_warning("Communication circuits remain unitialized.")) else diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 08ec212972ff..b6b5f32d2a3c 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -839,7 +839,7 @@ /mob/living/silicon/robot/modules var/set_module = null -/mob/living/silicon/robot/modules/Initialize() +/mob/living/silicon/robot/modules/Initialize(mapload) . = ..() module.transform_to(set_module) @@ -890,7 +890,7 @@ Help the operatives secure the disk at all costs!" set_module = /obj/item/robot_module/syndicate -/mob/living/silicon/robot/modules/syndicate/Initialize() +/mob/living/silicon/robot/modules/syndicate/Initialize(mapload) . = ..() cell = new /obj/item/stock_parts/cell/hyper(src, 25000) radio = new /obj/item/radio/borg/syndicate(src) @@ -1147,7 +1147,7 @@ new_hat.forceMove(src) update_icons() -/mob/living/silicon/robot/proc/make_shell(var/obj/item/borg/upgrade/ai/board) +/mob/living/silicon/robot/proc/make_shell(obj/item/borg/upgrade/ai/board) if(!board) upgrades |= new /obj/item/borg/upgrade/ai(src) shell = TRUE @@ -1175,7 +1175,7 @@ builtInCamera.c_tag = real_name diag_hud_set_aishell() -/mob/living/silicon/robot/proc/deploy_init(var/mob/living/silicon/ai/AI) +/mob/living/silicon/robot/proc/deploy_init(mob/living/silicon/ai/AI) real_name = "[AI.real_name] shell [rand(100, 999)] - [designation]" //Randomizing the name so it shows up separately in the shells list name = real_name if(!QDELETED(builtInCamera)) @@ -1344,7 +1344,7 @@ * Arguments: * arg1: a string containing the message to log. */ -/mob/living/silicon/robot/proc/logevent(var/string = "") +/mob/living/silicon/robot/proc/logevent(string = "") if(!string) return if(stat == DEAD) //Dead borgs log no longer diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index 487c1d033d74..df5ed87c4484 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -193,7 +193,7 @@ if (stat != DEAD) adjustBruteLoss(30) -/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj, def_zone) +/mob/living/silicon/robot/bullet_act(obj/item/projectile/Proj, def_zone) . = ..() updatehealth() if(prob(75) && Proj.damage > 0) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index e0eeeba1982a..bd710740f7c7 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -40,7 +40,7 @@ var/obj/item/hat // Keeps track of the hat while transforming, to attempt to place back on the borg's head -/obj/item/robot_module/Initialize() +/obj/item/robot_module/Initialize(mapload) . = ..() for(var/i in basic_modules) var/obj/item/I = new i(src) @@ -82,7 +82,7 @@ if(!(m in R.held_items)) . += m -/obj/item/robot_module/proc/get_or_create_estorage(var/storage_type) +/obj/item/robot_module/proc/get_or_create_estorage(storage_type) for(var/datum/robot_energy_storage/S in storages) if(istype(S, storage_type)) return S @@ -704,7 +704,7 @@ var/recharge_rate = 1000 var/energy -/datum/robot_energy_storage/New(var/obj/item/robot_module/R = null) +/datum/robot_energy_storage/New(obj/item/robot_module/R = null) energy = max_energy if(R) R.storages |= src diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index eadb09f55512..b647ec5ffff2 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -51,7 +51,7 @@ var/obj/item/modular_computer/tablet/integrated/modularInterface var/obj/item/pda/aiPDA -/mob/living/silicon/Initialize() +/mob/living/silicon/Initialize(mapload) . = ..() GLOB.silicon_mobs += src faction += "silicon" diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index e9a6a5105a0f..435c369d4016 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -30,7 +30,7 @@ playsound(src,'sound/effects/beepskyspinsabre.ogg',100,TRUE,-1) stun_attack(AM) -/mob/living/simple_animal/bot/secbot/grievous/Initialize() +/mob/living/simple_animal/bot/secbot/grievous/Initialize(mapload) . = ..() weapon = new baton_type(src) INVOKE_ASYNC(weapon, TYPE_PROC_REF(/obj/item, attack_self), src) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index 90f5f09ce1e7..b69bf925fc76 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -141,7 +141,7 @@ bot_reset() //Resets an AI's call, should it exist. update_icon() -/mob/living/simple_animal/bot/Initialize() +/mob/living/simple_animal/bot/Initialize(mapload) . = ..() GLOB.bots_list += src access_card = new /obj/item/card/id(src) @@ -864,7 +864,7 @@ Pass a positive integer as an argument to override a bot's default speed. anchored = FALSE var/mob/living/simple_animal/bot/owner = null -/obj/machinery/bot_core/Initialize() +/obj/machinery/bot_core/Initialize(mapload) . = ..() owner = loc if(!istype(owner)) diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index b87f6a0f1076..1d463b331060 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -33,7 +33,7 @@ var/next_dest var/next_dest_loc -/mob/living/simple_animal/bot/cleanbot/Initialize() +/mob/living/simple_animal/bot/cleanbot/Initialize(mapload) . = ..() get_targets() icon_state = "cleanbot[on]" @@ -314,7 +314,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}) name = "Scrubs, MD" desc = "A little cleaning robot, he looks so excited! This one can be configured by medbay staff." -/mob/living/simple_animal/bot/cleanbot/medical/Initialize() +/mob/living/simple_animal/bot/cleanbot/medical/Initialize(mapload) . = ..() bot_core.req_one_access = list(ACCESS_JANITOR, ACCESS_ROBO_CONTROL, ACCESS_MEDICAL) @@ -322,6 +322,6 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}) name = "Frank Cleansington III" desc = "A little cleaning robot, he looks so excited! You still have no idea why your dad named it this." -/mob/living/simple_animal/bot/cleanbot/spacebar/Initialize() +/mob/living/simple_animal/bot/cleanbot/spacebar/Initialize(mapload) . = ..() bot_core.req_one_access = list(ACCESS_BAR) diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm index 0e3afdf43cb7..52a44ad84592 100644 --- a/code/modules/mob/living/simple_animal/bot/construction.dm +++ b/code/modules/mob/living/simple_animal/bot/construction.dm @@ -210,7 +210,7 @@ var/toolbox = /obj/item/storage/toolbox/mechanical var/toolbox_color = "" //Blank for blue, r for red, y for yellow, etc. -/obj/item/bot_assembly/floorbot/Initialize() +/obj/item/bot_assembly/floorbot/Initialize(mapload) . = ..() update_icon() @@ -262,7 +262,7 @@ var/healthanalyzer = /obj/item/healthanalyzer var/firstaid = /obj/item/storage/firstaid -/obj/item/bot_assembly/medbot/Initialize() +/obj/item/bot_assembly/medbot/Initialize(mapload) . = ..() spawn(5) if(skin) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index 87cb73c8e6dc..2e01b58cd734 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -368,7 +368,7 @@ Auto Patrol[]"}, else continue -/mob/living/simple_animal/bot/ed209/proc/check_for_weapons(var/obj/item/slot_item) +/mob/living/simple_animal/bot/ed209/proc/check_for_weapons(obj/item/slot_item) if(slot_item && (slot_item.item_flags & NEEDS_PERMIT)) return 1 return 0 diff --git a/code/modules/mob/living/simple_animal/bot/firebot.dm b/code/modules/mob/living/simple_animal/bot/firebot.dm index 1d992c22bc6b..cdc1f2e12d42 100644 --- a/code/modules/mob/living/simple_animal/bot/firebot.dm +++ b/code/modules/mob/living/simple_animal/bot/firebot.dm @@ -39,7 +39,7 @@ var/extinguish_fires = TRUE var/stationary_mode = FALSE -/mob/living/simple_animal/bot/firebot/Initialize() +/mob/living/simple_animal/bot/firebot/Initialize(mapload) . = ..() update_icon() var/datum/job/engineer/J = new/datum/job/engineer diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index f4c4ba24b141..2965832f658d 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -37,7 +37,7 @@ var/weaponscheck = TRUE var/bikehorn = /obj/item/bikehorn -/mob/living/simple_animal/bot/honkbot/Initialize() +/mob/living/simple_animal/bot/honkbot/Initialize(mapload) . = ..() update_icon() auto_patrol = TRUE @@ -338,7 +338,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, new /obj/effect/decal/cleanable/oil(loc) ..() -/mob/living/simple_animal/bot/honkbot/attack_alien(var/mob/living/carbon/alien/user as mob) +/mob/living/simple_animal/bot/honkbot/attack_alien(mob/living/carbon/alien/user as mob) ..() if(!isalien(target)) target = user diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 7faa281c11c8..361ffc9c733b 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -52,7 +52,7 @@ ///The amount of steps we should take until we rest for a time. var/num_steps = 0 -/mob/living/simple_animal/bot/mulebot/Initialize() +/mob/living/simple_animal/bot/mulebot/Initialize(mapload) . = ..() wires = new /datum/wires/mulebot(src) var/datum/job/cargo_tech/J = new/datum/job/cargo_tech diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index bc1cca61ec63..ef3b15ef59d5 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -49,7 +49,7 @@ desc = "It's Commander Beepsky's smaller, just-as aggressive cousin, Pipsqueak." commissioned = FALSE -/mob/living/simple_animal/bot/secbot/beepsky/jr/Initialize() +/mob/living/simple_animal/bot/secbot/beepsky/jr/Initialize(mapload) . = ..() resize = 0.8 update_transform() @@ -69,7 +69,7 @@ desc = "It's Officer Pingsky! Delegated to satellite guard duty for harbouring anti-human sentiment." radio_channel = RADIO_CHANNEL_AI_PRIVATE -/mob/living/simple_animal/bot/secbot/Initialize() +/mob/living/simple_animal/bot/secbot/Initialize(mapload) . = ..() update_icon() var/datum/job/detective/J = new/datum/job/detective @@ -414,7 +414,7 @@ Auto Patrol: []"}, else continue -/mob/living/simple_animal/bot/secbot/proc/check_for_weapons(var/obj/item/slot_item) +/mob/living/simple_animal/bot/secbot/proc/check_for_weapons(obj/item/slot_item) if(slot_item && (slot_item.item_flags & NEEDS_PERMIT)) return TRUE return FALSE @@ -440,7 +440,7 @@ Auto Patrol: []"}, new /obj/effect/decal/cleanable/oil(loc) ..() -/mob/living/simple_animal/bot/secbot/attack_alien(var/mob/living/carbon/alien/user as mob) +/mob/living/simple_animal/bot/secbot/attack_alien(mob/living/carbon/alien/user as mob) ..() if(!isalien(target)) target = user @@ -451,7 +451,7 @@ Auto Patrol: []"}, var/mob/living/carbon/C = AM if(!istype(C) || !C || in_range(src, target)) return - knockOver(C) + knock_over(C) return ..() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 357540a42e94..f79777c8f56a 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -42,7 +42,7 @@ /// Theme controls color. THEME_CULT is red THEME_WIZARD is purple and THEME_HOLY is blue var/theme = THEME_CULT -/mob/living/simple_animal/hostile/construct/Initialize() +/mob/living/simple_animal/hostile/construct/Initialize(mapload) . = ..() update_health_hud() for(var/spell in construct_spells) @@ -316,7 +316,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, if(Found(the_target) || ..()) //If we Found it or Can_Attack it normally, we Can_Attack it as long as it wasn't invisible return 1 //as a note this shouldn't be added to base hostile mobs because it'll mess up retaliate hostile mobs -/mob/living/simple_animal/hostile/construct/builder/MoveToTarget(var/list/possible_targets) +/mob/living/simple_animal/hostile/construct/builder/MoveToTarget(list/possible_targets) ..() if(isliving(target)) var/mob/living/L = target @@ -426,7 +426,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, return FALSE . = ..() -/mob/living/simple_animal/hostile/construct/harvester/Initialize() +/mob/living/simple_animal/hostile/construct/harvester/Initialize(mapload) . = ..() var/datum/action/innate/seek_prey/seek = new() seek.Grant(src) @@ -447,7 +447,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, var/mob/living/simple_animal/hostile/construct/the_construct -/datum/action/innate/seek_master/Grant(var/mob/living/C) +/datum/action/innate/seek_master/Grant(mob/living/C) the_construct = C ..() @@ -486,7 +486,7 @@ mob/living/simple_animal/hostile/construct/attackby(obj/item/W, mob/living/user, button_icon_state = "cult_mark" var/mob/living/simple_animal/hostile/construct/harvester/the_construct -/datum/action/innate/seek_prey/Grant(var/mob/living/C) +/datum/action/innate/seek_prey/Grant(mob/living/C) the_construct = C ..() diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 7e4932923ee7..ee2a43932a33 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -2,7 +2,7 @@ //If someone can do this in a neater way, be my guest-Kor -//This has to be separate from the Away Mission corpses, because New() doesn't work for those, and initialize() doesn't work for these. +//This has to be separate from the Away Mission corpses, because New() doesn't work for those, and Initialize(mapload) doesn't work for these. //To do: Allow corpses to appear mangled, bloody, etc. Allow customizing the bodies appearance (they're all bald and white right now). diff --git a/code/modules/mob/living/simple_animal/eldritch_demons.dm b/code/modules/mob/living/simple_animal/eldritch_demons.dm index fec1b5cfad6c..1991868eb855 100644 --- a/code/modules/mob/living/simple_animal/eldritch_demons.dm +++ b/code/modules/mob/living/simple_animal/eldritch_demons.dm @@ -32,7 +32,7 @@ ///Innate spells that are supposed to be added when a beast is created var/list/actions_to_add -/mob/living/simple_animal/hostile/eldritch/Initialize() +/mob/living/simple_animal/hostile/eldritch/Initialize(mapload) . = ..() for(var/spell in actions_to_add) var/datum/action/cooldown/spell/new_spell = new spell(src) @@ -60,7 +60,7 @@ /// A weakref to the last target we smacked. Hitting targets consecutively does more damage. var/datum/weakref/last_target -/mob/living/simple_animal/hostile/eldritch/raw_prophet/Initialize() +/mob/living/simple_animal/hostile/eldritch/raw_prophet/Initialize(mapload) . = ..() var/on_link_message = "You feel something new enter your sphere of mind... \ You hear whispers of people far away, screeches of horror and a huming of welcome to [src]'s Mansus Link." diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index 1d2fa40e67d7..b53bef6b977e 100644 --- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm +++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm @@ -25,7 +25,7 @@ verb_exclaim = "flutters intensely" verb_yell = "flutters intensely" -/mob/living/simple_animal/butterfly/Initialize() +/mob/living/simple_animal/butterfly/Initialize(mapload) . = ..() var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index ca0dd61f96dd..4ebb5df8cec7 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -37,7 +37,7 @@ wuv_happy = "purrs!" wuv_angy = "hisses!" -/mob/living/simple_animal/pet/cat/Initialize() +/mob/living/simple_animal/pet/cat/Initialize(mapload) . = ..() add_verb(src, /mob/living/proc/lay_down) @@ -86,7 +86,7 @@ var/list/pet_kitten_names = list("Fajita", "Pumpkin", "Meowchael", "Catrick", "Genghis Kat", "Sir Isaac Mewton", "Nugget", "Meowchelangelo", "Meowgaret", "Lemon", "Meowria", "Todd Meoward", "Dolly Purrton", "Pickle", "Runt", "Claws", "Patches", "Skippy", "Teddy", "Frank", "Quilt", "Lenny", "Benny", "Hubert", "Scrungemuffin", "Pizza", "Pawl Meowcartney") var/list/rare_pet_kitten_names = list("Fuckface", "Chief Meowdical Officer", "Mewcular Opurrative", "Dumbass Cat", "Backup Ian", "Mischief") -/mob/living/simple_animal/pet/cat/kitten/Initialize() +/mob/living/simple_animal/pet/cat/kitten/Initialize(mapload) . = ..() if(prob(5)) name = pick(rare_pet_kitten_names) @@ -108,7 +108,7 @@ var/cats_deployed = 0 var/memory_saved = FALSE -/mob/living/simple_animal/pet/cat/Runtime/Initialize() +/mob/living/simple_animal/pet/cat/Runtime/Initialize(mapload) if(prob(5)) icon_state = "original" icon_living = "original" diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm index 33c79a031d0b..f94446dbb855 100644 --- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm +++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm @@ -33,7 +33,7 @@ return ..() -/mob/living/simple_animal/cockroach/Crossed(var/atom/movable/AM) +/mob/living/simple_animal/cockroach/Crossed(atom/movable/AM) . = ..() if(ismob(AM)) if(isliving(AM)) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 670c78d96e85..7c716d50b181 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -119,18 +119,18 @@ animal_species = /mob/living/simple_animal/pet/dog/corgi/exoticcorgi nofur = TRUE -/mob/living/simple_animal/pet/dog/Initialize() +/mob/living/simple_animal/pet/dog/Initialize(mapload) . = ..() var/dog_area = get_area(src) for(var/obj/structure/bed/dogbed/D in dog_area) if(D.update_owner(src)) //No muscling in on my turf you fucking parrot break -/mob/living/simple_animal/pet/dog/corgi/Initialize() +/mob/living/simple_animal/pet/dog/corgi/Initialize(mapload) . = ..() regenerate_icons() -/mob/living/simple_animal/pet/dog/corgi/exoticcorgi/Initialize() +/mob/living/simple_animal/pet/dog/corgi/exoticcorgi/Initialize(mapload) . = ..() var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY) @@ -382,7 +382,7 @@ var/memory_saved = FALSE var/saved_head //path -/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize() +/mob/living/simple_animal/pet/dog/corgi/Ian/Initialize(mapload) . = ..() //parent call must happen first to ensure IAN //is not in nullspace when child puppies spawn diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index 3f860f253b77..b43c30d6a112 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -89,7 +89,7 @@ . += "

    Current Drone Laws:

    " . += replacetext(laws, "\n", "
    ") -/mob/living/simple_animal/drone/Initialize() +/mob/living/simple_animal/drone/Initialize(mapload) . = ..() GLOB.drones_list += src access_card = new /obj/item/card/id(src) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm index 0d82a84757c6..16de99e0c69a 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/drones_as_items.dm @@ -17,7 +17,7 @@ var/seasonal_hats = TRUE //If TRUE, and there are no default hats, different holidays will grant different hats var/static/list/possible_seasonal_hats //This is built automatically in build_seasonal_hats() but can also be edited by admins! -/obj/item/drone_shell/Initialize() +/obj/item/drone_shell/Initialize(mapload) . = ..() var/area/A = get_area(src) if(A) diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 937b4283933e..63c13039e1a5 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -32,7 +32,7 @@ flavortext = null pacifism = FALSE -/mob/living/simple_animal/drone/syndrone/Initialize() +/mob/living/simple_animal/drone/syndrone/Initialize(mapload) . = ..() var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink) hidden_uplink.telecrystals = 10 @@ -46,7 +46,7 @@ default_hatmask = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite default_storage = /obj/item/uplink/nuclear -/mob/living/simple_animal/drone/syndrone/badass/Initialize() +/mob/living/simple_animal/drone/syndrone/badass/Initialize(mapload) . = ..() var/datum/component/uplink/hidden_uplink = internal_storage.GetComponent(/datum/component/uplink) hidden_uplink.telecrystals = 30 @@ -56,7 +56,7 @@ /mob/living/simple_animal/drone/snowflake default_hatmask = /obj/item/clothing/head/chameleon/drone -/mob/living/simple_animal/drone/snowflake/Initialize() +/mob/living/simple_animal/drone/snowflake/Initialize(mapload) . = ..() desc += " This drone appears to have a complex holoprojector built on its 'head'." @@ -82,7 +82,7 @@ flavortext = null pacifism = FALSE -/mob/living/simple_animal/drone/polymorphed/Initialize() +/mob/living/simple_animal/drone/polymorphed/Initialize(mapload) . = ..() liberate() visualAppearence = pick(MAINTDRONE, REPAIRDRONE, SCOUTDRONE) @@ -143,7 +143,7 @@ /mob/living/simple_animal/drone/cogscarab/admin //an admin-only subtype of cogscarab with a no-cost fabricator and slab in its box default_storage = /obj/item/storage/toolbox/brass/prefilled/ratvar/admin -/mob/living/simple_animal/drone/cogscarab/Initialize() +/mob/living/simple_animal/drone/cogscarab/Initialize(mapload) . = ..() set_light(2, 0.5) qdel(access_card) //we don't have free access 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 4fbd0017074f..7493c63fd89d 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -33,7 +33,7 @@ do_footstep = TRUE -/mob/living/simple_animal/hostile/retaliate/goat/Initialize() +/mob/living/simple_animal/hostile/retaliate/goat/Initialize(mapload) udder = new() . = ..() @@ -143,7 +143,7 @@ do_footstep = TRUE -/mob/living/simple_animal/cow/Initialize() +/mob/living/simple_animal/cow/Initialize(mapload) udder = new() . = ..() @@ -225,7 +225,7 @@ do_footstep = TRUE -/mob/living/simple_animal/chick/Initialize() +/mob/living/simple_animal/chick/Initialize(mapload) . = ..() pixel_x = rand(-6, 6) pixel_y = rand(0, 10) @@ -284,7 +284,7 @@ do_footstep = TRUE -/mob/living/simple_animal/chicken/Initialize() +/mob/living/simple_animal/chicken/Initialize(mapload) . = ..() if(!body_color) body_color = pick(validColors) @@ -368,7 +368,7 @@ do_footstep = TRUE -/mob/living/simple_animal/sheep/Initialize() +/mob/living/simple_animal/sheep/Initialize(mapload) udder = new() . = ..() @@ -436,7 +436,7 @@ name = "goat udder" milktype = /datum/reagent/consumable/milk/goat -/obj/item/udder/Initialize() +/obj/item/udder/Initialize(mapload) create_reagents(50) reagents.add_reagent(milktype, 20) . = ..() diff --git a/code/modules/mob/living/simple_animal/friendly/gondola.dm b/code/modules/mob/living/simple_animal/friendly/gondola.dm index 67ec46cf2d13..98fff0c1faa5 100644 --- a/code/modules/mob/living/simple_animal/friendly/gondola.dm +++ b/code/modules/mob/living/simple_animal/friendly/gondola.dm @@ -28,7 +28,7 @@ //Gondolas don't make footstep sounds -/mob/living/simple_animal/pet/gondola/Initialize() +/mob/living/simple_animal/pet/gondola/Initialize(mapload) . = ..() if (!(istype(src, /mob/living/simple_animal/pet/gondola/gondolapod))) CreateGondola() diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 421f773f5d47..1a6ac3f2152c 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -53,7 +53,7 @@ GLOBAL_VAR_INIT(mouse_killed, 0) var/cheesed = FALSE var/cheese_time = 0 -/mob/living/simple_animal/mouse/Initialize() +/mob/living/simple_animal/mouse/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100) if(!body_color) diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm index edceb97e19d1..3f79e4ee499b 100644 --- a/code/modules/mob/living/simple_animal/friendly/penguin.dm +++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm @@ -20,7 +20,7 @@ wuv_happy = "noots happily!" wuv_angy = "hisses!" //I think birds tend to hiss when they're upset right -/mob/living/simple_animal/pet/penguin/Initialize() +/mob/living/simple_animal/pet/penguin/Initialize(mapload) . = ..() AddComponent(/datum/component/waddling) diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 8a13fb5bec01..df17466f3470 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -67,7 +67,7 @@ if(INTENT_HARM) wuv(M, FALSE) -/mob/living/simple_animal/pet/Initialize() +/mob/living/simple_animal/pet/Initialize(mapload) . = ..() if(pcollar) pcollar = new(src) diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm index b8720c73a008..64b0860dc4a7 100644 --- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm +++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm @@ -164,7 +164,7 @@ eject_brain() return ..() -/mob/living/simple_animal/spiderbot/Initialize() +/mob/living/simple_animal/spiderbot/Initialize(mapload) . = ..() radio = new /obj/item/radio/borg(src) camera = new /obj/machinery/camera(src) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index b512d9a81ac1..d95270a0120e 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -506,7 +506,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians used = FALSE -/obj/item/guardiancreator/proc/spawn_guardian(var/mob/living/user, var/key) +/obj/item/guardiancreator/proc/spawn_guardian(mob/living/user, key) var/guardiantype = "Standard" if(random) guardiantype = pick(possible_guardians) diff --git a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm index 053f4760bcc9..e221fbd02e01 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/assassin.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/assassin.dm @@ -17,7 +17,7 @@ var/atom/movable/screen/alert/canstealthalert var/atom/movable/screen/alert/instealthalert -/mob/living/simple_animal/hostile/guardian/assassin/Initialize() +/mob/living/simple_animal/hostile/guardian/assassin/Initialize(mapload) . = ..() stealthcooldown = 0 diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 3703c683cd4e..7a7e96b2d660 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -27,7 +27,7 @@ var/list/snares = list() var/toggle = FALSE -/mob/living/simple_animal/hostile/guardian/ranged/Initialize() //yogs start +/mob/living/simple_animal/hostile/guardian/ranged/Initialize(mapload) //yogs start . = ..() LoadComponent(/datum/component/walk) //yogs end diff --git a/code/modules/mob/living/simple_animal/guardian/types/support.dm b/code/modules/mob/living/simple_animal/guardian/types/support.dm index 87c09d5473e9..1de376e10e7c 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/support.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/support.dm @@ -15,7 +15,7 @@ var/beacon_cooldown = 0 var/toggle = FALSE -/mob/living/simple_animal/hostile/guardian/healer/Initialize() +/mob/living/simple_animal/hostile/guardian/healer/Initialize(mapload) . = ..() var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] medsensor.show_to(src) diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index eb2dde8d7f6b..e9bee37b1a1a 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -58,7 +58,7 @@ var/static/beehometypecache = typecacheof(/obj/structure/beebox) var/static/hydroponicstypecache = typecacheof(/obj/machinery/hydroponics) -/mob/living/simple_animal/hostile/poison/bees/Initialize() +/mob/living/simple_animal/hostile/poison/bees/Initialize(mapload) . = ..() generate_bee_visuals() AddComponent(/datum/component/swarming) @@ -222,7 +222,7 @@ beehome = BB break // End loop after the first compatible find. -/mob/living/simple_animal/hostile/poison/bees/toxin/Initialize() +/mob/living/simple_animal/hostile/poison/bees/toxin/Initialize(mapload) . = ..() var/datum/reagent/R = pick(typesof(/datum/reagent/toxin)) assign_reagent(GLOB.chemical_reagents_list[R]) @@ -296,7 +296,7 @@ ..() -/obj/item/queen_bee/bought/Initialize() +/obj/item/queen_bee/bought/Initialize(mapload) . = ..() queen = new(src) diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm index be8839469215..1a71a4dd0f52 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/boss.dm @@ -11,7 +11,7 @@ var/point_regen_delay = 1 -/mob/living/simple_animal/hostile/boss/Initialize() +/mob/living/simple_animal/hostile/boss/Initialize(mapload) . = ..() atb = new() diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm index d7c8f78e991d..d005b523ef0f 100644 --- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm @@ -154,7 +154,7 @@ duration = 18 randomdir = FALSE -/obj/effect/temp_visual/paperwiz_dying/Initialize() +/obj/effect/temp_visual/paperwiz_dying/Initialize(mapload) . = ..() visible_message(span_boldannounce("The wizard cries out in pain as a gate appears behind him, sucking him in!")) playsound(get_turf(src),'sound/magic/mandswap.ogg', 50, 1, 1) diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index a872bba9cba9..81cb84c798af 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -148,7 +148,7 @@ var/regen_cooldown = 0 -/mob/living/simple_animal/hostile/carp/megacarp/Initialize() +/mob/living/simple_animal/hostile/carp/megacarp/Initialize(mapload) . = ..() name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]" melee_damage_lower += rand(2, 10) 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 61d4791dacec..e43c18168102 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -54,7 +54,7 @@ do_footstep = TRUE -/mob/living/simple_animal/hostile/poison/giant_spider/Initialize() +/mob/living/simple_animal/hostile/poison/giant_spider/Initialize(mapload) . = ..() var/datum/action/innate/spider/lay_web/webbing = new(src) webbing.Grant(src) @@ -110,7 +110,7 @@ var/static/list/consumed_mobs = list() //the tags of mobs that have been consumed by nurse spiders to lay eggs gold_core_spawnable = NO_SPAWN -/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Initialize() +/mob/living/simple_animal/hostile/poison/giant_spider/nurse/Initialize(mapload) . = ..() var/datum/atom_hud/datahud = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED] datahud.show_to(src) @@ -138,7 +138,7 @@ health = 40 gold_core_spawnable = HOSTILE_SPAWN //yogs xenobio spiders best spiders -/mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife/Initialize() +/mob/living/simple_animal/hostile/poison/giant_spider/nurse/midwife/Initialize(mapload) . = ..() var/datum/action/innate/spider/comm/letmetalkpls = new(src) letmetalkpls.Grant(src) diff --git a/code/modules/mob/living/simple_animal/hostile/glockroach.dm b/code/modules/mob/living/simple_animal/hostile/glockroach.dm index 16e56a89cb85..07968d140adf 100644 --- a/code/modules/mob/living/simple_animal/hostile/glockroach.dm +++ b/code/modules/mob/living/simple_animal/hostile/glockroach.dm @@ -44,7 +44,7 @@ return ..() -/mob/living/simple_animal/hostile/glockroach/Crossed(var/atom/movable/AM) +/mob/living/simple_animal/hostile/glockroach/Crossed(atom/movable/AM) . = ..() if(ismob(AM)) if(isliving(AM)) diff --git a/code/modules/mob/living/simple_animal/hostile/goose.dm b/code/modules/mob/living/simple_animal/hostile/goose.dm index 34b49b4f1f91..e73803e4a4a6 100644 --- a/code/modules/mob/living/simple_animal/hostile/goose.dm +++ b/code/modules/mob/living/simple_animal/hostile/goose.dm @@ -53,7 +53,7 @@ var/vomitTimeBonus = 0 var/datum/action/cooldown/vomit/goosevomit -/mob/living/simple_animal/hostile/retaliate/goose/vomit/Initialize() +/mob/living/simple_animal/hostile/retaliate/goose/vomit/Initialize(mapload) . = ..() goosevomit = new goosevomit.Grant(src) @@ -95,7 +95,7 @@ playsound(T, 'sound/effects/splat.ogg', 50, 1) T.add_vomit_floor(src) -/mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/barf_food(var/atom/A, var/hard = FALSE) +/mob/living/simple_animal/hostile/retaliate/goose/vomit/proc/barf_food(atom/A, hard = FALSE) if(!istype(A, /obj/item/reagent_containers/food)) return var/turf/currentTurf = get_turf(src) diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm index 8b7b4622573c..4e2ec0b82793 100644 --- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm +++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm @@ -38,7 +38,7 @@ do_footstep = TRUE -/mob/living/simple_animal/hostile/hivebot/Initialize() +/mob/living/simple_animal/hostile/hivebot/Initialize(mapload) . = ..() deathmessage = "[src] blows apart!" diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 6d386d1075e8..741bdda17dee 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -51,7 +51,7 @@ var/lose_patience_timer_id //id for a timer to call LoseTarget(), used to stop mobs fixating on a target they can't reach var/lose_patience_timeout = 300 //30 seconds by default, so there's no major changes to AI behaviour, beyond actually bailing if stuck forever -/mob/living/simple_animal/hostile/Initialize() +/mob/living/simple_animal/hostile/Initialize(mapload) . = ..() if(!targets_from) @@ -141,7 +141,7 @@ for (var/atom/movable/A in oview(vision_range, targets_from)) . += A -/mob/living/simple_animal/hostile/proc/FindTarget(var/list/possible_targets, var/HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about +/mob/living/simple_animal/hostile/proc/FindTarget(list/possible_targets, HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about . = list() if(!HasTargetsList) possible_targets = ListTargets() @@ -500,7 +500,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega ////// AI Status /////// -/mob/living/simple_animal/hostile/proc/AICanContinue(var/list/possible_targets) +/mob/living/simple_animal/hostile/proc/AICanContinue(list/possible_targets) switch(AIStatus) if(AI_ON) . = 1 @@ -511,7 +511,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega else . = 0 -/mob/living/simple_animal/hostile/proc/AIShouldSleep(var/list/possible_targets) +/mob/living/simple_animal/hostile/proc/AIShouldSleep(list/possible_targets) return !FindTarget(possible_targets, 1) @@ -562,7 +562,7 @@ mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with mega FindTarget() toggle_ai(AI_ON) -/mob/living/simple_animal/hostile/proc/ListTargetsLazy(var/_Z)//Step 1, find out what we can see +/mob/living/simple_animal/hostile/proc/ListTargetsLazy(_Z)//Step 1, find out what we can see var/static/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/mecha, /obj/structure/destructible/clockwork/ocular_warden, /obj/spacepod)) // yogs - add spacepod . = list() for (var/I in SSmobs.clients_by_zlevel[_Z]) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index 3d09bad60d7d..860923e66034 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -60,7 +60,7 @@ layer = ABOVE_ALL_MOB_LAYER duration = 3 -/obj/effect/temp_visual/leaper_projectile_impact/Initialize() +/obj/effect/temp_visual/leaper_projectile_impact/Initialize(mapload) . = ..() new /obj/effect/decal/cleanable/leaper_sludge(get_turf(src)) @@ -78,7 +78,7 @@ max_integrity = 10 density = FALSE -/obj/structure/leaper_bubble/Initialize() +/obj/structure/leaper_bubble/Initialize(mapload) . = ..() float(on = TRUE) QDEL_IN(src, 100) @@ -126,7 +126,7 @@ pixel_y = -32 duration = 30 -/mob/living/simple_animal/hostile/jungle/leaper/Initialize() +/mob/living/simple_animal/hostile/jungle/leaper/Initialize(mapload) . = ..() remove_verb(src, /mob/living/verb/pulled) diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index cd1a349580f0..4534552a6a55 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -40,7 +40,7 @@ spawn_mecha_type = null search_objects = 2 -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize() +/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize(mapload) . = ..() wanted_objects = typecacheof(/obj/mecha/combat, TRUE) @@ -60,7 +60,7 @@ faction = list("nanotrasen") -/mob/living/simple_animal/hostile/syndicate/mecha_pilot/Initialize() +/mob/living/simple_animal/hostile/syndicate/mecha_pilot/Initialize(mapload) . = ..() if(spawn_mecha_type) var/obj/mecha/M = new spawn_mecha_type (get_turf(src)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm index f8580f1963d4..5e4eea1847bb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm @@ -59,7 +59,7 @@ Difficulty: Medium /datum/action/innate/megafauna_attack/kinetic_accelerator, /datum/action/innate/megafauna_attack/transform_weapon) -/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize() +/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize(mapload) . = ..() miner_saw = new(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 240215a2a092..ef945fb2c490 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -71,7 +71,7 @@ Difficulty: Hard music_component = /datum/component/music_player/battle music_path = /datum/music/sourced/battle/bubblegum -/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize() +/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize(mapload) . = ..() if(true_spawn) for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_living_list) @@ -106,7 +106,7 @@ Difficulty: Hard chosen_message = span_colossus("You are now warping to blood around your clicked position.") chosen_attack_num = 4 -/mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed, var/list/force_grant) +/mob/living/simple_animal/hostile/megafauna/bubblegum/death(gibbed, list/force_grant) .=..() if(true_spawn && !(flags_1 & ADMIN_SPAWNED_1)) GLOB.bubblegum_dead = TRUE @@ -174,7 +174,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(6) SetRecoveryTime(20) -/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/charge(var/atom/chargeat = target, var/delay = 3, var/chargepast = 2) +/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/charge(atom/chargeat = target, delay = 3, chargepast = 2) if(!chargeat) return var/chargeturf = get_turf(chargeat) @@ -348,12 +348,12 @@ Difficulty: Hard var/datum/callback/cb = CALLBACK(src, PROC_REF(blood_enrage_end)) addtimer(cb, enrage_time) -/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_enrage_end(var/newcolor = rgb(149, 10, 10)) +/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/blood_enrage_end(newcolor = rgb(149, 10, 10)) update_approach() change_move_delay() remove_atom_colour(TEMPORARY_COLOUR_PRIORITY, newcolor) -/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/change_move_delay(var/newmove = initial(move_to_delay)) +/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/change_move_delay(newmove = initial(move_to_delay)) move_to_delay = newmove set_varspeed(move_to_delay) handle_automated_action() // need to recheck movement otherwise move_to_delay won't update until the next checking aka will be wrong speed for a bit @@ -370,7 +370,7 @@ Difficulty: Hard /obj/effect/decal/cleanable/blood/bubblegum/can_bloodcrawl_in() return TRUE -/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/hallucination_charge_around(var/times = 4, var/delay = 6, var/chargepast = 0, var/useoriginal = 1, var/radius) +/mob/living/simple_animal/hostile/megafauna/bubblegum/proc/hallucination_charge_around(times = 4, delay = 6, chargepast = 0, useoriginal = 1, radius) var/startingangle = rand(1, 360) if(!target) return @@ -530,11 +530,11 @@ Difficulty: Hard deathsound = 'sound/effects/splat.ogg' true_spawn = FALSE -/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Initialize() +/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/Initialize(mapload) ..() toggle_ai(AI_OFF) -/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/charge(var/atom/chargeat = target, var/delay = 3, var/chargepast = 2) +/mob/living/simple_animal/hostile/megafauna/bubblegum/hallucination/charge(atom/chargeat = target, delay = 3, chargepast = 2) ..() qdel(src) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index dd7d5fba6cb7..2b9a43d6662e 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -311,7 +311,7 @@ Difficulty: Very Hard return FALSE return TRUE -/obj/machinery/smartfridge/black_box/Initialize() +/obj/machinery/smartfridge/black_box/Initialize(mapload) . = ..() var/static/obj/machinery/smartfridge/black_box/current if(current && current != src) @@ -503,7 +503,7 @@ Difficulty: Very Hard var/list/NewFlora = list() var/florachance = 8 -/obj/machinery/anomalous_crystal/theme_warp/Initialize() +/obj/machinery/anomalous_crystal/theme_warp/Initialize(mapload) . = ..() terrain_theme = pick("lavaland","winter","jungle","ayy lmao") observer_desc = "This crystal changes the area around it to match the theme of \"[terrain_theme]\"." @@ -567,7 +567,7 @@ Difficulty: Very Hard cooldown_add = 50 var/obj/item/projectile/generated_projectile = /obj/item/projectile/beam/emitter -/obj/machinery/anomalous_crystal/emitter/Initialize() +/obj/machinery/anomalous_crystal/emitter/Initialize(mapload) . = ..() generated_projectile = pick(/obj/item/projectile/colossus) @@ -686,7 +686,7 @@ Difficulty: Very Hard AIStatus = AI_OFF stop_automated_movement = TRUE -/mob/living/simple_animal/hostile/lightgeist/healing/Initialize() +/mob/living/simple_animal/hostile/lightgeist/healing/Initialize(mapload) . = ..() remove_verb(src, /mob/living/verb/pulled) remove_verb(src, /mob/verb/me_verb) @@ -724,7 +724,7 @@ Difficulty: Very Hard heal_power = 3 heal_color = "#5bf563" -/mob/living/simple_animal/hostile/lightgeist/healing/photogeist/Initialize() +/mob/living/simple_animal/hostile/lightgeist/healing/photogeist/Initialize(mapload) . = ..() var/datum/action/cooldown/spell/conjure/plants/terrarium = new(src) terrarium.Grant(src) @@ -770,7 +770,7 @@ Difficulty: Very Hard short_desc = "You are a photogeist, a peaceful creature summoned by a plant god" flavour_text = "Try to prevent plant creatures from dying and listen to your summoner otherwise. You can also click a plantlike creature to heal them and can seed flowers and bushes into the floor." -/obj/effect/mob_spawn/photogeist/Initialize() +/obj/effect/mob_spawn/photogeist/Initialize(mapload) . = ..() var/area/A = get_area(src) if(A) @@ -779,7 +779,7 @@ Difficulty: Very Hard /mob/living/simple_animal/hostile/lightgeist/healing/slime name = "crystalline lightgeist" -/mob/living/simple_animal/hostile/lightgeist/healing/slime/Initialize() +/mob/living/simple_animal/hostile/lightgeist/healing/slime/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_MUTE, INNATE_TRAIT) ADD_TRAIT(src, TRAIT_EMOTEMUTE, INNATE_TRAIT) @@ -857,7 +857,7 @@ Difficulty: Very Hard escape.Grant(holder_animal) remove_verb(holder_animal, /mob/living/verb/pulled) -/obj/structure/closet/stasis/dump_contents(var/kill = 1) +/obj/structure/closet/stasis/dump_contents(kill = 1) STOP_PROCESSING(SSobj, src) for(var/mob/living/L in src) REMOVE_TRAIT(L, TRAIT_MUTE, STASIS_MUTE) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 12fac8b01818..20953a0d862d 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -41,7 +41,7 @@ Difficulty: Extremely Hard /datum/action/innate/megafauna_attack/snowball_machine_gun, /datum/action/innate/megafauna_attack/ice_shotgun) -/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/Initialize() +/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner/Initialize(mapload) . = ..() AddComponent(/datum/component/knockback, 7, FALSE) AddComponent(/datum/component/lifesteal, 50) @@ -282,7 +282,7 @@ Difficulty: Extremely Hard desc = "A pair of winter boots contractually made by a devil, they cannot be taken off once put on." slowdown = SHOES_SLOWDOWN - 1 -/obj/item/clothing/shoes/winterboots/ice_boots/speedy/Initialize() +/obj/item/clothing/shoes/winterboots/ice_boots/speedy/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) @@ -291,7 +291,7 @@ Difficulty: Extremely Hard desc = "Cracks rocks at an inhuman speed, as well as being enhanced for combat purposes." toolspeed = 0 -/obj/item/pickaxe/drill/jackhammer/demonic/Initialize() +/obj/item/pickaxe/drill/jackhammer/demonic/Initialize(mapload) ..() AddComponent(/datum/component/knockback, 4, FALSE) AddComponent(/datum/component/lifesteal, 5) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm index 3d987af9dea5..2dfa0e759e23 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm @@ -140,7 +140,7 @@ Difficulty: Medium if(prob(11)) new /obj/effect/temp_visual/target(turf) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_pools(var/amount, var/delay = 0.8) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_pools(amount, delay = 0.8) if(!target) return target.visible_message(span_boldwarning("Lava starts to pool up around you!")) @@ -152,7 +152,7 @@ Difficulty: Medium amount-- SLEEP_CHECK_DEATH(delay) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_swoop(var/amount = 30) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/lava_swoop(amount = 30) if(health < maxHealth * 0.5) return swoop_attack(lava_arena = TRUE, swoop_cooldown = 60) INVOKE_ASYNC(src, PROC_REF(lava_pools), amount) @@ -166,7 +166,7 @@ Difficulty: Medium fire_cone() SetRecoveryTime(40) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/mass_fire(var/spiral_count = 12, var/range = 15, var/times = 6) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/mass_fire(spiral_count = 12, range = 15, times = 6) SLEEP_CHECK_DEATH(0) for(var/i = 1 to times) SetRecoveryTime(50) @@ -237,7 +237,7 @@ Difficulty: Medium remove_atom_colour(TEMPORARY_COLOUR_PRIORITY) light_range = initial(light_range) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_cone(var/atom/at = target, var/meteors = TRUE) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_cone(atom/at = target, meteors = TRUE) playsound(get_turf(src),'sound/magic/fireball.ogg', 200, 1) SLEEP_CHECK_DEATH(0) if(prob(50) && meteors) @@ -255,7 +255,7 @@ Difficulty: Medium turfs = line_target(50, range, at) INVOKE_ASYNC(src, PROC_REF(fire_line), turfs) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/line_target(var/offset, var/range, var/atom/at = target) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/line_target(offset, range, atom/at = target) if(!at) return var/angle = ATAN2(at.x - src.x, at.y - src.y) + offset @@ -267,12 +267,12 @@ Difficulty: Medium T = check return (getline(src, T) - get_turf(src)) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_line(var/list/turfs) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/fire_line(list/turfs) SLEEP_CHECK_DEATH(0) dragon_fire_line(src, turfs) //fire line keeps going even if dragon is deleted -/proc/dragon_fire_line(var/source, var/list/turfs) +/proc/dragon_fire_line(source, list/turfs) var/list/hit_list = list() for(var/turf/T in turfs) if(istype(T, /turf/closed)) @@ -296,7 +296,7 @@ Difficulty: Medium M.take_damage(45, BRUTE, MELEE, 1) sleep(0.15 SECONDS) -/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, var/swoop_cooldown = 30) +/mob/living/simple_animal/hostile/megafauna/dragon/proc/swoop_attack(lava_arena = FALSE, atom/movable/manual_target, swoop_cooldown = 30) if(stat || swooping) return if(manual_target) @@ -442,13 +442,13 @@ Difficulty: Medium /obj/effect/temp_visual/lava_warning/ex_act() return -/obj/effect/temp_visual/lava_warning/Initialize(mapload, var/reset_time = 1 SECONDS) +/obj/effect/temp_visual/lava_warning/Initialize(mapload, reset_time = 1 SECONDS) . = ..() INVOKE_ASYNC(src, PROC_REF(fall), reset_time) src.alpha = 63.75 animate(src, alpha = 255, time = duration) -/obj/effect/temp_visual/lava_warning/proc/fall(var/reset_time) +/obj/effect/temp_visual/lava_warning/proc/fall(reset_time) var/turf/T = get_turf(src) playsound(T,'sound/magic/fleshtostone.ogg', 80, 1) sleep(duration) @@ -548,7 +548,7 @@ Difficulty: Medium duration = 0.9 SECONDS pixel_z = 270 -/obj/effect/temp_visual/fireball/Initialize() +/obj/effect/temp_visual/fireball/Initialize(mapload) . = ..() animate(src, pixel_z = 0, time = duration) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm index 0324d8d8fe3b..b8079da0b891 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm @@ -84,7 +84,7 @@ Difficulty: Hard music_component = /datum/component/music_player/battle music_path = /datum/music/sourced/battle/hierophant -/mob/living/simple_animal/hostile/megafauna/hierophant/Initialize() +/mob/living/simple_animal/hostile/megafauna/hierophant/Initialize(mapload) . = ..() spawned_beacon = new(loc) @@ -196,7 +196,7 @@ Difficulty: Hard else //just release a burst of power INVOKE_ASYNC(src, PROC_REF(burst), get_turf(src)) -/mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(var/blink_counter, var/target_slowness, var/cross_counter) +/mob/living/simple_animal/hostile/megafauna/hierophant/proc/blink_spam(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) if(health < maxHealth * 0.5 && blink_counter > 1) visible_message(span_hierophant("\"Mx ampp rsx iwgeti.\"")) @@ -218,7 +218,7 @@ Difficulty: Hard else blink(target) -/mob/living/simple_animal/hostile/megafauna/hierophant/proc/cross_blast_spam(var/blink_counter, var/target_slowness, var/cross_counter) +/mob/living/simple_animal/hostile/megafauna/hierophant/proc/cross_blast_spam(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) visible_message(span_hierophant("\"Piezi mx rsalivi xs vyr.\"")) blinking = TRUE @@ -238,7 +238,7 @@ Difficulty: Hard blinking = FALSE -/mob/living/simple_animal/hostile/megafauna/hierophant/proc/chaser_swarm(var/blink_counter, var/target_slowness, var/cross_counter) +/mob/living/simple_animal/hostile/megafauna/hierophant/proc/chaser_swarm(blink_counter, target_slowness, cross_counter) ranged_cooldown = world.time + max(5, major_attack_cooldown - anger_modifier * 0.75) visible_message(span_hierophant("\"Mx gerrsx lmhi.\"")) blinking = TRUE @@ -265,7 +265,7 @@ Difficulty: Hard SLEEP_CHECK_DEATH(0.8 SECONDS) blinking = FALSE -/mob/living/simple_animal/hostile/megafauna/hierophant/proc/blasts(mob/victim, var/list/directions = GLOB.cardinals) //fires cross blasts with a delay +/mob/living/simple_animal/hostile/megafauna/hierophant/proc/blasts(mob/victim, list/directions = GLOB.cardinals) //fires cross blasts with a delay var/turf/T = get_turf(victim) if(!T) return diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index f05c979b9813..d3d417088f31 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -67,7 +67,7 @@ return return ..() -/mob/living/simple_animal/hostile/megafauna/death(gibbed, var/list/force_grant) +/mob/living/simple_animal/hostile/megafauna/death(gibbed, list/force_grant) if(health > 0) return else diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm index efbfdf8c5343..f2f95e58fe7a 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/stalwart.dm @@ -308,7 +308,7 @@ faction = list("mining") weather_immunities = list("lava","ash") -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/staldrone/Initialize() +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/staldrone/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(death)), 30 SECONDS) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 49aae7d26777..289229918544 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -64,7 +64,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa var/static/list/swarmer_caps -/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize() +/mob/living/simple_animal/hostile/megafauna/swarmer_swarm_beacon/Initialize(mapload) . = ..() swarmer_caps = GLOB.AISwarmerCapsByType //for admin-edits for(var/ddir in GLOB.cardinals) @@ -110,7 +110,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa weather_immunities = list(WEATHER_ASH) //wouldn't be fun otherwise AIStatus = AI_ON -/mob/living/simple_animal/hostile/swarmer/ai/Initialize() +/mob/living/simple_animal/hostile/swarmer/ai/Initialize(mapload) . = ..() toggle_light() //so you can see them eating you out of house and home/shooting you/stunlocking you for eternity LAZYINITLIST(GLOB.AISwarmersByType[type]) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 8a76e5f81e31..7c520bec2bb2 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -86,7 +86,7 @@ loot = list() butcher_results = list(/obj/item/stack/ore/diamond = 2, /obj/item/stack/sheet/sinew = 2, /obj/item/stack/sheet/bone = 1) -/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize() +/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize(mapload) . = ..() if(prob(1)) new /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/icewing(loc) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm index 20095aa18497..e2808c1f3261 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/drakeling.dm @@ -39,7 +39,7 @@ var/grinding = FALSE var/datum/action/drake_ollie/dollie -/mob/living/simple_animal/hostile/drakeling/Initialize() +/mob/living/simple_animal/hostile/drakeling/Initialize(mapload) . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(0, 8, MOB_LAYER), TEXT_SOUTH = list(0, 8, MOB_LAYER), TEXT_EAST = list(0, 8, MOB_LAYER), TEXT_WEST = list( 0, 8, MOB_LAYER))) @@ -175,7 +175,7 @@ return TRUE ///gets the list of turfs the fire breath attack hits -/mob/living/simple_animal/hostile/drakeling/proc/line_target(var/range, var/atom/at) +/mob/living/simple_animal/hostile/drakeling/proc/line_target(range, atom/at) if(!at) return var/angle = ATAN2(at.x - src.x, at.y - src.y) @@ -188,7 +188,7 @@ return (getline(src, T) - get_turf(src)) ///actual bit that shoots fire for the fire breath attack -/datum/action/cooldown/spell/pointed/drakeling/fire_breath/proc/drakeling_fire_line(var/source, var/list/turfs, var/damage, var/list/protected) +/datum/action/cooldown/spell/pointed/drakeling/fire_breath/proc/drakeling_fire_line(source, list/turfs, damage, list/protected) var/list/hit_list = list() for(var/turf/T in turfs) if(istype(T, /turf/closed)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm index 17afeea61abd..496b7338074f 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/elite.dm @@ -60,7 +60,7 @@ M.attempt_drill() //Elites can't talk (normally)! -/mob/living/simple_animal/hostile/asteroid/elite/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/hostile/asteroid/elite/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) if(can_talk) . = ..() return TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm index caddf3731349..b6911fe6181e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm @@ -110,7 +110,7 @@ var/turf/t = pick_n_take(tentacle_loc) new /obj/effect/temp_visual/goliath_tentacle/broodmother(t, src) -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/tentacle_patch(var/target) +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/tentacle_patch(target) ranged_cooldown = world.time + 15 var/tturf = get_turf(target) if(!isturf(tturf)) @@ -118,7 +118,7 @@ visible_message(span_warning("[src] digs its tentacles under [target]!")) new /obj/effect/temp_visual/goliath_tentacle/broodmother/patch(tturf, src) -/mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/spawn_children(var/target) +/mob/living/simple_animal/hostile/asteroid/elite/broodmother/proc/spawn_children(target) ranged_cooldown = world.time + 40 visible_message(span_boldwarning("The ground churns behind [src]!")) for(var/i in 1 to 2) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 7589e58de585..8a39e45a1c88 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -61,7 +61,7 @@ /mob/living/simple_animal/hostile/asteroid/elite/herald/proc/become_ghost() icon_state = "herald_ghost" -/mob/living/simple_animal/hostile/asteroid/elite/herald/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/hostile/asteroid/elite/herald/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) . = ..() playsound(get_turf(src), 'sound/magic/clockwork/invoke_general.ogg', 20, TRUE) @@ -124,7 +124,7 @@ if(HERALD_MIRROR) herald_mirror() -/mob/living/simple_animal/hostile/asteroid/elite/herald/proc/shoot_projectile(turf/marker, set_angle, var/is_teleshot) +/mob/living/simple_animal/hostile/asteroid/elite/herald/proc/shoot_projectile(turf/marker, set_angle, is_teleshot) var/turf/startloc = get_turf(src) var/obj/item/projectile/herald/H = null if(!is_teleshot) @@ -214,7 +214,7 @@ var/mob/living/simple_animal/hostile/asteroid/elite/herald/my_master = null true_spawn = FALSE -/mob/living/simple_animal/hostile/asteroid/elite/herald/mirror/Initialize() +/mob/living/simple_animal/hostile/asteroid/elite/herald/mirror/Initialize(mapload) ..() toggle_ai(AI_OFF) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm index 444487a7bc50..7510532b0ce7 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/legionnaire.dm @@ -109,7 +109,7 @@ visible_message(span_boldwarning("[src] prepares to charge!")) addtimer(CALLBACK(src, PROC_REF(legionnaire_charge_2), dir_to_target, 0), 5) -/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(var/move_dir, var/times_ran) +/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/proc/legionnaire_charge_2(move_dir, times_ran) if(times_ran >= 4) return var/turf/T = get_step(get_turf(src), move_dir) @@ -288,7 +288,7 @@ duration = 10 color = rgb(0,0,0) -/obj/effect/temp_visual/dragon_swoop/legionnaire/Initialize() +/obj/effect/temp_visual/dragon_swoop/legionnaire/Initialize(mapload) . = ..() transform *= 0.33 @@ -341,7 +341,7 @@ if(ismegafauna(L) || istype(L, /mob/living/simple_animal/hostile/asteroid)) L.apply_damage(fauna_damage_bonus, BRUTE) -/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/attendant/Initialize() +/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/attendant/Initialize(mapload) . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.set_riding_offsets(RIDING_OFFSET_ALL, list(TEXT_NORTH = list(10,40, MOB_LAYER), TEXT_SOUTH = list(-10, 40, MOB_LAYER), TEXT_EAST = list(0, 40, MOB_LAYER), TEXT_WEST = list( 0, 40, MOB_LAYER))) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm index bb930e0461fd..658ab1adc43e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/pandora.dm @@ -113,7 +113,7 @@ var/turf/T = get_step(get_turf(src), dir_to_target) singular_shot_line(sing_shot_length, dir_to_target, T) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot_line(var/procsleft, var/angleused, var/turf/T) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/singular_shot_line(procsleft, angleused, turf/T) if(procsleft <= 0) return new /obj/effect/temp_visual/hierophant/blast/pandora(T, src) @@ -137,7 +137,7 @@ playsound(source,'sound/machines/airlockopen.ogg', 200, 1) addtimer(CALLBACK(src, PROC_REF(pandora_teleport_2), T, source), 0.2 SECONDS) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(var/turf/T, var/turf/source) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_2(turf/T, turf/source) new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src) new /obj/effect/temp_visual/hierophant/telegraph/teleport(source, src) for(var/t in RANGE_TURFS(1, T)) @@ -149,7 +149,7 @@ density = FALSE addtimer(CALLBACK(src, PROC_REF(pandora_teleport_3), T), 0.2 SECONDS) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(var/turf/T) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/pandora_teleport_3(turf/T) forceMove(T) animate(src, alpha = 255, time = 0.2 SECONDS, easing = EASE_IN) //fade IN density = TRUE @@ -162,7 +162,7 @@ var/max_size = 2 addtimer(CALLBACK(src, PROC_REF(aoe_squares_2), T, 0, max_size), 2) -/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(var/turf/T, var/ring, var/max_size) +/mob/living/simple_animal/hostile/asteroid/elite/pandora/proc/aoe_squares_2(turf/T, ring, max_size) if(ring > max_size) return for(var/t in spiral_range_turfs(ring, T)) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm index 5c9048b455cd..f275fb9ab6a1 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm @@ -34,7 +34,7 @@ var/will_burrow = TRUE var/max_loot = 15 // The maximum amount of ore that can be stored in this thing's gut -/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize() +/mob/living/simple_animal/hostile/asteroid/goldgrub/Initialize(mapload) . = ..() var/i = rand(1,3) while(i) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index f4ff72ebd8e7..05b007e5ffdc 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -100,7 +100,7 @@ stat_attack = UNCONSCIOUS robust_searching = 1 -/mob/living/simple_animal/hostile/asteroid/goliath/beast/random/Initialize() +/mob/living/simple_animal/hostile/asteroid/goliath/beast/random/Initialize(mapload) . = ..() if(prob(1)) new /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient(loc) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm index c20f7a76bd17..70c6fbe14160 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/gutlunch.dm @@ -42,7 +42,7 @@ wanted_objects = list(/obj/effect/decal/cleanable/xenoblood/xgibs, /obj/effect/decal/cleanable/blood/gibs/, /obj/item/organ) var/obj/item/udder/gutlunch/udder = null -/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize() +/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize(mapload) udder = new() . = ..() @@ -102,7 +102,7 @@ name = "gubbuck" gender = MALE -/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/Initialize() +/mob/living/simple_animal/hostile/asteroid/gutlunch/gubbuck/Initialize(mapload) . = ..() add_atom_colour(pick("#E39FBB", "#D97D64", "#CF8C4A"), FIXED_COLOUR_PRIORITY) resize = 0.85 @@ -131,7 +131,7 @@ var/growth = 0 //Baby gutlunch -/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch/Initialize() +/mob/living/simple_animal/hostile/asteroid/gutlunch/grublunch/Initialize(mapload) . = ..() add_atom_colour("#9E9E9E", FIXED_COLOUR_PRIORITY) //Somewhat hidden resize = 0.45 @@ -160,7 +160,7 @@ /obj/item/udder/gutlunch name = "nutrient sac" -/obj/item/udder/gutlunch/Initialize() +/obj/item/udder/gutlunch/Initialize(mapload) . = ..() reagents = new(50) reagents.my_atom = src diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index c6b72333c8e6..a7d0ba7379dd 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -85,7 +85,7 @@ pass_flags = PASSTABLE del_on_death = 1 -/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() +/mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize(mapload) . = ..() addtimer(CALLBACK(src, PROC_REF(death)), 100) @@ -127,7 +127,7 @@ var/dwarf_mob = FALSE var/mob/living/carbon/human/stored_mob -/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random/Initialize() +/mob/living/simple_animal/hostile/asteroid/hivelord/legion/random/Initialize(mapload) . = ..() if(prob(5)) new /mob/living/simple_animal/hostile/asteroid/hivelord/legion/dwarf(loc) @@ -283,7 +283,7 @@ lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE -/mob/living/simple_animal/hostile/big_legion/Initialize() +/mob/living/simple_animal/hostile/big_legion/Initialize(mapload) .=..() AddComponent(/datum/component/spawner, list(/mob/living/simple_animal/hostile/asteroid/hivelord/legion), 200, faction, "peels itself off from", 3) @@ -303,7 +303,7 @@ . = ..() H.dna.add_mutation(DWARFISM) -/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize() +/obj/effect/mob_spawn/human/corpse/damaged/legioninfested/Initialize(mapload) var/type = pickweight(list("Miner" = 66, "Ashwalker" = 10, "Golem" = 10,"Clown" = 10, pick(list("Shadow", "YeOlde","Operative", "Cultist")) = 4)) switch(type) if("Miner") @@ -421,7 +421,7 @@ color = "#7422a3" brood_type = /mob/living/simple_animal/hostile/asteroid/hivelordbrood/aide -/mob/living/simple_animal/hostile/asteroid/hivelord/legion/aide/Initialize() +/mob/living/simple_animal/hostile/asteroid/hivelord/legion/aide/Initialize(mapload) . = ..() GLOB.aide_list += src return diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wasp.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wasp.dm index 313e4c1f2d56..27d66184af11 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/wasp.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/wasp.dm @@ -54,7 +54,7 @@ /mob/living/simple_animal/hostile/asteroid/wasp/Aggro() vision_range = aggro_vision_range -/mob/living/simple_animal/hostile/asteroid/wasp/proc/charge(var/atom/chargeat = target, var/delay = 5) +/mob/living/simple_animal/hostile/asteroid/wasp/proc/charge(atom/chargeat = target, delay = 5) if(!chargeat) return var/chargeturf = get_turf(chargeat) diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 1f4f3b651884..d57faa1ee873 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -50,7 +50,7 @@ if(!stat)//Mushrooms slowly regenerate if conscious, for people who want to save them from being eaten adjustBruteLoss(-2) -/mob/living/simple_animal/hostile/mushroom/Initialize()//Makes every shroom a little unique +/mob/living/simple_animal/hostile/mushroom/Initialize(mapload)//Makes every shroom a little unique melee_damage_lower += rand(3, 5) melee_damage_upper += rand(10,20) maxHealth += rand(40,60) diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index 0798389c69e1..5b9d8f16aeb3 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -35,11 +35,11 @@ deathmessage = "wails as its form turns into a pulpy mush." deathsound = 'sound/voice/hiss6.ogg' -/mob/living/simple_animal/hostile/netherworld/migo/Initialize() +/mob/living/simple_animal/hostile/netherworld/migo/Initialize(mapload) . = ..() migo_sounds = list('sound/items/bubblewrap.ogg', 'sound/items/change_jaws.ogg', 'sound/items/crowbar.ogg', 'sound/items/drink.ogg', 'sound/items/deconstruct.ogg', 'sound/items/carhorn.ogg', 'sound/items/change_drill.ogg', 'sound/items/dodgeball.ogg', 'sound/items/eatfood.ogg', 'sound/items/megaphone.ogg', 'sound/items/screwdriver.ogg', 'sound/items/weeoo1.ogg', 'sound/items/wirecutter.ogg', 'sound/items/welder.ogg', 'sound/items/zip.ogg', 'sound/items/rped.ogg', 'sound/items/ratchet.ogg', 'sound/items/polaroid1.ogg', 'sound/items/pshoom.ogg', 'sound/items/airhorn.ogg', 'sound/items/geiger/high1.ogg', 'sound/items/geiger/high2.ogg', 'sound/voice/beepsky/creep.ogg', 'sound/voice/beepsky/iamthelaw.ogg', 'sound/voice/ed209_20sec.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss6.ogg', 'sound/voice/medbot/patchedup.ogg', 'sound/voice/medbot/feelbetter.ogg', 'sound/voice/human/manlaugh1.ogg', 'sound/voice/human/womanlaugh.ogg', 'sound/weapons/sear.ogg', 'sound/ambience/antag/clockcultalr.ogg', 'sound/ambience/antag/ling_aler.ogg', 'sound/ambience/antag/tatoralert.ogg', 'sound/ambience/antag/monkey.ogg', 'sound/mecha/nominal.ogg', 'sound/mecha/weapdestr.ogg', 'sound/mecha/critdestr.ogg', 'sound/mecha/imag_enh.ogg', 'sound/effects/adminhelp.ogg', 'sound/effects/alert.ogg', 'sound/effects/attackblob.ogg', 'sound/effects/bamf.ogg', 'sound/effects/blobattack.ogg', 'sound/effects/break_stone.ogg', 'sound/effects/bubbles.ogg', 'sound/effects/bubbles2.ogg', 'sound/effects/clang.ogg', 'sound/effects/clockcult_gateway_disrupted.ogg', 'sound/effects/clownstep2.ogg', 'sound/effects/curse1.ogg', 'sound/effects/dimensional_rend.ogg', 'sound/effects/doorcreaky.ogg', 'sound/effects/empulse.ogg', 'sound/effects/explosion_distant.ogg', 'sound/effects/explosionfar.ogg', 'sound/effects/explosion1.ogg', 'sound/effects/grillehit.ogg', 'sound/effects/genetics.ogg', 'sound/effects/heart_beat.ogg', 'sound/effects/hyperspace_begin.ogg', 'sound/effects/hyperspace_end.ogg', 'sound/effects/his_grace_awaken.ogg', 'sound/effects/pai_boot.ogg', 'sound/effects/phasein.ogg', 'sound/effects/picaxe1.ogg', 'sound/effects/ratvar_reveal.ogg', 'sound/effects/sparks1.ogg', 'sound/effects/smoke.ogg', 'sound/effects/splat.ogg', 'sound/effects/snap.ogg', 'sound/effects/tendril_destroyed.ogg', 'sound/effects/supermatter.ogg', 'sound/misc/desceration-01.ogg', 'sound/misc/desceration-02.ogg', 'sound/misc/desceration-03.ogg', 'sound/misc/bloblarm.ogg', 'sound/misc/airraid.ogg', 'sound/misc/bang.ogg','sound/misc/highlander.ogg', 'sound/misc/interference.ogg', 'sound/misc/notice1.ogg', 'sound/misc/notice2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/misc/slip.ogg', 'sound/misc/splort.ogg', 'sound/weapons/armbomb.ogg', 'sound/weapons/beam_sniper.ogg', 'sound/weapons/chainsawhit.ogg', 'sound/weapons/emitter.ogg', 'sound/weapons/emitter2.ogg', 'sound/weapons/blade1.ogg', 'sound/weapons/bladeslice.ogg', 'sound/weapons/blastcannon.ogg', 'sound/weapons/blaster.ogg', 'sound/weapons/bulletflyby3.ogg', 'sound/weapons/circsawhit.ogg', 'sound/weapons/cqchit2.ogg', 'sound/weapons/drill.ogg', 'sound/weapons/genhit1.ogg', 'sound/weapons/gunshot_silenced.ogg', 'sound/weapons/gunshot.ogg', 'sound/weapons/handcuffs.ogg', 'sound/weapons/homerun.ogg', 'sound/weapons/kenetic_accel.ogg', 'sound/machines/clockcult/steam_whoosh.ogg', 'sound/machines/fryer/deep_fryer_emerge.ogg', 'sound/machines/airlock.ogg', 'sound/machines/airlock_alien_prying.ogg', 'sound/machines/airlockclose.ogg', 'sound/machines/airlockforced.ogg', 'sound/machines/airlockopen.ogg', 'sound/machines/alarm.ogg', 'sound/machines/blender.ogg', 'sound/machines/boltsdown.ogg', 'sound/machines/boltsup.ogg', 'sound/machines/buzz-sigh.ogg', 'sound/machines/buzz-two.ogg', 'sound/machines/chime.ogg', 'sound/machines/cryo_warning.ogg', 'sound/machines/defib_charge.ogg', 'sound/machines/defib_failed.ogg', 'sound/machines/defib_ready.ogg', 'sound/machines/defib_zap.ogg', 'sound/machines/deniedbeep.ogg', 'sound/machines/ding.ogg', 'sound/machines/disposalflush.ogg', 'sound/machines/door_close.ogg', 'sound/machines/door_open.ogg', 'sound/machines/engine_alert1.ogg', 'sound/machines/engine_alert2.ogg', 'sound/machines/hiss.ogg', 'sound/machines/honkbot_evil_laugh.ogg', 'sound/machines/juicer.ogg', 'sound/machines/ping.ogg', 'sound/ambience/signal.ogg', 'sound/machines/synth_no.ogg', 'sound/machines/synth_yes.ogg', 'sound/machines/terminal_alert.ogg', 'sound/machines/triple_beep.ogg', 'sound/machines/twobeep.ogg', 'sound/machines/ventcrawl.ogg', 'sound/machines/warning-buzzer.ogg', 'sound/ai/default/outbreak5.ogg', 'sound/ai/default/outbreak7.ogg', 'sound/ai/default/poweroff.ogg', 'sound/ai/default/radiation.ogg', 'sound/ai/default/shuttlecalled.ogg', 'sound/ai/default/shuttledock.ogg', 'sound/ai/default/shuttlerecalled.ogg', 'sound/ai/default/aimalf.ogg') //hahahaha fuck you code divers -/mob/living/simple_animal/hostile/netherworld/migo/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/hostile/netherworld/migo/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) ..() if(stat) return @@ -136,7 +136,7 @@ mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody, /mob/living/simple_animal/hostile/netherworld/fcult/wretch, /mob/living/simple_animal/hostile/netherworld/fcult/pentarox) faction = list("nether") -/obj/structure/spawner/nether/Initialize() +/obj/structure/spawner/nether/Initialize(mapload) .=..() START_PROCESSING(SSprocessing, src) diff --git a/code/modules/mob/living/simple_animal/hostile/rat.dm b/code/modules/mob/living/simple_animal/hostile/rat.dm index 21fb82b84e40..d7ff628709cd 100644 --- a/code/modules/mob/living/simple_animal/hostile/rat.dm +++ b/code/modules/mob/living/simple_animal/hostile/rat.dm @@ -29,7 +29,7 @@ /mob/living/simple_animal/hostile/rat/loan faction = list("hostile") -/mob/living/simple_animal/hostile/rat/Initialize() +/mob/living/simple_animal/hostile/rat/Initialize(mapload) . = ..() language_holder += new /datum/language_holder/mouse(src) AddComponent(/datum/component/squeak, list('sound/effects/mousesqueek.ogg'=1), 100) diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm index 272aec419480..9ea668a203db 100644 --- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm +++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm @@ -30,7 +30,7 @@ var/opening_airlock = FALSE ///Number assigned to rats and mice, checked when determining infighting. -/mob/living/simple_animal/hostile/regalrat/Initialize() +/mob/living/simple_animal/hostile/regalrat/Initialize(mapload) . = ..() riot = new /datum/action/cooldown/riot domain = new /datum/action/cooldown/domain @@ -273,7 +273,7 @@ /mob/living/simple_animal/hostile/regalrat/controlled name = "regal rat" -/mob/living/simple_animal/hostile/regalrat/controlled/Initialize() +/mob/living/simple_animal/hostile/regalrat/controlled/Initialize(mapload) . = ..() INVOKE_ASYNC(src, PROC_REF(get_player)) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm index 56708b7bb039..8512c666eac4 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm @@ -27,7 +27,7 @@ gold_core_spawnable = HOSTILE_SPAWN var/stepped_sound = 'sound/effects/huuu.ogg' -/mob/living/simple_animal/hostile/retaliate/frog/Initialize() +/mob/living/simple_animal/hostile/retaliate/frog/Initialize(mapload) . = ..() if(prob(1)) name = "rare frog" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm index 25621a8ff420..2bb8f9d85b1f 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm @@ -42,7 +42,7 @@ var/mutable_appearance/ghost_facial_hair var/random = TRUE //if you want random names for ghosts or not -/mob/living/simple_animal/hostile/retaliate/ghost/Initialize() +/mob/living/simple_animal/hostile/retaliate/ghost/Initialize(mapload) . = ..() give_hair() if(random) diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index fb6de2da48ca..c192919cd07b 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -121,6 +121,6 @@ attack_sound = 'sound/weapons/sonic_jackhammer.ogg' loot = list(/obj/effect/decal/remains/plasma, /obj/item/pickaxe/drill/jackhammer) -/mob/living/simple_animal/hostile/skeleton/plasmaminer/Initialize() +/mob/living/simple_animal/hostile/skeleton/plasmaminer/Initialize(mapload) . = ..() set_light(2) diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 1fb52efb60a2..7643131c38b4 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -270,7 +270,7 @@ * Arguments: * * atom/at - The target */ -/mob/living/simple_animal/hostile/space_dragon/proc/fire_stream(var/atom/at = target) +/mob/living/simple_animal/hostile/space_dragon/proc/fire_stream(atom/at = target) playsound(get_turf(src),'sound/magic/fireball.ogg', 200, TRUE) var/range = 20 var/list/turfs = list() diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm index 0eeff30b331e..b917ec981773 100644 --- a/code/modules/mob/living/simple_animal/hostile/statue.dm +++ b/code/modules/mob/living/simple_animal/hostile/statue.dm @@ -56,7 +56,7 @@ // No movement while seen code. -/mob/living/simple_animal/hostile/statue/Initialize(mapload, var/mob/living/creator) +/mob/living/simple_animal/hostile/statue/Initialize(mapload, mob/living/creator) . = ..() // Give spells @@ -141,7 +141,7 @@ // Cannot talk -/mob/living/simple_animal/hostile/statue/say(message, bubble_type, var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/hostile/statue/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) return 0 // Turn to dust when gibbed diff --git a/code/modules/mob/living/simple_animal/hostile/stickman.dm b/code/modules/mob/living/simple_animal/hostile/stickman.dm index 74396f41fe8c..6f5269d8917b 100644 --- a/code/modules/mob/living/simple_animal/hostile/stickman.dm +++ b/code/modules/mob/living/simple_animal/hostile/stickman.dm @@ -52,7 +52,7 @@ icon_dead = "stickdog_dead" mob_biotypes = list(MOB_INORGANIC, MOB_BEAST) -/mob/living/simple_animal/hostile/stickman/Initialize(mapload, var/wizard_summoned) +/mob/living/simple_animal/hostile/stickman/Initialize(mapload, wizard_summoned) . = ..() new /obj/effect/temp_visual/paper_scatter(src) summoned_by_wizard = wizard_summoned diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 0904ce8c61c2..c7cd88265dce 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -66,7 +66,7 @@ speed = 1 spacewalk = TRUE -/mob/living/simple_animal/hostile/syndicate/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/space/Initialize(mapload) . = ..() set_light(4) @@ -101,7 +101,7 @@ spacewalk = TRUE projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/melee/space/Initialize(mapload) . = ..() set_light(4) @@ -126,7 +126,7 @@ var/obj/effect/light_emitter/red_energy_sword/sord projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/sword/Initialize() +/mob/living/simple_animal/hostile/syndicate/melee/sword/Initialize(mapload) . = ..() set_light(2) @@ -152,7 +152,7 @@ spacewalk = TRUE projectile_deflect_chance = 50 -/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/melee/sword/space/Initialize(mapload) . = ..() sord = new(src) set_light(4) @@ -198,7 +198,7 @@ speed = 1 spacewalk = TRUE -/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/ranged/space/Initialize(mapload) . = ..() set_light(4) @@ -231,7 +231,7 @@ speed = 1 spacewalk = TRUE -/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/ranged/smg/space/Initialize(mapload) . = ..() set_light(4) @@ -261,7 +261,7 @@ speed = 1 spacewalk = TRUE -/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize() +/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space/Initialize(mapload) . = ..() set_light(4) @@ -318,6 +318,6 @@ del_on_death = 1 deathmessage = "is smashed into pieces!" -/mob/living/simple_animal/hostile/viscerator/Initialize() +/mob/living/simple_animal/hostile/viscerator/Initialize(mapload) . = ..() AddComponent(/datum/component/swarming) diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index eacb50d0114e..4a0f6cde14ad 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -24,7 +24,7 @@ /// The countdown ghosts see to when the plant will hatch var/obj/effect/countdown/flower_bud/countdown -/obj/structure/alien/resin/flower_bud_enemy/Initialize() +/obj/structure/alien/resin/flower_bud_enemy/Initialize(mapload) . = ..() countdown = new(src) var/list/anchors = list() diff --git a/code/modules/mob/living/simple_animal/hostile/wizard.dm b/code/modules/mob/living/simple_animal/hostile/wizard.dm index 2527c1d7156b..fa43093f8cef 100644 --- a/code/modules/mob/living/simple_animal/hostile/wizard.dm +++ b/code/modules/mob/living/simple_animal/hostile/wizard.dm @@ -42,7 +42,7 @@ do_footstep = TRUE -/mob/living/simple_animal/hostile/wizard/Initialize() +/mob/living/simple_animal/hostile/wizard/Initialize(mapload) . = ..() var/obj/item/implant/exile/exiled = new /obj/item/implant/exile(src) exiled.implant(src) @@ -148,7 +148,7 @@ /obj/item/projectile/magic/teleport, /obj/item/projectile/magic/door, /obj/item/projectile/magic/spellblade, /obj/item/projectile/magic/arcane_barrage) -/mob/living/simple_animal/hostile/academywizard/chaos/Initialize() +/mob/living/simple_animal/hostile/academywizard/chaos/Initialize(mapload) projectiletype = pick(allowed_projectile_types) . = ..() diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index e8c5a0aca1ad..df130138baec 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -37,7 +37,7 @@ var/datum/action/innate/fugu/expand/E loot = list(/obj/item/fugu_gland{layer = ABOVE_MOB_LAYER}) -/mob/living/simple_animal/hostile/asteroid/fugu/Initialize() +/mob/living/simple_animal/hostile/asteroid/fugu/Initialize(mapload) . = ..() E = new E.Grant(src) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index 5f64f4f56d22..2de71f805f12 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -99,7 +99,7 @@ var/obj/item/held_item = null -/mob/living/simple_animal/parrot/Initialize() +/mob/living/simple_animal/parrot/Initialize(mapload) . = ..() if(!ears) var/headset = pick(/obj/item/radio/headset/headset_sec, \ @@ -871,7 +871,7 @@ var/longest_survival = 0 var/longest_deathstreak = 0 -/mob/living/simple_animal/parrot/Poly/Initialize() +/mob/living/simple_animal/parrot/Poly/Initialize(mapload) ears = new /obj/item/radio/headset/headset_eng(src) available_channels = list(":e") Read_Memory() @@ -967,7 +967,7 @@ sentience_type = SENTIENCE_BOSS butcher_results = list(/obj/item/ectoplasm = 1) -/mob/living/simple_animal/parrot/Poly/ghost/Initialize() +/mob/living/simple_animal/parrot/Poly/ghost/Initialize(mapload) LoadComponent(/datum/component/walk/jaunt) memory_saved = TRUE //At this point nothing is saved . = ..() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index aeb129cc76b4..7e56049b2801 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -106,7 +106,7 @@ var/music_component = null var/music_path = null -/mob/living/simple_animal/Initialize() +/mob/living/simple_animal/Initialize(mapload) . = ..() GLOB.simple_animals[AIStatus] += src if(gender == PLURAL) @@ -176,7 +176,7 @@ turns_since_move = 0 return 1 -/mob/living/simple_animal/proc/handle_automated_speech(var/override) +/mob/living/simple_animal/proc/handle_automated_speech(override) set waitfor = FALSE if(speak_chance) if(prob(speak_chance) || override) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1de264570412..12c2fda13881 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -68,7 +68,7 @@ * * set a random nutrition level * * Intialize the movespeed of the mob */ -/mob/Initialize() +/mob/Initialize(mapload) SEND_GLOBAL_SIGNAL(COMSIG_GLOB_MOB_CREATED, src) add_to_mob_list() if(stat == DEAD) @@ -992,7 +992,7 @@ return mind.grab_ghost(force = force) ///Notify a ghost that it's body is being cloned -/mob/proc/notify_ghost_cloning(var/message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", var/sound = 'sound/effects/genetics.ogg', var/atom/source = null, flashwindow) +/mob/proc/notify_ghost_cloning(message = "Someone is trying to revive you. Re-enter your corpse if you want to be revived!", sound = 'sound/effects/genetics.ogg', atom/source = null, flashwindow) var/mob/dead/observer/ghost = get_ghost() if(ghost) ghost.notify_cloning(message, sound, source, flashwindow) @@ -1348,11 +1348,11 @@ H.open_language_menu(usr) ///Adjust the nutrition of a mob -/mob/proc/adjust_nutrition(var/change) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks +/mob/proc/adjust_nutrition(change) //Honestly FUCK the oldcoders for putting nutrition on /mob someone else can move it up because holy hell I'd have to fix SO many typechecks nutrition = max(0, nutrition + change) ///Force set the mob nutrition -/mob/proc/set_nutrition(var/change) //Seriously fuck you oldcoders. +/mob/proc/set_nutrition(change) //Seriously fuck you oldcoders. nutrition = max(0, change) /mob/proc/set_stat(new_stat) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 28a437a7692f..77a3791fac58 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -391,7 +391,7 @@ * * notify_suiciders If it should notify suiciders (who do not qualify for many ghost roles) * * notify_volume How loud the sound should be to spook the user */ -/proc/notify_ghosts(var/message, var/ghost_sound = null, var/enter_link = null, var/atom/source = null, var/mutable_appearance/alert_overlay = null, var/action = NOTIFY_JUMP, flashwindow = TRUE, ignore_mapload = TRUE, ignore_key, header = null, notify_suiciders = TRUE, var/notify_volume = 100) //Easy notification of ghosts. +/proc/notify_ghosts(message, ghost_sound = null, enter_link = null, atom/source = null, mutable_appearance/alert_overlay = null, action = NOTIFY_JUMP, flashwindow = TRUE, ignore_mapload = TRUE, ignore_key, header = null, notify_suiciders = TRUE, notify_volume = 100) //Easy notification of ghosts. if(ignore_mapload && SSatoms.initialized != INITIALIZATION_INNEW_REGULAR) //don't notify for objects created during a map load return for(var/mob/dead/observer/O in GLOB.player_list) @@ -446,7 +446,7 @@ return FALSE ///Is the passed in mob an admin ghost -/proc/IsAdminGhost(var/mob/user) +/proc/IsAdminGhost(mob/user) if(!user) //Are they a mob? Auto interface updates call this with a null src return if(!user.client) // Do they have a client? diff --git a/code/modules/mob/mob_lists.dm b/code/modules/mob/mob_lists.dm index a598d6be8155..dd98a22bceae 100644 --- a/code/modules/mob/mob_lists.dm +++ b/code/modules/mob/mob_lists.dm @@ -1,4 +1,4 @@ -///Adds the mob reference to the list and directory of all mobs. Called on Initialize(). +///Adds the mob reference to the list and directory of all mobs. Called on Initialize(mapload). /mob/proc/add_to_mob_list() GLOB.mob_list |= src GLOB.mob_directory[tag] = src diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 2f29088c8d51..5baae6ee9b54 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -100,7 +100,7 @@ usr.emote("me",1,message,TRUE) ///Speak as a dead person (ghost etc) -/mob/proc/say_dead(var/message) +/mob/proc/say_dead(message) var/name = real_name var/alt_name = "" diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 0764f2aa2654..8f30343f0aaf 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -89,7 +89,7 @@ var/list/interact_sounds = list('sound/machines/computers/keypress1.ogg', 'sound/machines/computers/keypress2.ogg', 'sound/machines/computers/keypress3.ogg', 'sound/machines/computers/keypress4.ogg', 'sound/machines/computers/keystroke1.ogg', 'sound/machines/computers/keystroke2.ogg', 'sound/machines/computers/keystroke3.ogg', 'sound/machines/computers/keystroke4.ogg') -/obj/item/modular_computer/Initialize() +/obj/item/modular_computer/Initialize(mapload) . = ..() START_PROCESSING(SSobj, src) if(!physical) diff --git a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm index 6ed9dfbfecc6..697200c12ba5 100644 --- a/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm +++ b/code/modules/modular_computers/computers/item/integrated_tablet/integrated_tablet.dm @@ -109,7 +109,7 @@ device_theme = "syndicate" -/obj/item/modular_computer/tablet/integrated/syndicate/Initialize() +/obj/item/modular_computer/tablet/integrated/syndicate/Initialize(mapload) . = ..() if(istype(borgo, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = borgo diff --git a/code/modules/modular_computers/computers/item/laptop/laptop.dm b/code/modules/modular_computers/computers/item/laptop/laptop.dm index 8dbb3472a44c..bbdcdb815ae1 100644 --- a/code/modules/modular_computers/computers/item/laptop/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop/laptop.dm @@ -27,7 +27,7 @@ if(screen_on) . += span_notice("Alt-click to close it.") -/obj/item/modular_computer/laptop/Initialize() +/obj/item/modular_computer/laptop/Initialize(mapload) . = ..() if(start_open && !screen_on) diff --git a/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm b/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm index 0b5e18df4fec..6c21fdf9aba1 100644 --- a/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm +++ b/code/modules/modular_computers/computers/item/laptop/laptop_presets.dm @@ -9,7 +9,7 @@ desc = "A low-end laptop often used for personal recreation." /obj/item/modular_computer/laptop/preset/paramedic//not actually given to a paramedic, just a base-line for the brig phys and mining medic laptops -/obj/item/modular_computer/laptop/preset/paramedic/Initialize() +/obj/item/modular_computer/laptop/preset/paramedic/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/crew_monitor, new /datum/computer_file/program/radar/lifeline @@ -18,7 +18,7 @@ /obj/item/modular_computer/laptop/preset/paramedic/brig_physician desc = "A low-end laptop often used by brig physicians." -/obj/item/modular_computer/laptop/preset/paramedic/brig_physician/Initialize() +/obj/item/modular_computer/laptop/preset/paramedic/brig_physician/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/secureye ) @@ -32,7 +32,7 @@ /obj/item/computer_hardware/network_card/advanced, /obj/item/computer_hardware/card_slot) -/obj/item/modular_computer/laptop/preset/paramedic/mining_medic/Initialize() +/obj/item/modular_computer/laptop/preset/paramedic/mining_medic/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/secureye/mining ) diff --git a/code/modules/modular_computers/computers/item/pda/pda_presets.dm b/code/modules/modular_computers/computers/item/pda/pda_presets.dm index 93f39f22478c..bc3cb7c3956d 100644 --- a/code/modules/modular_computers/computers/item/pda/pda_presets.dm +++ b/code/modules/modular_computers/computers/item/pda/pda_presets.dm @@ -17,21 +17,21 @@ /obj/item/computer_hardware/card_slot, /obj/item/computer_hardware/sensorpackage ) -/obj/item/modular_computer/tablet/pda/preset/chem/Initialize() +/obj/item/modular_computer/tablet/pda/preset/chem/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/chemscan ) . = ..() /obj/item/modular_computer/tablet/pda/preset/medical -/obj/item/modular_computer/tablet/pda/preset/medical/Initialize() +/obj/item/modular_computer/tablet/pda/preset/medical/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/crew_monitor ) . = ..() /obj/item/modular_computer/tablet/pda/preset/paramed -/obj/item/modular_computer/tablet/pda/preset/paramed/Initialize() +/obj/item/modular_computer/tablet/pda/preset/paramed/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/crew_monitor, new /datum/computer_file/program/radar/lifeline @@ -39,7 +39,7 @@ . = ..() /obj/item/modular_computer/tablet/pda/preset/engineering -/obj/item/modular_computer/tablet/pda/preset/engineering/Initialize() +/obj/item/modular_computer/tablet/pda/preset/engineering/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/alarm_monitor, new /datum/computer_file/program/supermatter_monitor, @@ -48,21 +48,21 @@ . = ..() /obj/item/modular_computer/tablet/pda/preset/warden -/obj/item/modular_computer/tablet/pda/preset/warden/Initialize() +/obj/item/modular_computer/tablet/pda/preset/warden/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/secureye, ) . = ..() /obj/item/modular_computer/tablet/pda/preset/robo -/obj/item/modular_computer/tablet/pda/preset/robo/Initialize() +/obj/item/modular_computer/tablet/pda/preset/robo/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/robocontrol, ) . = ..() /obj/item/modular_computer/tablet/pda/preset/cargo -/obj/item/modular_computer/tablet/pda/preset/cargo/Initialize() +/obj/item/modular_computer/tablet/pda/preset/cargo/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/bounty_board, new /datum/computer_file/program/budgetorders, @@ -78,7 +78,7 @@ /obj/item/computer_hardware/card_slot, /obj/item/computer_hardware/sensorpackage) -/obj/item/modular_computer/tablet/pda/preset/basic/atmos/Initialize() +/obj/item/modular_computer/tablet/pda/preset/basic/atmos/Initialize(mapload) starting_files |= list( new /datum/computer_file/program/atmosscan, new /datum/computer_file/program/alarm_monitor, @@ -98,7 +98,7 @@ finish_color = "pink" pen_type = /obj/item/toy/crayon/rainbow -/obj/item/modular_computer/tablet/pda/preset/basic/clown/Initialize() +/obj/item/modular_computer/tablet/pda/preset/basic/clown/Initialize(mapload) . = ..() AddComponent(/datum/component/slippery, 120, NO_SLIP_WHEN_WALKING) @@ -106,7 +106,7 @@ /obj/item/modular_computer/tablet/pda/preset/basic/syndicate desc = "A standard issue PDA often given to syndicate agents." -/obj/item/modular_computer/tablet/pda/preset/basic/syndicate/Initialize() +/obj/item/modular_computer/tablet/pda/preset/basic/syndicate/Initialize(mapload) . = ..() obj_flags |= EMAGGED //starts emagged starting_files |= list( diff --git a/code/modules/modular_computers/computers/item/phone/phone_presets.dm b/code/modules/modular_computers/computers/item/phone/phone_presets.dm index bc7f386e0959..a799ef900c58 100644 --- a/code/modules/modular_computers/computers/item/phone/phone_presets.dm +++ b/code/modules/modular_computers/computers/item/phone/phone_presets.dm @@ -46,7 +46,7 @@ finish_color = "yellow" pen_type = /obj/item/pen/fountain/captain -/obj/item/modular_computer/tablet/phone/preset/advanced/command/cap/Initialize() +/obj/item/modular_computer/tablet/phone/preset/advanced/command/cap/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_TABLET_CHECK_DETONATE, PROC_REF(pda_no_detonate)) diff --git a/code/modules/modular_computers/computers/item/tablet/tablet.dm b/code/modules/modular_computers/computers/item/tablet/tablet.dm index e1d9f279d25f..81e483c3dc95 100644 --- a/code/modules/modular_computers/computers/item/tablet/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet/tablet.dm @@ -24,7 +24,7 @@ var/obj/item/pen_type = /obj/item/pen var/obj/item/inserted_item -/obj/item/modular_computer/tablet/Initialize() +/obj/item/modular_computer/tablet/Initialize(mapload) . = ..() inserted_item = new pen_type(src) diff --git a/code/modules/modular_computers/computers/machinery/console/modular_console.dm b/code/modules/modular_computers/computers/machinery/console/modular_console.dm index fd5d35c8329a..29275d051998 100644 --- a/code/modules/modular_computers/computers/machinery/console/modular_console.dm +++ b/code/modules/modular_computers/computers/machinery/console/modular_console.dm @@ -18,7 +18,7 @@ integrity_failure = 150 var/console_department = "" // Used in New() to set network tag according to our area. -/obj/machinery/modular_computer/console/Initialize() +/obj/machinery/modular_computer/console/Initialize(mapload) . = ..() var/obj/item/computer_hardware/battery/battery_module = cpu.all_components[MC_CELL] if(battery_module) diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index 73ad7713bd36..02e8b67c8cc1 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -38,7 +38,7 @@ var/obj/item/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things. -/obj/machinery/modular_computer/Initialize() +/obj/machinery/modular_computer/Initialize(mapload) . = ..() cpu = new(src) cpu.physical = src @@ -119,7 +119,7 @@ if(cpu) return cpu.screwdriver_act(user, tool) -/obj/machinery/modular_computer/attackby(var/obj/item/W as obj, mob/user) +/obj/machinery/modular_computer/attackby(obj/item/W as obj, mob/user) if(user.a_intent == INTENT_HELP && cpu && !(flags_1 & NODECONSTRUCT_1)) return cpu.attackby(W, user) return ..() diff --git a/code/modules/modular_computers/computers/machinery/telescreen/telescreen.dm b/code/modules/modular_computers/computers/machinery/telescreen/telescreen.dm index 5f22630868c0..0059a042c9d9 100644 --- a/code/modules/modular_computers/computers/machinery/telescreen/telescreen.dm +++ b/code/modules/modular_computers/computers/machinery/telescreen/telescreen.dm @@ -14,7 +14,7 @@ steel_sheet_cost = 3 interact_sounds = list('sound/machines/computers/pda_click.ogg') -/obj/machinery/modular_computer/telescreen/attackby(var/obj/item/W as obj, var/mob/user as mob) +/obj/machinery/modular_computer/telescreen/attackby(obj/item/W as obj, mob/user as mob) if(W.tool_behaviour == TOOL_CROWBAR) if(cpu.all_components.len) to_chat(user, span_warning("Remove all components from \the [src] before unsecuring it.")) diff --git a/code/modules/modular_computers/computers/machinery/telescreen/telescreen_presets.dm b/code/modules/modular_computers/computers/machinery/telescreen/telescreen_presets.dm index 77e9a636f2d9..5345668e7950 100644 --- a/code/modules/modular_computers/computers/machinery/telescreen/telescreen_presets.dm +++ b/code/modules/modular_computers/computers/machinery/telescreen/telescreen_presets.dm @@ -5,7 +5,7 @@ /obj/item/computer_hardware/hard_drive/small, /obj/item/computer_hardware/network_card) -/obj/machinery/modular_computer/telescreen/preset/Initialize() +/obj/machinery/modular_computer/telescreen/preset/Initialize(mapload) . = ..() cpu.enabled = TRUE diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 0daf31715c19..b7d3163581b3 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -121,7 +121,7 @@ *transfer, if TRUE and access_to_check is null, will tell this proc to use the program's transfer_access in place of access_to_check *access can contain a list of access numbers to check against. If access is not empty, it will be used istead of checking any inserted ID. */ -/datum/computer_file/program/proc/can_run(mob/user, loud = FALSE, access_to_check, transfer = FALSE, var/list/access) +/datum/computer_file/program/proc/can_run(mob/user, loud = FALSE, access_to_check, transfer = FALSE, list/access) // Defaults to required_access if(!access_to_check) if(transfer && transfer_access) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm index a9cbb7162c1a..b5129207bd4f 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm @@ -17,7 +17,7 @@ var/assigned = FALSE var/first_load = TRUE -/datum/computer_file/program/contract_uplink/run_program(var/mob/living/user) +/datum/computer_file/program/contract_uplink/run_program(mob/living/user) . = ..(user) /datum/computer_file/program/contract_uplink/ui_act(action, params) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 4c82eeb5f235..28aa6d769e9c 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -13,7 +13,7 @@ var/armed = 0 -/datum/computer_file/program/revelation/run_program(var/mob/living/user) +/datum/computer_file/program/revelation/run_program(mob/living/user) . = ..(user) if(armed) activate() diff --git a/code/modules/modular_computers/file_system/programs/paperworkprinter.dm b/code/modules/modular_computers/file_system/programs/paperworkprinter.dm index 3a4b4ea155dc..83b6f7944f62 100644 --- a/code/modules/modular_computers/file_system/programs/paperworkprinter.dm +++ b/code/modules/modular_computers/file_system/programs/paperworkprinter.dm @@ -40,7 +40,7 @@ break -/datum/computer_file/program/paperwork_printer/proc/print(var/obj/item/paper/paperwork/T) +/datum/computer_file/program/paperwork_printer/proc/print(obj/item/paper/paperwork/T) var/obj/item/computer_hardware/printer/printer if(computer) printer = computer.all_components[MC_PRINT] diff --git a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm index 9ee990c7a535..d5bfdd0156c0 100644 --- a/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/supply/budgetordering.dm @@ -31,7 +31,7 @@ /datum/computer_file/program/budgetorders/proc/get_export_categories() . = EXPORT_CARGO -/datum/computer_file/program/budgetorders/proc/is_visible_pack(mob/user, paccess_to_check, var/list/access, var/contraband) +/datum/computer_file/program/budgetorders/proc/is_visible_pack(mob/user, paccess_to_check, list/access, contraband) if(issilicon(user)) //Borgs can't buy things. return FALSE if(emagged) diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 8cb9b430951b..05ba093d4cff 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -34,7 +34,7 @@ /// What define is used to qualify this piece of hardware? Important for upgraded versions of the same hardware. var/device_type -/obj/item/computer_hardware/New(var/obj/L) +/obj/item/computer_hardware/New(obj/L) ..() pixel_x = rand(-8, 8) pixel_y = rand(-8, 8) @@ -69,7 +69,7 @@ return TRUE /// Called on multitool click, prints diagnostic information to the user. -/obj/item/computer_hardware/proc/diagnostics(var/mob/user) +/obj/item/computer_hardware/proc/diagnostics(mob/user) to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]") /// Handles damage checks @@ -86,7 +86,7 @@ return TRUE // Good to go. -/obj/item/computer_hardware/examine(var/mob/user) +/obj/item/computer_hardware/examine(mob/user) . = ..() if(damage > damage_failure) . += span_danger("It seems to be severely damaged!") diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 7646bf7e6c82..848af8ce5200 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -22,14 +22,14 @@ . = ..() . += span_notice("It has [max_capacity] GQ of storage capacity.") -/obj/item/computer_hardware/hard_drive/diagnostics(var/mob/user) +/obj/item/computer_hardware/hard_drive/diagnostics(mob/user) ..() // 999 is a byond limit that is in place. It's unlikely someone will reach that many files anyway, since you would sooner run out of space. to_chat(user, "NT-NFS File Table Status: [stored_files.len]/999") to_chat(user, "Storage capacity: [used_capacity]/[max_capacity]GQ") // Use this proc to add file to the drive. Returns the file on success and FALSE on failure. Contains necessary sanity checks. -/obj/item/computer_hardware/hard_drive/proc/store_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/store_file(datum/computer_file/F) if(!F || !istype(F)) return FALSE @@ -57,7 +57,7 @@ return F // Use this proc to remove file from the drive. Returns TRUE on success and FALSE on failure. Contains necessary sanity checks. -/obj/item/computer_hardware/hard_drive/proc/remove_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/remove_file(datum/computer_file/F) if(!F || !istype(F)) return FALSE @@ -83,7 +83,7 @@ used_capacity = total_size // Checks whether file can be stored on the hard drive. We can only store unique files, so this checks whether we wouldn't get a duplicity by adding a file. -/obj/item/computer_hardware/hard_drive/proc/can_store_file(var/datum/computer_file/F) +/obj/item/computer_hardware/hard_drive/proc/can_store_file(datum/computer_file/F) if(!F || !istype(F)) return FALSE @@ -106,7 +106,7 @@ // Tries to find the file by filename. Returns null on failure -/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(var/filename) +/obj/item/computer_hardware/hard_drive/proc/find_file_by_name(filename) if(!check_functionality()) return null @@ -127,7 +127,7 @@ stored_files = null return ..() -/obj/item/computer_hardware/hard_drive/Initialize() +/obj/item/computer_hardware/hard_drive/Initialize(mapload) . = ..() install_default_programs() diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index 834b6028139a..390ac4ec582d 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -11,7 +11,7 @@ device_type = MC_NET var/global/ntnet_card_uid = 1 -/obj/item/computer_hardware/network_card/diagnostics(var/mob/user) +/obj/item/computer_hardware/network_card/diagnostics(mob/user) ..() to_chat(user, "NIX Unique ID: [identification_id]") to_chat(user, "NIX User Tag: [identification_string]") @@ -22,7 +22,7 @@ if(ethernet) to_chat(user, "OpenEth (Physical Connection) - Physical network connection port") -/obj/item/computer_hardware/network_card/New(var/l) +/obj/item/computer_hardware/network_card/New(l) ..() identification_id = ntnet_card_uid++ @@ -31,7 +31,7 @@ return "[identification_string] (NID [identification_id])" // 0 - No signal, 1 - Low signal, 2 - High signal. 3 - Wired Connection -/obj/item/computer_hardware/network_card/proc/get_signal(var/specific_action = 0) +/obj/item/computer_hardware/network_card/proc/get_signal(specific_action = 0) if(!holder) // Hardware is not installed in anything. No signal. How did this even get called? return 0 diff --git a/code/modules/modular_computers/hardware/portable_disk.dm b/code/modules/modular_computers/hardware/portable_disk.dm index 61220b49365d..0563c1e88b95 100644 --- a/code/modules/modular_computers/hardware/portable_disk.dm +++ b/code/modules/modular_computers/hardware/portable_disk.dm @@ -86,7 +86,7 @@ if(IS_JOB(user, "Network Admin")) . += span_notice("It appears to be rigged with explosives!") -/obj/item/computer_hardware/hard_drive/portable/syndicate/trap/diagnostics(var/mob/user) +/obj/item/computer_hardware/hard_drive/portable/syndicate/trap/diagnostics(mob/user) ..() to_chat(user, "Payload Status: TRIGGERED!") // A little too late trigger() diff --git a/code/modules/modular_computers/hardware/printer.dm b/code/modules/modular_computers/hardware/printer.dm index 5f5fa75d1eb8..4266a46127cd 100644 --- a/code/modules/modular_computers/hardware/printer.dm +++ b/code/modules/modular_computers/hardware/printer.dm @@ -18,7 +18,7 @@ . += span_notice("Paper level: [stored_paper]/[max_paper].") -/obj/item/computer_hardware/printer/proc/print_text(var/text_to_print, var/paper_title = "", var/do_encode = TRUE) +/obj/item/computer_hardware/printer/proc/print_text(text_to_print, paper_title = "", do_encode = TRUE) if(!stored_paper) return FALSE if(!check_functionality()) diff --git a/code/modules/music/music.dm b/code/modules/music/music.dm index f959988c6a75..538e523b1e58 100644 --- a/code/modules/music/music.dm +++ b/code/modules/music/music.dm @@ -195,7 +195,7 @@ music_path = _music_path START_PROCESSING(SSprocessing, src) -/datum/component/music_player/proc/do_range_check(var/fade_time = fade_in_time) +/datum/component/music_player/proc/do_range_check(fade_time = fade_in_time) if(!music_path) return var/shared = FALSE diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 0dfa6f4848ce..83d559175094 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -34,7 +34,7 @@ var/datum/action/innate/dash/ninja/jaunt var/dash_toggled = TRUE -/obj/item/energy_katana/Initialize() +/obj/item/energy_katana/Initialize(mapload) . = ..() jaunt = new(src) spark_system = new /datum/effect_system/spark_spread() diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm index d222dbf74e2d..a705d29df522 100644 --- a/code/modules/ninja/suit/suit.dm +++ b/code/modules/ninja/suit/suit.dm @@ -60,7 +60,7 @@ Contents: /obj/item/clothing/suit/space/space_ninja/get_cell() return cell -/obj/item/clothing/suit/space/space_ninja/Initialize() +/obj/item/clothing/suit/space/space_ninja/Initialize(mapload) . = ..() //Spark Init diff --git a/code/modules/ninja/suit/suit_initialisation.dm b/code/modules/ninja/suit/suit_initialisation.dm index 2306c8985658..1ca6aa9560f5 100644 --- a/code/modules/ninja/suit/suit_initialisation.dm +++ b/code/modules/ninja/suit/suit_initialisation.dm @@ -3,12 +3,12 @@ to_chat(loc, "[span_userdanger("ERROR")]: You cannot use this function at this time.") return FALSE if(s_initialized) - deinitialize() + deInitialize() else - ninitialize() + nInitialize() . = TRUE -/obj/item/clothing/suit/space/space_ninja/proc/ninitialize(delay = s_delay, mob/living/carbon/human/U = loc) +/obj/item/clothing/suit/space/space_ninja/proc/nInitialize(delay = s_delay, mob/living/carbon/human/U = loc) if(!U.mind) return //Not sure how this could happen. s_busy = TRUE @@ -53,7 +53,7 @@ -/obj/item/clothing/suit/space/space_ninja/proc/deinitialize(delay = s_delay) +/obj/item/clothing/suit/space/space_ninja/proc/deInitialize(delay = s_delay) if(affecting==loc) var/mob/living/carbon/human/U = affecting if(alert("Are you certain you wish to remove the suit? This will take time and remove all abilities.",,"Yes","No")=="No") diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 37ff574f43e5..82cc9c8f249a 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -16,7 +16,7 @@ user.visible_message(span_suicide("[user] begins putting [user.p_their()] head into the clip of \the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) return BRUTELOSS//the clipboard's clip is very strong. industrial duty. can kill a man easily. -/obj/item/clipboard/Initialize() +/obj/item/clipboard/Initialize(mapload) update_icon() . = ..() diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 3d2d79b29d82..311c6a3cfee3 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) var/department = "Unknown" // our department var/destination = "Central Command" // the department we're sending to -/obj/machinery/photocopier/faxmachine/Initialize() +/obj/machinery/photocopier/faxmachine/Initialize(mapload) . = ..() GLOB.allfaxes += src if( !((department in GLOB.alldepartments) || (department in GLOB.admin_departments)) ) @@ -97,7 +97,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) return return FALSE -/obj/machinery/photocopier/faxmachine/proc/sendfax(var/destination) +/obj/machinery/photocopier/faxmachine/proc/sendfax(destination) if(stat & (BROKEN|NOPOWER)) return use_power(200) @@ -110,7 +110,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) else visible_message("[src] beeps, \"Error transmitting message.\"") -/obj/machinery/photocopier/faxmachine/proc/recievefax(var/obj/item/incoming) +/obj/machinery/photocopier/faxmachine/proc/recievefax(obj/item/incoming) if(stat & (BROKEN|NOPOWER)) return FALSE @@ -132,7 +132,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) use_power(active_power_usage) return TRUE -/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(var/mob/sender, var/destination) +/obj/machinery/photocopier/faxmachine/proc/send_admin_fax(mob/sender, destination) if(stat & (BROKEN|NOPOWER)) return use_power(200) @@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(adminfaxes) sleep(5 SECONDS) visible_message("[src] beeps, \"Message transmitted successfully.\"") -/obj/machinery/photocopier/faxmachine/proc/send_adminmessage(var/mob/sender, var/faxname, var/obj/item/sent, var/reply_type, font_colour="#006100") +/obj/machinery/photocopier/faxmachine/proc/send_adminmessage(mob/sender, faxname, obj/item/sent, reply_type, font_colour="#006100") var/msg = "[faxname]: [key_name(sender, 1)] (PP) (VV) (SM) (JMP) (REPLY): Receiving '[sent.name]' via secure connection ... view message" msg = span_admin("[msg]") to_chat(GLOB.permissions.admins, diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 7bc395bdd982..df5436db67ad 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -100,7 +100,7 @@ name = "folder- 'TOP SECRET'" desc = "A folder stamped \"Top Secret - Property of Nanotrasen Corporation. Unauthorized distribution is punishable by death.\"" -/obj/item/folder/documents/Initialize() +/obj/item/folder/documents/Initialize(mapload) . = ..() new /obj/item/documents/nanotrasen(src) update_icon() @@ -113,7 +113,7 @@ /obj/item/folder/syndicate/red icon_state = "folder_sred" -/obj/item/folder/syndicate/red/Initialize() +/obj/item/folder/syndicate/red/Initialize(mapload) . = ..() new /obj/item/documents/syndicate/red(src) update_icon() @@ -121,12 +121,12 @@ /obj/item/folder/syndicate/blue icon_state = "folder_sblue" -/obj/item/folder/syndicate/blue/Initialize() +/obj/item/folder/syndicate/blue/Initialize(mapload) . = ..() new /obj/item/documents/syndicate/blue(src) update_icon() -/obj/item/folder/syndicate/mining/Initialize() +/obj/item/folder/syndicate/mining/Initialize(mapload) . = ..() new /obj/item/documents/syndicate/mining(src) update_icon() diff --git a/code/modules/paperwork/inspector_booth.dm b/code/modules/paperwork/inspector_booth.dm index 3e970fd8dc08..cff2ff91cb79 100644 --- a/code/modules/paperwork/inspector_booth.dm +++ b/code/modules/paperwork/inspector_booth.dm @@ -53,7 +53,7 @@ ) -/obj/machinery/inspector_booth/Initialize() +/obj/machinery/inspector_booth/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 94c01b862069..c88a58096077 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -70,7 +70,7 @@ affecting?.receive_damage(1) -/obj/item/paper/Initialize() +/obj/item/paper/Initialize(mapload) . = ..() pixel_y = rand(-8, 8) pixel_x = rand(-9, 9) @@ -373,7 +373,7 @@ /obj/item/paper/construction -/obj/item/paper/construction/Initialize() +/obj/item/paper/construction/Initialize(mapload) . = ..() color = pick("FF0000", "#33cc33", "#ffb366", "#551A8B", "#ff80d5", "#4d94ff") @@ -381,7 +381,7 @@ * Natural paper */ -/obj/item/paper/natural/Initialize() +/obj/item/paper/natural/Initialize(mapload) . = ..() color = "#FFF5ED" diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index e9386ff652aa..351e5472cc1c 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -17,7 +17,7 @@ /// If this was sent via admin fax, allows anyone to see/interact with it var/admin_faxed = FALSE -/obj/item/paper_bundle/attackby(var/obj/item/W, var/mob/user) +/obj/item/paper_bundle/attackby(obj/item/W, mob/user) ..() var/obj/item/paper/P if(istype(W, /obj/item/paper)) diff --git a/code/modules/paperwork/paper_cutter.dm b/code/modules/paperwork/paper_cutter.dm index 6edc5bb08645..127366ab3b44 100644 --- a/code/modules/paperwork/paper_cutter.dm +++ b/code/modules/paperwork/paper_cutter.dm @@ -12,7 +12,7 @@ pass_flags = PASSTABLE -/obj/item/papercutter/Initialize() +/obj/item/papercutter/Initialize(mapload) . = ..() storedcutter = new /obj/item/hatchet/cutterblade(src) update_icon() @@ -112,7 +112,7 @@ resistance_flags = FLAMMABLE max_integrity = 50 -/obj/item/paperslip/Initialize() +/obj/item/paperslip/Initialize(mapload) . = ..() pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 20793611c237..45dd291ba16f 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -90,7 +90,7 @@ "Command Blue" = "pen-fountain-cb" ) -/obj/item/pen/fountain/captain/Initialize() +/obj/item/pen/fountain/captain/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 200, 115) //the pen is mightier than the sword @@ -171,7 +171,7 @@ -/obj/item/pen/sleepy/Initialize() +/obj/item/pen/sleepy/Initialize(mapload) . = ..() create_reagents(75) reagents.add_reagent(/datum/reagent/toxin/chloralhydrate, 20) @@ -187,7 +187,7 @@ sharpness = SHARP_EDGED var/on = FALSE -/obj/item/pen/edagger/Initialize() +/obj/item/pen/edagger/Initialize(mapload) . = ..() AddComponent(/datum/component/butchering, 60, 100, 0, 'sound/weapons/blade1.ogg', TRUE) diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 353a70f68d19..3733cfb818f1 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -321,7 +321,7 @@ charges = 75 max_charges = 75 -/obj/machinery/photocopier/proc/copy(var/obj/item/paper/copy) +/obj/machinery/photocopier/proc/copy(obj/item/paper/copy) var/obj/item/paper/c = new /obj/item/paper (loc) if(length(copy.info) || length(copy.written)) //Only print and add content if the copied doc has words on it if(toner > 10) //lots of toner, make it dark @@ -350,7 +350,7 @@ return c -/obj/machinery/photocopier/proc/photocopy(var/obj/item/photo/photocopy) +/obj/machinery/photocopier/proc/photocopy(obj/item/photo/photocopy) . = new /obj/item/photo (loc, photocopy.picture.Copy(greytoggle == "Greyscale"? TRUE : FALSE)) toner -= 5 //photos use a lot of ink! if(toner < 0) @@ -358,7 +358,7 @@ visible_message("A red light on \the [src] flashes, indicating that it is out of toner.") //If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner -/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1) +/obj/machinery/photocopier/proc/bundlecopy(obj/item/paper_bundle/bundle, need_toner=1) var/obj/item/paper_bundle/p = new /obj/item/paper_bundle (src) for(var/obj/item/W in bundle) if(toner <= 0 && need_toner) diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm index fcc8d03554f4..8cb813ecbc13 100644 --- a/code/modules/paperwork/ticketmachine.dm +++ b/code/modules/paperwork/ticketmachine.dm @@ -16,7 +16,7 @@ var/linked = FALSE var/list/obj/item/ticket_machine_ticket/tickets = list() -/obj/machinery/ticket_machine/Initialize() +/obj/machinery/ticket_machine/Initialize(mapload) . = ..() update_icon() diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index e145d9e9c181..9e3513969a24 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -41,7 +41,7 @@ var/flash_enabled = TRUE var/start_full = TRUE // does the camera spawn full of film -/obj/item/camera/Initialize() +/obj/item/camera/Initialize(mapload) . = ..() if(start_full) pictures_left = pictures_max // future proofed if anyone ever creates a camera with a different max @@ -289,7 +289,7 @@ var/obj/item/assembly/flash/tator/flashy COOLDOWN_DECLARE(flash_cooldown) -/obj/item/camera/tator/Initialize() +/obj/item/camera/tator/Initialize(mapload) . = ..() flashy = new (src) diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm index 5129db1cc116..16b2da44c36f 100644 --- a/code/modules/photography/camera/camera_image_capturing.dm +++ b/code/modules/photography/camera/camera_image_capturing.dm @@ -1,6 +1,6 @@ /obj/effect/appearance_clone -/obj/effect/appearance_clone/New(loc, atom/A) //Intentionally not Initialize(), to make sure the clone assumes the intended appearance in time for the camera getFlatIcon. +/obj/effect/appearance_clone/New(loc, atom/A) //Intentionally not Initialize(mapload), to make sure the clone assumes the intended appearance in time for the camera getFlatIcon. if(istype(A)) appearance = A.appearance dir = A.dir diff --git a/code/modules/photography/photos/album.dm b/code/modules/photography/photos/album.dm index 42238361c4a2..9c8407a8054c 100644 --- a/code/modules/photography/photos/album.dm +++ b/code/modules/photography/photos/album.dm @@ -12,7 +12,7 @@ var/persistence_id flags_1 = PREVENT_CONTENTS_EXPLOSION_1 -/obj/item/storage/photo_album/Initialize() +/obj/item/storage/photo_album/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(list(/obj/item/photo)) diff --git a/code/modules/plumbing/plumbers/pumps.dm b/code/modules/plumbing/plumbers/pumps.dm index 6f4d4e2ac297..e50f8818e0b1 100644 --- a/code/modules/plumbing/plumbers/pumps.dm +++ b/code/modules/plumbing/plumbers/pumps.dm @@ -16,7 +16,7 @@ var/volume = 200 -/obj/machinery/power/liquid_pump/Initialize() +/obj/machinery/power/liquid_pump/Initialize(mapload) create_reagents(volume) AddComponent(/datum/component/plumbing/simple_supply) return ..() diff --git a/code/modules/pool/pool.dm b/code/modules/pool/pool.dm index 48e45716f595..5580d9c4abd7 100644 --- a/code/modules/pool/pool.dm +++ b/code/modules/pool/pool.dm @@ -230,7 +230,7 @@ GLOBAL_LIST_EMPTY(pool_filters) . = ..() . += "The thermostat on it reads [current_temperature]." -/obj/machinery/pool_filter/Initialize() +/obj/machinery/pool_filter/Initialize(mapload) . = ..() create_reagents(100, OPENCONTAINER) //If you're a terrible terrible clown and want to dump reagents into the pool. if(preset_reagent_type) diff --git a/code/modules/pool/pool_items.dm b/code/modules/pool/pool_items.dm index 39849c1fd1a2..1896c263f62f 100644 --- a/code/modules/pool/pool_items.dm +++ b/code/modules/pool/pool_items.dm @@ -10,7 +10,7 @@ w_class = WEIGHT_CLASS_BULKY attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked") -/obj/item/twohanded/required/pool/Initialize() +/obj/item/twohanded/required/pool/Initialize(mapload) . = ..() //Pick a random color color = pick(COLOR_YELLOW, COLOR_LIME, COLOR_RED, COLOR_BLUE_LIGHT, COLOR_CYAN, COLOR_MAGENTA) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 2600bf0ebff7..5051b5ba8f06 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -160,7 +160,7 @@ if(terminal) terminal.connect_to_network() -/obj/machinery/power/apc/New(turf/loc, var/ndir, var/building=0, mob/user) +/obj/machinery/power/apc/New(turf/loc, ndir, building=0, mob/user) //if (!req_access) //req_access = list(ACCESS_ENGINE_EQUIP) // Yogs -- Commented out to allow for use of req_one_access. Also this is just generally bad and the guy who wrote this doesn't get OOP if (!armor) diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index 4143c7a3ad65..200b4381ce59 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -656,7 +656,7 @@ By design, d1 is the smallest direction and d2 is the highest // called when cable_coil is click on an installed obj/cable // or click on a turf that already contains a "node" cable -/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user, var/showerror = TRUE, forceddir) +/obj/item/stack/cable_coil/proc/cable_join(obj/structure/cable/C, mob/user, showerror = TRUE, forceddir) var/turf/U = user.loc if(!isturf(U)) return diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 4ed3e67f47c0..a15b72fca84f 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -207,7 +207,7 @@ return rating * maxcharge /* Cell variants*/ -/obj/item/stock_parts/cell/empty/Initialize() +/obj/item/stock_parts/cell/empty/Initialize(mapload) . = ..() charge = 0 @@ -217,7 +217,7 @@ maxcharge = 500 materials = list(/datum/material/glass=40) -/obj/item/stock_parts/cell/crap/empty/Initialize() +/obj/item/stock_parts/cell/crap/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -239,7 +239,7 @@ maxcharge = 600 //600 max charge / 100 charge per shot = six shots materials = list(/datum/material/glass=40) -/obj/item/stock_parts/cell/secborg/empty/Initialize() +/obj/item/stock_parts/cell/secborg/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -275,7 +275,7 @@ maxcharge = 15000 chargerate = 2250 -/obj/item/stock_parts/cell/high/empty/Initialize() +/obj/item/stock_parts/cell/high/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -287,7 +287,7 @@ materials = list(/datum/material/glass=300) chargerate = 2000 -/obj/item/stock_parts/cell/super/empty/Initialize() +/obj/item/stock_parts/cell/super/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -299,7 +299,7 @@ materials = list(/datum/material/glass=400) chargerate = 3000 -/obj/item/stock_parts/cell/hyper/empty/Initialize() +/obj/item/stock_parts/cell/hyper/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -312,7 +312,7 @@ materials = list(/datum/material/glass=600) chargerate = 4000 -/obj/item/stock_parts/cell/bluespace/empty/Initialize() +/obj/item/stock_parts/cell/bluespace/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -365,11 +365,11 @@ maxcharge = 500 rating = 3 -/obj/item/stock_parts/cell/emproof/Initialize() +/obj/item/stock_parts/cell/emproof/Initialize(mapload) . = ..() AddComponent(/datum/component/empprotection, EMP_PROTECT_SELF) -/obj/item/stock_parts/cell/emproof/empty/Initialize() +/obj/item/stock_parts/cell/emproof/empty/Initialize(mapload) . = ..() charge = 0 update_icon() @@ -399,7 +399,7 @@ materials = list(/datum/material/glass = 20) w_class = WEIGHT_CLASS_TINY -/obj/item/stock_parts/cell/emergency_light/Initialize() +/obj/item/stock_parts/cell/emergency_light/Initialize(mapload) . = ..() var/area/A = get_area(src) if(!A.lightswitch || !A.light_power) diff --git a/code/modules/power/energyharvester.dm b/code/modules/power/energyharvester.dm index b697091fcbc3..cd0fda29aac0 100644 --- a/code/modules/power/energyharvester.dm +++ b/code/modules/power/energyharvester.dm @@ -38,7 +38,7 @@ ///last amount of energy transmitted before being reset by budget cycle, so CE can check if his engine modifications are making more power var/last_accumulated_power = 0 -obj/item/energy_harvester/Initialize() +obj/item/energy_harvester/Initialize(mapload) . = ..() ///links this to SSeconomy so it can be added to the budget cycle calculations SSeconomy.moneysink = src diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 7adcdd8e07cb..5e6593c35804 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -92,7 +92,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne // Generator which spawns with the station. // -/obj/machinery/gravity_generator/main/station/Initialize() +/obj/machinery/gravity_generator/main/station/Initialize(mapload) . = ..() setup_parts() middle.add_overlay("activated") diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index bcc0bc31c0a0..f8ca79194b24 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -281,7 +281,7 @@ icon_state = "tube-empty" start_with_cell = FALSE -/obj/machinery/light/built/Initialize() +/obj/machinery/light/built/Initialize(mapload) . = ..() status = LIGHT_EMPTY update(0) @@ -289,7 +289,7 @@ /obj/machinery/light/floor/built icon_state = "floor-empty" -/obj/machinery/light/floor/built/Initialize() +/obj/machinery/light/floor/built/Initialize(mapload) . = ..() status = LIGHT_EMPTY update(0) @@ -297,7 +297,7 @@ /obj/machinery/light/small/built icon_state = "bulb-empty" -/obj/machinery/light/small/built/Initialize() +/obj/machinery/light/small/built/Initialize(mapload) . = ..() status = LIGHT_EMPTY update(0) @@ -643,7 +643,7 @@ return TRUE -/obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) +/obj/machinery/light/proc/flicker(amount = rand(10, 20)) set waitfor = 0 if(flickering) return @@ -882,7 +882,7 @@ icon_state = "[base_state]-broken" desc = "A broken [name]." -/obj/item/light/Initialize() +/obj/item/light/Initialize(mapload) . = ..() update() AddComponent(/datum/component/caltrop, force) diff --git a/code/modules/power/monitor.dm b/code/modules/power/monitor.dm index 85ed8a032698..54ada67f6baa 100644 --- a/code/modules/power/monitor.dm +++ b/code/modules/power/monitor.dm @@ -30,7 +30,7 @@ . = ..() . += span_notice("It's operating system seems quite outdated... It doesn't seem like it'd be compatible with the latest remote NTOS monitoring systems.") -/obj/machinery/computer/monitor/Initialize() +/obj/machinery/computer/monitor/Initialize(mapload) . = ..() search() history["supply"] = list() diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index ad2772f03c94..afe65f073e13 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -17,7 +17,7 @@ interaction_flags_atom = INTERACT_ATOM_ATTACK_HAND | INTERACT_ATOM_UI_INTERACT | INTERACT_ATOM_REQUIRES_ANCHORED -/obj/machinery/power/port_gen/Initialize() +/obj/machinery/power/port_gen/Initialize(mapload) . = ..() soundloop = new(list(src), active) @@ -85,12 +85,12 @@ var/time_per_sheet = 260 var/current_heat = 0 -/obj/machinery/power/port_gen/pacman/Initialize() +/obj/machinery/power/port_gen/pacman/Initialize(mapload) . = ..() if(anchored) connect_to_network() -/obj/machinery/power/port_gen/pacman/Initialize() +/obj/machinery/power/port_gen/pacman/Initialize(mapload) . = ..() var/obj/S = sheet_path diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index fa967e02f788..b23d8adb3cec 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -73,7 +73,7 @@ // returns true if the area has power on given channel (or doesn't require power). // defaults to power_channel -/obj/machinery/proc/powered(var/chan = -1) // defaults to power_channel +/obj/machinery/proc/powered(chan = -1) // defaults to power_channel if(!loc) return FALSE if(!use_power) diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm index 417925dec80d..08b4f10b0936 100644 --- a/code/modules/power/rtg.dm +++ b/code/modules/power/rtg.dm @@ -19,7 +19,7 @@ var/irradiate = TRUE // RTGs irradiate surroundings, but only when panel is open. -/obj/machinery/power/rtg/Initialize() +/obj/machinery/power/rtg/Initialize(mapload) . = ..() connect_to_network() diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index 192893b4a608..78e4e045a113 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -63,7 +63,7 @@ state = EMITTER_WELDED use_power = FALSE -/obj/machinery/power/emitter/Initialize() +/obj/machinery/power/emitter/Initialize(mapload) . = ..() RefreshParts() wires = new /datum/wires/emitter(src) @@ -488,7 +488,7 @@ resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF var/delay = 0 -/obj/item/turret_control/Initialize() +/obj/item/turret_control/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 7255f1fa6697..45b2ddb3acca 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -54,7 +54,7 @@ field_generator power level display add_overlay("+p[power_level]") -/obj/machinery/field/generator/Initialize() +/obj/machinery/field/generator/Initialize(mapload) . = ..() fields = list() connected_gens = list() diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm index 85da9c5dce6d..402497d5465a 100644 --- a/code/modules/power/singularity/narsie.dm +++ b/code/modules/power/singularity/narsie.dm @@ -28,7 +28,7 @@ grav_pull = 10 consume_range = 12 //How many tiles out do we eat -/obj/singularity/narsie/large/Initialize() +/obj/singularity/narsie/large/Initialize(mapload) . = ..() send_to_playing_players(span_narsie("NAR-SIE HAS RISEN")) sound_to_playing_players('sound/creatures/narsie_rises.ogg') @@ -45,7 +45,7 @@ var/souls = 0 var/resolved = FALSE -/obj/singularity/narsie/large/cult/Initialize() +/obj/singularity/narsie/large/cult/Initialize(mapload) . = ..() GLOB.cult_narsie = src var/list/all_cults = list() @@ -130,7 +130,7 @@ /proc/ending_helper() SSticker.force_ending = 1 -/proc/cult_ending_helper(var/ending_type = 0) +/proc/cult_ending_helper(ending_type = 0) if(ending_type == 2) //narsie fukkin died Cinematic(CINEMATIC_CULT_FAIL,world,CALLBACK(GLOBAL_PROC,/proc/ending_helper)) else if(ending_type) //no explosion diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 88fa7266e58c..6bc4f7dc0d8c 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -46,7 +46,7 @@ if(PA_CONSTRUCTION_PANEL_OPEN) . += "The panel is open." -/obj/structure/particle_accelerator/Initialize() +/obj/structure/particle_accelerator/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS ) diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 382c4223f344..a6bc79e0402d 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -24,7 +24,7 @@ req_access = list(ACCESS_CE) var/mob/living/operator -/obj/machinery/particle_accelerator/control_box/Initialize() +/obj/machinery/particle_accelerator/control_box/Initialize(mapload) . = ..() wires = new /datum/wires/particle_accelerator/control_box(src) connected_parts = list() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 9a94a93dca46..19d5552a8a4c 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -47,7 +47,7 @@ if(!terminal) . += span_warning("This SMES has no power terminal!") -/obj/machinery/power/smes/Initialize() +/obj/machinery/power/smes/Initialize(mapload) . = ..() dir_loop: for(var/d in GLOB.cardinals) diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 125490890808..bb9e9457076e 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -193,7 +193,7 @@ //Bit of a hack but this whole type is a hack -/obj/machinery/power/solar/fake/Initialize(turf/loc, obj/item/solar_assembly/S) +/obj/machinery/power/solar/fake/Initialize(mapload, turf/loc, obj/item/solar_assembly/S) . = ..() UnregisterSignal(SSsun, COMSIG_SUN_MOVED) @@ -337,7 +337,7 @@ var/list/connected_panels = list() var/mob/living/carbon/human/last_user // The last guy to open up the console -/obj/machinery/power/solar_control/Initialize() +/obj/machinery/power/solar_control/Initialize(mapload) . = ..() azimuth_rate = SSsun.base_rotation RegisterSignal(SSsun, COMSIG_SUN_MOVED, PROC_REF(timed_track)) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 95ba5143c076..167ba00e3ab3 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -219,7 +219,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/heal_mod = 1 -/obj/machinery/power/supermatter_crystal/Initialize() +/obj/machinery/power/supermatter_crystal/Initialize(mapload) . = ..() uid = gl_uid++ SSair.atmos_machinery += src diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm index 9e14c1e12b32..50b70d1d1834 100644 --- a/code/modules/power/terminal.dm +++ b/code/modules/power/terminal.dm @@ -12,7 +12,7 @@ var/obj/machinery/power/master = null -/obj/machinery/power/terminal/Initialize() +/obj/machinery/power/terminal/Initialize(mapload) . = ..() var/turf/T = get_turf(src) if(level == 1) diff --git a/code/modules/power/tesla/coil.dm b/code/modules/power/tesla/coil.dm index f29a15bd8bfc..e4396c6a1a83 100644 --- a/code/modules/power/tesla/coil.dm +++ b/code/modules/power/tesla/coil.dm @@ -28,7 +28,7 @@ /obj/machinery/power/tesla_coil/power circuit = /obj/item/circuitboard/machine/tesla_coil/power -/obj/machinery/power/tesla_coil/Initialize() +/obj/machinery/power/tesla_coil/Initialize(mapload) . = ..() wires = new /datum/wires/tesla_coil(src) linked_techweb = SSresearch.science_tech @@ -178,7 +178,7 @@ return ..() -/obj/machinery/power/grounding_rod/tesla_act(var/power) +/obj/machinery/power/grounding_rod/tesla_act(power) if(anchored && !panel_open) flick("grounding_rodhit", src) tesla_buckle_check(power) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 42a95c59da81..932dd6e24bf4 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -81,7 +81,7 @@ if(orbiting_balls.len) . += "There are [orbiting_balls.len] mini-balls orbiting it." -/obj/singularity/energy_ball/proc/collide(var/obj/singularity/energy_ball/target) +/obj/singularity/energy_ball/proc/collide(obj/singularity/energy_ball/target) if(max_balls < target.max_balls) //we bow down against a stronger tesla return @@ -93,7 +93,7 @@ qdel(target) -/obj/singularity/energy_ball/proc/move_the_basket_ball(var/move_amount) +/obj/singularity/energy_ball/proc/move_the_basket_ball(move_amount) //we face the last thing we zapped, so this lets us favor that direction a bit var/move_bias = pick(GLOB.alldirs) for(var/i in 0 to move_amount) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index f63f1b2c71b6..2049631e4e36 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -79,7 +79,7 @@ // the inlet stage of the gas turbine electricity generator -/obj/machinery/power/compressor/Initialize() +/obj/machinery/power/compressor/Initialize(mapload) . = ..() // The inlet of the compressor is the direction it faces gas_contained = new @@ -179,7 +179,7 @@ #define TURBGENQ 100000 #define TURBGENG 0.5 -/obj/machinery/power/turbine/Initialize() +/obj/machinery/power/turbine/Initialize(mapload) . = ..() // The outlet is pointed at the direction of the turbine component outturf = get_step(src, dir) @@ -313,7 +313,7 @@ -/obj/machinery/computer/turbine_computer/Initialize() +/obj/machinery/computer/turbine_computer/Initialize(mapload) . = ..() return INITIALIZE_HINT_LATELOAD diff --git a/code/modules/procedural_mapping/mapGeneratorReadme.dm b/code/modules/procedural_mapping/mapGeneratorReadme.dm index c4ced7674bcf..42c997201ef9 100644 --- a/code/modules/procedural_mapping/mapGeneratorReadme.dm +++ b/code/modules/procedural_mapping/mapGeneratorReadme.dm @@ -11,11 +11,11 @@ mapGenerator: Desc: a mapGenerator is a master datum that collects and syncs all mapGeneratorModules in it's modules list - defineRegion(var/turf/Start, var/turf/End, var/replace = 0) + defineRegion(turf/Start, turf/End, replace = 0) Example: defineRegion(locate(1,1,1),locate(5,5,5),0) Desc: Sets the bounds of the mapGenerator's "map" - defineCircularRegion(var/turf/Start, var/turf/End, var/replace = 0) + defineCircularRegion(turf/Start, turf/End, replace = 0) Example: defineCircularRegion(locate(1,1,1),locate(5,5,5),0) Desc: Sets the mapGenerator's "map" as a circle, with center in the middle of Start and End's X,Y,Z coordinates @@ -23,7 +23,7 @@ mapGenerator: Example: undefineRegion() Desc: Empties the map generator list - checkRegion(var/turf/Start, var/turf/End) + checkRegion(turf/Start, turf/End) Example: checkRegion(locate(1,1,1), locate(5,5,5)) Desc: Checks if a rectangle between Start's coords and End's coords is valid Existing Calls: mapGenerator/defineRegion(), mapGenerator/defineCircularRegion() @@ -32,7 +32,7 @@ mapGenerator: Example: generate() Desc: Orders all mapGeneratorModules in the modules list to generate() - generateOneTurf(var/turf/T) + generateOneTurf(turf/T) Example: generateOneTurf(locate(1,1,1)) Desc: Orders all mapGeneratorModules in the modules list to place(T) on this turf @@ -51,7 +51,7 @@ mapGeneratorModule Desc: a mapGeneratorModule has spawnableAtoms and spawnableTurfs lists which it will generate on turfs in it's mother's map based on cluster variables - sync(var/datum/mapGenerator/mum) + sync(datum/mapGenerator/mum) Example: sync(a_mapGenerator_as_a_variable) Desc: Sets the Mother variable to the mum argument Existing Calls: mapGenerator/syncModules() @@ -61,12 +61,12 @@ mapGeneratorModule Desc: Calls place(T) on all turfs in it's mother's map Existing Calls: mapGenerator/generate() - place(var/turf/T) + place(turf/T) Example: place(locate(1,1,1)) Desc: Run this mapGeneratorModule's effects on this turf (Spawning atoms, Changing turfs) Existing Calls: mapGenerator/generate(), mapGenerator/generateOneTurf() - checkPlaceAtom(var/turf/T) + checkPlaceAtom(turf/T) Example: checkPlace(locate(1,1,1)) Desc: Checks if the turf is valid for placing atoms Existing Calls: place() @@ -143,4 +143,4 @@ Variable Breakdown (For Mappers): -*/ \ No newline at end of file +*/ diff --git a/code/modules/procedural_mapping/mapGenerators/cellular.dm b/code/modules/procedural_mapping/mapGenerators/cellular.dm index 7d88f3beb06b..0ca189f365b0 100644 --- a/code/modules/procedural_mapping/mapGenerators/cellular.dm +++ b/code/modules/procedural_mapping/mapGenerators/cellular.dm @@ -28,7 +28,7 @@ //We assume 2D everywhere anyway start = locate(min_x,min_y,Start.z) -/datum/mapGenerator/ca/proc/initialize() +/datum/mapGenerator/ca/proc/Initialize() old_state = new/list(width) for(var/i = 1,i<=width,i++) old_state[i] = new/list(height) @@ -40,7 +40,7 @@ /datum/mapGenerator/ca/generate() //Abandon all hope for efficency all who enter here //Maybe some less basic implemetation later, but this is just simple admin tool - initialize() + Initialize() for(var/generation = 0,generation    " -/obj/item/storage/box/mre/Initialize() +/obj/item/storage/box/mre/Initialize(mapload) . = ..() expiry_date = rand(2300, 2700) diff --git a/yogstation/code/game/objects/items/tool_switcher.dm b/yogstation/code/game/objects/items/tool_switcher.dm index 2c20f5641029..119575a3914d 100644 --- a/yogstation/code/game/objects/items/tool_switcher.dm +++ b/yogstation/code/game/objects/items/tool_switcher.dm @@ -38,7 +38,7 @@ )) -/obj/item/storage/belt/tool_switcher/Initialize() +/obj/item/storage/belt/tool_switcher/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) var/static/list/can_hold = typecacheof(list( diff --git a/yogstation/code/game/objects/structures/fireaxe.dm b/yogstation/code/game/objects/structures/fireaxe.dm index 63e66819c839..2ceb921d75bf 100644 --- a/yogstation/code/game/objects/structures/fireaxe.dm +++ b/yogstation/code/game/objects/structures/fireaxe.dm @@ -6,7 +6,7 @@ //bridge fireaxe has different access req_one_access = list(ACCESS_CAPTAIN, ACCESS_CE) -/obj/structure/fireaxecabinet/Initialize()//<-- mirrored/overwritten proc +/obj/structure/fireaxecabinet/Initialize(mapload)//<-- mirrored/overwritten proc . = ..() fireaxe = new update_icon() diff --git a/yogstation/code/game/objects/structures/ghostbeacon.dm b/yogstation/code/game/objects/structures/ghostbeacon.dm index 75d545ea1b5e..ac0a11888fb0 100644 --- a/yogstation/code/game/objects/structures/ghostbeacon.dm +++ b/yogstation/code/game/objects/structures/ghostbeacon.dm @@ -8,7 +8,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF var/list/mob/living/carbon/ghosts = list() -/obj/structure/ghostbeacon/Initialize() +/obj/structure/ghostbeacon/Initialize(mapload) . = ..() GLOB.poi_list |= src START_PROCESSING(SSprocessing, src) diff --git a/yogstation/code/game/objects/structures/signs/signs_plaques.dm b/yogstation/code/game/objects/structures/signs/signs_plaques.dm index ca7bb8057983..9f6a09e2e52a 100644 --- a/yogstation/code/game/objects/structures/signs/signs_plaques.dm +++ b/yogstation/code/game/objects/structures/signs/signs_plaques.dm @@ -4,6 +4,6 @@ icon = 'yogstation/icons/obj/decals.dmi' icon_state = "cave" -/obj/structure/sign/plaques/cave/Initialize() +/obj/structure/sign/plaques/cave/Initialize(mapload) . = ..() desc = pick("Greetings, friend. I'm Cave Johnson, CEO of Nanotrasen Science - you might know us as a vital participant in the 2548 Board Hearings on missing crewmembers. And you've most likely used one of the many products we invented. But that other people have somehow managed to steal from us.", "So. Welcome to Nanotrasen. You're here because we want the best, and you're it. Nope. Couldn't keep a straight face.", "All right, I've been thinking. When life gives you lemons? Don't make lemonade. Make life take the lemons back! Get mad! 'I don't want your damn lemons! What am I supposed to do with these?", "Brain Mapping. Artificial Intelligence. We should have been working on it thirty years ago.", "Science isn't about WHY. It's about WHY NOT. Why is so much of our science dangerous? Why not marry safe science if you love it so much. In fact, why not invent a special safety door that won't hit you on the butt on the way out, because you are fired!", "The bean counters told me we literally could not afford to buy seven dollars worth of plasma rocks, much less seventy million. Bought 'em anyway. Engineers said the plasma rocks were too volatile to experiment on. Tested on 'em anyway. Ground 'em up, mixed em into a gel. And guess what? Ground up plasma rocks are pure poison. I am deathly ill. Still, it turns out they're a great fire hazard. We're done here.") diff --git a/yogstation/code/game/objects/structures/toilet_bong.dm b/yogstation/code/game/objects/structures/toilet_bong.dm index 76bac28f6211..6236ddc89caf 100644 --- a/yogstation/code/game/objects/structures/toilet_bong.dm +++ b/yogstation/code/game/objects/structures/toilet_bong.dm @@ -7,7 +7,7 @@ anchored = TRUE var/mutable_appearance/weed_overlay -/obj/structure/toilet_bong/Initialize() +/obj/structure/toilet_bong/Initialize(mapload) . = ..() var/datum/component/storage/STR = AddComponent(/datum/component/storage/concrete) STR.attack_hand_interact = FALSE diff --git a/yogstation/code/game/soccer.dm b/yogstation/code/game/soccer.dm index ccd15654d705..2a3171f1c229 100644 --- a/yogstation/code/game/soccer.dm +++ b/yogstation/code/game/soccer.dm @@ -17,7 +17,7 @@ /obj/structure/goalnet/goalpost/right icon_state = "goal_post_right" -/obj/structure/goalnet/Initialize() +/obj/structure/goalnet/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE,CALLBACK(src, PROC_REF(can_user_rotate)),CALLBACK(src, PROC_REF(can_be_rotated)),null) diff --git a/yogstation/code/modules/admin/moja.dm b/yogstation/code/modules/admin/moja.dm index 413834c21a01..cb438c4de0db 100644 --- a/yogstation/code/modules/admin/moja.dm +++ b/yogstation/code/modules/admin/moja.dm @@ -59,7 +59,7 @@ moja.ckey = (new_key ? new_key : ckey) gib() -/mob/living/carbon/human/moja/Initialize() +/mob/living/carbon/human/moja/Initialize(mapload) . = ..() make_moja() diff --git a/yogstation/code/modules/admin/prettyfilter.dm b/yogstation/code/modules/admin/prettyfilter.dm index d98d1fb1469f..f56bd0003b52 100644 --- a/yogstation/code/modules/admin/prettyfilter.dm +++ b/yogstation/code/modules/admin/prettyfilter.dm @@ -82,7 +82,7 @@ GLOBAL_LIST_EMPTY(minor_filter_items) return text -/proc/isnotpretty(var/text) // A simpler version of pretty_filter(), where all it returns is whether it had to replace something or not. +/proc/isnotpretty(text) // A simpler version of pretty_filter(), where all it returns is whether it had to replace something or not. //Useful for the "You fumble your words..." business. for(var/line in GLOB.pretty_filter_items) var/list/parts = splittext(line, "=") diff --git a/yogstation/code/modules/admin/verbs/adminhelp.dm b/yogstation/code/modules/admin/verbs/adminhelp.dm index 1187ee4e5c7c..d9442327998e 100644 --- a/yogstation/code/modules/admin/verbs/adminhelp.dm +++ b/yogstation/code/modules/admin/verbs/adminhelp.dm @@ -73,7 +73,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/text_admin var/for_admins -/datum/ticket_log/New(var/datum/admin_help/parent, var/ckey, var/text, var/for_admins = 0) +/datum/ticket_log/New(datum/admin_help/parent, ckey, text, for_admins = 0) src.gametime = gameTimestamp() src.parent = parent @@ -788,7 +788,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) else view_tickets_main(TICKET_FLAG_LIST_ALL) -/client/proc/view_tickets_main(var/flag) +/client/proc/view_tickets_main(flag) flag = text2num(flag) if(!flag) flag = TICKET_FLAG_LIST_ALL diff --git a/yogstation/code/modules/admin/verbs/fix_air.dm b/yogstation/code/modules/admin/verbs/fix_air.dm index e811164780e9..30b1249b71af 100644 --- a/yogstation/code/modules/admin/verbs/fix_air.dm +++ b/yogstation/code/modules/admin/verbs/fix_air.dm @@ -1,4 +1,4 @@ -/client/proc/fix_air(var/turf/open/T in world) +/client/proc/fix_air(turf/open/T in world) set name = "Fix Air" set category = "Misc.Unused" set desc = "Fixes air in specified radius." diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm index 469e78f7f21b..d84b955f0cdc 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/dark_bead.dm @@ -15,7 +15,7 @@ var/datum/action/innate/darkspawn/devour_will/linked_ability //The ability that keeps data for us var/full_restore = TRUE -/obj/item/dark_bead/Initialize() +/obj/item/dark_bead/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) animate(src, alpha = 50, time = 5 SECONDS) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm index 8b9b3b5a9d0f..07eeda0ce750 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_objects/simulacrum.dm @@ -7,7 +7,7 @@ obj_integrity = 25 var/mob/living/mimicking -/obj/effect/simulacrum/Initialize() +/obj/effect/simulacrum/Initialize(mapload) . = ..() START_PROCESSING(SSfastprocess, src) QDEL_IN(src, 100) diff --git a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm index ae7991e9ae4e..8a1ed48c8e64 100644 --- a/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm +++ b/yogstation/code/modules/antagonists/darkspawn/darkspawn_progenitor.dm @@ -31,7 +31,7 @@ movement_type = FLYING var/time_to_next_roar = 0 -/mob/living/simple_animal/hostile/darkspawn_progenitor/Initialize() +/mob/living/simple_animal/hostile/darkspawn_progenitor/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_HOLY, "ohgodohfuck") //sorry no magic alpha = 0 @@ -59,7 +59,7 @@ if(time_to_next_roar + 10 SECONDS <= world.time) //gives time to roar manually if you like want to do that roar() -/mob/living/simple_animal/hostile/darkspawn_progenitor/say(message, bubble_type,var/list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) +/mob/living/simple_animal/hostile/darkspawn_progenitor/say(message, bubble_type, list/spans = list(), sanitize = TRUE, datum/language/language = null, ignore_spam = FALSE, forced = null) ..() if(time_to_next_roar <= world.time) roar() diff --git a/yogstation/code/modules/antagonists/infiltrator/items/hardsuit.dm b/yogstation/code/modules/antagonists/infiltrator/items/hardsuit.dm index e6c3930c2ed8..f54efc3426ab 100644 --- a/yogstation/code/modules/antagonists/infiltrator/items/hardsuit.dm +++ b/yogstation/code/modules/antagonists/infiltrator/items/hardsuit.dm @@ -5,7 +5,7 @@ armor = list(MELEE = 35, BULLET = 15, LASER = 30,ENERGY = 10, BOMB = 10, BIO = 100, RAD = 50, FIRE = 75, ACID = 75) syndicate = TRUE -/obj/item/clothing/head/helmet/space/hardsuit/infiltration/Initialize() +/obj/item/clothing/head/helmet/space/hardsuit/infiltration/Initialize(mapload) . = ..() if(istype(loc, /obj/item/clothing/suit/space/hardsuit/infiltration)) var/obj/item/clothing/suit/space/hardsuit/infiltration/I = loc @@ -29,7 +29,7 @@ if (is_syndicate(user)) . += span_notice("There appears to be a hidden panel on it, showing various customization options.") -/obj/item/clothing/suit/space/hardsuit/infiltration/Initialize() +/obj/item/clothing/suit/space/hardsuit/infiltration/Initialize(mapload) . = ..() chameleon_action = new(src) chameleon_action.chameleon_type = /obj/item/clothing/suit/space/hardsuit diff --git a/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm b/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm index 2be8e231e6a0..b97ea0ee1262 100644 --- a/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm +++ b/yogstation/code/modules/antagonists/shadowling/ascendant_shadowling.dm @@ -28,7 +28,7 @@ faction = list("faithless") speech_span = SPAN_REALLYBIG //screw it someone else can figure out how to put both SPAN_YELL and SPAN_REALLYBIG on a speech_span later -/mob/living/simple_animal/ascendant_shadowling/Initialize() +/mob/living/simple_animal/ascendant_shadowling/Initialize(mapload) . = ..() LoadComponent(/datum/component/walk) diff --git a/yogstation/code/modules/antagonists/shadowling/shadowling_items.dm b/yogstation/code/modules/antagonists/shadowling/shadowling_items.dm index 5e0ac3598af2..c1f40312c7d6 100644 --- a/yogstation/code/modules/antagonists/shadowling/shadowling_items.dm +++ b/yogstation/code/modules/antagonists/shadowling/shadowling_items.dm @@ -17,7 +17,7 @@ clothing_flags = THICKMATERIAL | STOPSPRESSUREDAMAGE resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF -/obj/item/clothing/suit/space/shadowling/Initialize() +/obj/item/clothing/suit/space/shadowling/Initialize(mapload) .=..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) @@ -37,6 +37,6 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF item_flags = ABSTRACT | DROPDEL -/obj/item/clothing/head/shadowling/Initialize() +/obj/item/clothing/head/shadowling/Initialize(mapload) .=..() ADD_TRAIT(src, TRAIT_NODROP, ABSTRACT_ITEM_TRAIT) diff --git a/yogstation/code/modules/antagonists/slaughter/slaughter.dm b/yogstation/code/modules/antagonists/slaughter/slaughter.dm index 5059c40e89a1..561a30f50e9d 100644 --- a/yogstation/code/modules/antagonists/slaughter/slaughter.dm +++ b/yogstation/code/modules/antagonists/slaughter/slaughter.dm @@ -61,7 +61,7 @@ /// How much our wound_bonus hitstreak bonus caps at (peak demonry) var/wound_bonus_hitstreak_max = 12 -/mob/living/simple_animal/slaughter/Initialize() +/mob/living/simple_animal/slaughter/Initialize(mapload) . = ..() var/datum/action/cooldown/spell/jaunt/bloodcrawl/slaughter_demon/crawl = new crawl_type(src) crawl.Grant(src) diff --git a/yogstation/code/modules/assembly/signaler.dm b/yogstation/code/modules/assembly/signaler.dm index 0ef59694cd3b..951b9fbb2e83 100644 --- a/yogstation/code/modules/assembly/signaler.dm +++ b/yogstation/code/modules/assembly/signaler.dm @@ -3,7 +3,7 @@ var/static/list/label_colors = list("red", "green", "blue", "cyan", "magenta", "yellow", "white") var/label_color = "green" -/obj/item/assembly/signaler/Initialize() +/obj/item/assembly/signaler/Initialize(mapload) . = ..() update_icon() diff --git a/yogstation/code/modules/clothing/donator.dm b/yogstation/code/modules/clothing/donator.dm index efdc1d13632d..434c156005cb 100644 --- a/yogstation/code/modules/clothing/donator.dm +++ b/yogstation/code/modules/clothing/donator.dm @@ -123,7 +123,7 @@ soft_type = "fishfear" dog_fashion = /datum/dog_fashion/head/fishfear -/obj/item/clothing/head/soft/fishfear/Initialize() +/obj/item/clothing/head/soft/fishfear/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,5) @@ -133,7 +133,7 @@ icon_state = "froghat" item_state = "froghat" -/obj/item/clothing/head/yogs/froghat/Initialize() +/obj/item/clothing/head/yogs/froghat/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,10) diff --git a/yogstation/code/modules/clothing/fishing.dm b/yogstation/code/modules/clothing/fishing.dm index c695fc89130e..fdb292469e9d 100644 --- a/yogstation/code/modules/clothing/fishing.dm +++ b/yogstation/code/modules/clothing/fishing.dm @@ -6,7 +6,7 @@ mob_overlay_icon = 'yogstation/icons/mob/clothing/head/head.dmi' icon = 'yogstation/icons/obj/clothing/hats.dmi' -/obj/item/clothing/head/fishing/Initialize() +/obj/item/clothing/head/fishing/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,5) @@ -18,7 +18,7 @@ mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi' icon = 'yogstation/icons/obj/clothing/suits.dmi' -/obj/item/clothing/suit/fishing/Initialize() +/obj/item/clothing/suit/fishing/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,10) @@ -30,7 +30,7 @@ mob_overlay_icon = 'yogstation/icons/mob/clothing/hands/hands.dmi' icon = 'yogstation/icons/obj/clothing/gloves.dmi' -/obj/item/clothing/gloves/fishing/Initialize() +/obj/item/clothing/gloves/fishing/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,5) @@ -42,6 +42,6 @@ mob_overlay_icon = 'yogstation/icons/mob/clothing/feet/feet.dmi' icon = 'yogstation/icons/obj/clothing/shoes.dmi' -/obj/item/clothing/shoes/fishing/Initialize() +/obj/item/clothing/shoes/fishing/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,5) diff --git a/yogstation/code/modules/clothing/head/helmet.dm b/yogstation/code/modules/clothing/head/helmet.dm index 791bbf0bcf90..ffd7174204d6 100644 --- a/yogstation/code/modules/clothing/head/helmet.dm +++ b/yogstation/code/modules/clothing/head/helmet.dm @@ -1,7 +1,7 @@ /obj/item/clothing/head/helmet var/initial_state -/obj/item/clothing/head/helmet/Initialize() +/obj/item/clothing/head/helmet/Initialize(mapload) . = ..() initial_state = "[initial(icon_state)]" diff --git a/yogstation/code/modules/clothing/mask.dm b/yogstation/code/modules/clothing/mask.dm index d6593ebeff7b..a951f537511c 100644 --- a/yogstation/code/modules/clothing/mask.dm +++ b/yogstation/code/modules/clothing/mask.dm @@ -21,7 +21,7 @@ ///if the mask should cluwne you when you put it on var/auto_cluwne = TRUE -/obj/item/clothing/mask/yogs/cluwne/Initialize() +/obj/item/clothing/mask/yogs/cluwne/Initialize(mapload) .=..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) @@ -79,7 +79,7 @@ /// If active, creates a floor cluwne with the user as a target var/does_floor_cluwne = FALSE -/obj/item/clothing/mask/yogs/cluwne/happy_cluwne/Initialize() +/obj/item/clothing/mask/yogs/cluwne/happy_cluwne/Initialize(mapload) .=..() REMOVE_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) if(prob(1)) //this function pre-determines the logic of the cluwne mask. applying and reapplying the mask does not alter or change anything diff --git a/yogstation/code/modules/clothing/masks/hailer.dm b/yogstation/code/modules/clothing/masks/hailer.dm index 2e552496c834..81f209c71992 100644 --- a/yogstation/code/modules/clothing/masks/hailer.dm +++ b/yogstation/code/modules/clothing/masks/hailer.dm @@ -11,7 +11,7 @@ var/dispatch_cooldown = 250 var/last_dispatch = 0 -/obj/item/clothing/mask/gas/sechailer/Initialize() +/obj/item/clothing/mask/gas/sechailer/Initialize(mapload) . = ..() GLOB.sechailers += src radio = new(src) diff --git a/yogstation/code/modules/clothing/shoe.dm b/yogstation/code/modules/clothing/shoe.dm index 68f66da3c2ae..c3398962ff8d 100644 --- a/yogstation/code/modules/clothing/shoe.dm +++ b/yogstation/code/modules/clothing/shoe.dm @@ -9,7 +9,7 @@ var/footstep = 1 pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes/clown -/obj/item/clothing/shoes/yogs/cluwne/Initialize() +/obj/item/clothing/shoes/yogs/cluwne/Initialize(mapload) .=..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) diff --git a/yogstation/code/modules/clothing/shoes/miscellaneous.dm b/yogstation/code/modules/clothing/shoes/miscellaneous.dm index 6ef637634219..467a4c37951e 100644 --- a/yogstation/code/modules/clothing/shoes/miscellaneous.dm +++ b/yogstation/code/modules/clothing/shoes/miscellaneous.dm @@ -47,6 +47,6 @@ icon_state = "fire_crocs" item_state = "fire_crocs" -/obj/item/clothing/shoes/fire_crocs/Initialize() +/obj/item/clothing/shoes/fire_crocs/Initialize(mapload) . = ..() AddComponent(/datum/component/fishingbonus,5) diff --git a/yogstation/code/modules/clothing/suits/miscellaneous.dm b/yogstation/code/modules/clothing/suits/miscellaneous.dm index a230f7063aa0..5c29c76c8a37 100644 --- a/yogstation/code/modules/clothing/suits/miscellaneous.dm +++ b/yogstation/code/modules/clothing/suits/miscellaneous.dm @@ -250,7 +250,7 @@ item_state = "gold_item" armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45) -/obj/item/clothing/suit/yogs/golddetective/Initialize() +/obj/item/clothing/suit/yogs/golddetective/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed @@ -279,7 +279,7 @@ item_state = "detective_item" armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45) -/obj/item/clothing/suit/yogs/detectivecoat/Initialize() +/obj/item/clothing/suit/yogs/detectivecoat/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed @@ -309,7 +309,7 @@ item_state = "blue_item" armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45) -/obj/item/clothing/suit/yogs/bluedetective/Initialize() +/obj/item/clothing/suit/yogs/bluedetective/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed diff --git a/yogstation/code/modules/clothing/suits/nerd.dm b/yogstation/code/modules/clothing/suits/nerd.dm index d64947ae772c..94abc9883b90 100644 --- a/yogstation/code/modules/clothing/suits/nerd.dm +++ b/yogstation/code/modules/clothing/suits/nerd.dm @@ -53,7 +53,7 @@ COOLDOWN_DECLARE(next_damage_notify) COOLDOWN_DECLARE(next_morphine) -/obj/item/clothing/suit/armor/nerd/Initialize() +/obj/item/clothing/suit/armor/nerd/Initialize(mapload) . = ..() GC = new(src) GC.scanning = TRUE @@ -89,7 +89,7 @@ do_sparks(8, FALSE, get_turf(src)) return TRUE -/obj/item/clothing/suit/armor/nerd/proc/add_queue(var/desired_file,var/desired_delay,var/purge_queue=FALSE) +/obj/item/clothing/suit/armor/nerd/proc/add_queue(desired_file, desired_delay, purge_queue=FALSE) var/was_empty_sound_queue = !length(sound_queue) diff --git a/yogstation/code/modules/clothing/under.dm b/yogstation/code/modules/clothing/under.dm index 4a80bb810eab..a9891b93681d 100644 --- a/yogstation/code/modules/clothing/under.dm +++ b/yogstation/code/modules/clothing/under.dm @@ -8,7 +8,7 @@ item_flags = DROPDEL can_adjust = 0 -/obj/item/clothing/under/yogs/cluwne/Initialize() +/obj/item/clothing/under/yogs/cluwne/Initialize(mapload) .=..() ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) diff --git a/yogstation/code/modules/clothing/under/miscellaneous.dm b/yogstation/code/modules/clothing/under/miscellaneous.dm index d69bb7aa4cf2..f635e15bcb5b 100644 --- a/yogstation/code/modules/clothing/under/miscellaneous.dm +++ b/yogstation/code/modules/clothing/under/miscellaneous.dm @@ -12,7 +12,7 @@ item_state = "scaryclownuniform" can_adjust = FALSE -/obj/item/clothing/under/rank/yogs/scaryclown/Initialize() +/obj/item/clothing/under/rank/yogs/scaryclown/Initialize(mapload) . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50) diff --git a/yogstation/code/modules/donor/borg_skins.dm b/yogstation/code/modules/donor/borg_skins.dm index 12d2654d9294..5136094a47c1 100644 --- a/yogstation/code/modules/donor/borg_skins.dm +++ b/yogstation/code/modules/donor/borg_skins.dm @@ -21,7 +21,7 @@ GLOBAL_DATUM_INIT(DonorBorgHolder, /datum/borg_skin_holder, new) var/datum/ai_skin/instance = new Bskin skins += instance -/datum/borg_skin_holder/proc/AddSkin(var/datum/borg_skin/B) +/datum/borg_skin_holder/proc/AddSkin(datum/borg_skin/B) if(!(B in skins)) skins += B log_game("Successfully added the [B.name] donor borg skin to the datumbase!") diff --git a/yogstation/code/modules/events/immovable_duck.dm b/yogstation/code/modules/events/immovable_duck.dm index ec593ddeb12b..ec75dd4849c1 100644 --- a/yogstation/code/modules/events/immovable_duck.dm +++ b/yogstation/code/modules/events/immovable_duck.dm @@ -29,7 +29,7 @@ icon = 'yogstation/icons/obj/objects.dmi' icon_state = "immquack" -/obj/effect/immovablerod/duck/Initialize() +/obj/effect/immovablerod/duck/Initialize(mapload) . = ..() SpinAnimation(24,-1) diff --git a/yogstation/code/modules/events/infiltrators.dm b/yogstation/code/modules/events/infiltrators.dm index 0d761a8323a1..9cbd79ce41c0 100644 --- a/yogstation/code/modules/events/infiltrators.dm +++ b/yogstation/code/modules/events/infiltrators.dm @@ -10,7 +10,7 @@ gamemode_blacklist = list("nuclear","wizard","revolution","abduction","infiltration","gang","cult","clockcult","darkspawn","dynamic") -/datum/round_event_control/infiltrators/canSpawnEvent(var/players_amt, var/gamemode) +/datum/round_event_control/infiltrators/canSpawnEvent(players_amt, gamemode) . = ..() if(SSshuttle.emergency.mode != SHUTTLE_RECALL && SSshuttle.emergency.mode != SHUTTLE_IDLE) // Don't send infiltrators if the shuttle is coming! return FALSE diff --git a/yogstation/code/modules/guardian/abilities/special/pocket.dm b/yogstation/code/modules/guardian/abilities/special/pocket.dm index 73799e552168..b14b111f6d24 100644 --- a/yogstation/code/modules/guardian/abilities/special/pocket.dm +++ b/yogstation/code/modules/guardian/abilities/special/pocket.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) /obj/effect/landmark/pocket_dimension_corner name = "pocket dimension corner (bottom left)" -/obj/effect/landmark/pocket_dimension_corner/Initialize() +/obj/effect/landmark/pocket_dimension_corner/Initialize(mapload) . = ..() var/datum/space_level/level = SSmapping.get_level(z) if (!level) @@ -294,7 +294,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) mouse_opacity = FALSE var/next_animate = 0 -/obj/effect/manifestation/Initialize() +/obj/effect/manifestation/Initialize(mapload) . = ..() var/X,Y,i,rsq for (i=1, i<=7, ++i) @@ -433,7 +433,7 @@ GLOBAL_LIST_EMPTY(pocket_mirrors) flags_1 = NOJAUNT_1 var/next_animate = 0 -/turf/open/indestructible/pocketspace/Initialize() +/turf/open/indestructible/pocketspace/Initialize(mapload) . = ..() var/X,Y,i,rsq for (i=1, i<=7, ++i) diff --git a/yogstation/code/modules/guardian/guardianbuilder.dm b/yogstation/code/modules/guardian/guardianbuilder.dm index d6246f0f240c..f65c8d0c7ec6 100644 --- a/yogstation/code/modules/guardian/guardianbuilder.dm +++ b/yogstation/code/modules/guardian/guardianbuilder.dm @@ -252,7 +252,7 @@ var/allowspecial = FALSE var/debug_mode = FALSE -/obj/item/guardiancreator/Initialize() +/obj/item/guardiancreator/Initialize(mapload) . = ..() RegisterSignal(src, COMSIG_ITEM_REFUND, PROC_REF(refund_check)) builder = new(mob_name, theme, failure_message, max_points, allowspecial, debug_mode) diff --git a/yogstation/code/modules/guardian/standarrow.dm b/yogstation/code/modules/guardian/standarrow.dm index 54fb490b97ff..f55350021711 100644 --- a/yogstation/code/modules/guardian/standarrow.dm +++ b/yogstation/code/modules/guardian/standarrow.dm @@ -16,7 +16,7 @@ var/arrowtype = "magic" var/can_requiem = TRUE -/obj/item/stand_arrow/Initialize() +/obj/item/stand_arrow/Initialize(mapload) . = ..() GLOB.poi_list += src diff --git a/yogstation/code/modules/mentor/mentorhelp.dm b/yogstation/code/modules/mentor/mentorhelp.dm index d2ff43597d5a..088d8a22db6d 100644 --- a/yogstation/code/modules/mentor/mentorhelp.dm +++ b/yogstation/code/modules/mentor/mentorhelp.dm @@ -57,7 +57,7 @@ else .["present"]++ -/proc/key_name_mentor(var/whom, var/include_link = null, var/include_name = 0, var/include_follow = 0, var/char_name_only = 0) +/proc/key_name_mentor(whom, include_link = null, include_name = 0, include_follow = 0, char_name_only = 0) var/mob/M var/client/C var/key @@ -119,5 +119,5 @@ return . -/proc/discord_mentor_link(var/display_name, var/id) +/proc/discord_mentor_link(display_name, id) return "[display_name]" diff --git a/yogstation/code/modules/mentor/mentortickets.dm b/yogstation/code/modules/mentor/mentortickets.dm index b02b0737f64d..f337359b35aa 100644 --- a/yogstation/code/modules/mentor/mentortickets.dm +++ b/yogstation/code/modules/mentor/mentortickets.dm @@ -2,7 +2,7 @@ var/owner //owner's ckey, as text var/list/log = list() -/datum/mentorticket/New(var/client/who) +/datum/mentorticket/New(client/who) if(!who) return owner = who.ckey diff --git a/yogstation/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/yogstation/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index efcaab0111ec..63cc67d3598f 100644 --- a/yogstation/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/yogstation/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -1,4 +1,4 @@ -/mob/living/carbon/alien/humanoid/Initialize(null) +/mob/living/carbon/alien/humanoid/Initialize(mapload, null) var/datum/action/cooldown/alien/regurgitate/regurgitate = new(src) regurgitate.Grant(src) . = ..() diff --git a/yogstation/code/modules/mob/living/carbon/reindex_screams.dm b/yogstation/code/modules/mob/living/carbon/reindex_screams.dm index 7f5d625f621e..10da5cd06dcf 100644 --- a/yogstation/code/modules/mob/living/carbon/reindex_screams.dm +++ b/yogstation/code/modules/mob/living/carbon/reindex_screams.dm @@ -33,7 +33,7 @@ add_screams(wear_id.alternate_screams) //Note that the following two are for /mob/living, while the above two are for /carbon and /human -/mob/living/proc/add_screams(var/list/screams) +/mob/living/proc/add_screams(list/screams) LAZYINITLIST(alternate_screams) if(!screams || screams.len == 0) return @@ -42,4 +42,4 @@ /mob/living/proc/clear_screams() LAZYINITLIST(alternate_screams) - LAZYCLEARLIST(alternate_screams) \ No newline at end of file + LAZYCLEARLIST(alternate_screams) diff --git a/yogstation/code/modules/mob/living/silicon/robot/robot.dm b/yogstation/code/modules/mob/living/silicon/robot/robot.dm index 6ad182cc1c31..3ace1f3f8c4a 100644 --- a/yogstation/code/modules/mob/living/silicon/robot/robot.dm +++ b/yogstation/code/modules/mob/living/silicon/robot/robot.dm @@ -1,4 +1,4 @@ -/mob/living/silicon/robot/proc/PickBorgSkin(var/forced = FALSE) //We'll do our own AI version inside its pre existent skin selector methinks +/mob/living/silicon/robot/proc/PickBorgSkin(forced = FALSE) //We'll do our own AI version inside its pre existent skin selector methinks icon = initial(icon) //Redundancy in case they repick a skin after modulechange if(!GLOB.DonorBorgHolder) message_admins("[client.ckey] just tried to change their borg skin, but there is no borg skin holder datum! (Has the game not started yet?)") diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/chocobo.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/chocobo.dm index b4a23effa5ab..c99a33a04e1d 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/chocobo.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/chocobo.dm @@ -28,7 +28,7 @@ buckle_lying = 0 var/random_color = TRUE -/mob/living/simple_animal/chocobo/Initialize() +/mob/living/simple_animal/chocobo/Initialize(mapload) . = ..() if(random_color) var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255)) diff --git a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm index bd44622e035f..ca2d12a0bd49 100644 --- a/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/friendly/goats.dm @@ -201,7 +201,7 @@ melee_damage_upper = 20 gold_core_spawnable = NO_SPAWN -/mob/living/simple_animal/hostile/retaliate/goat/huge/Initialize() +/mob/living/simple_animal/hostile/retaliate/goat/huge/Initialize(mapload) . = ..() transform *= 2 @@ -212,7 +212,7 @@ melee_damage_upper = 1 gold_core_spawnable = NO_SPAWN -/mob/living/simple_animal/hostile/retaliate/goat/tiny/Initialize() +/mob/living/simple_animal/hostile/retaliate/goat/tiny/Initialize(mapload) . = ..() transform *= 0.5 @@ -345,7 +345,7 @@ tame = 1 gold_core_spawnable = NO_SPAWN -/mob/living/simple_animal/hostile/retaliate/goat/legitgoat/Initialize() +/mob/living/simple_animal/hostile/retaliate/goat/legitgoat/Initialize(mapload) . = ..() AddComponent(/datum/component/waddling) var/datum/component/riding/D = LoadComponent(/datum/component/riding) diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm index ec1dbf4d375f..d0b41df6733d 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/floor_cluwne.dm @@ -47,7 +47,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) hud_possible = list(ANTAG_HUD) -/mob/living/simple_animal/hostile/floor_cluwne/Initialize() +/mob/living/simple_animal/hostile/floor_cluwne/Initialize(mapload) . = ..() access_card = new /obj/item/card/id(src) access_card.access = get_all_accesses()//THERE IS NO ESCAPE @@ -441,7 +441,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) duration = 600 randomdir = FALSE -/obj/effect/temp_visual/fcluwne_manifest/Initialize() +/obj/effect/temp_visual/fcluwne_manifest/Initialize(mapload) . = ..() playsound(src, 'yogstation/sound/misc/floor_cluwne_emerge.ogg', 100, 1) flick("fcluwne_manifest",src) @@ -450,7 +450,7 @@ GLOBAL_VAR_INIT(floor_cluwnes, 0) name = "floor cluwne" desc = "If you have this, tell a coder or admin!" -/obj/effect/dummy/floorcluwne_orbit/Initialize() +/obj/effect/dummy/floorcluwne_orbit/Initialize(mapload) . = ..() GLOB.floor_cluwnes++ name += " ([GLOB.floor_cluwnes])" diff --git a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm index 38b81a4a3615..8957c9d389fe 100644 --- a/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm +++ b/yogstation/code/modules/mob/living/simple_animal/hostile/retaliate/king_of_goats.dm @@ -103,7 +103,7 @@ Difficulty: Insanely Hard var/special_attacks = 0 stun_chance = 7 -/mob/living/simple_animal/hostile/retaliate/goat/king/phase2/Initialize() +/mob/living/simple_animal/hostile/retaliate/goat/king/phase2/Initialize(mapload) . = ..() update_icon() diff --git a/yogstation/code/modules/mob/new_player/poll.dm b/yogstation/code/modules/mob/new_player/poll.dm index 98aa38321f40..7cb8a7dbad78 100644 --- a/yogstation/code/modules/mob/new_player/poll.dm +++ b/yogstation/code/modules/mob/new_player/poll.dm @@ -27,7 +27,7 @@ src << browse(output,"window=playerpolllist;size=500x300") -/client/proc/poll_results(var/pollid = -1) +/client/proc/poll_results(pollid = -1) if(!check_rights(R_ADMIN)) return if(pollid == -1) diff --git a/yogstation/code/modules/ninja/suit/ninja.dm b/yogstation/code/modules/ninja/suit/ninja.dm index 068fb2697ad1..1e754cc4ce48 100644 --- a/yogstation/code/modules/ninja/suit/ninja.dm +++ b/yogstation/code/modules/ninja/suit/ninja.dm @@ -92,7 +92,7 @@ /obj/item/clothing/suit/space/space_ninja/lockIcons(mob/living/carbon/human/H) return -/obj/item/clothing/suit/space/space_ninja/Initialize() +/obj/item/clothing/suit/space/space_ninja/Initialize(mapload) actions_types += /datum/action/item_action/ninjacolour .=..() diff --git a/yogstation/code/modules/paperwork/photography.dm b/yogstation/code/modules/paperwork/photography.dm index 002e184b4159..701f2e0df802 100644 --- a/yogstation/code/modules/paperwork/photography.dm +++ b/yogstation/code/modules/paperwork/photography.dm @@ -6,7 +6,7 @@ w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE -/obj/item/storage/photobook/Initialize() +/obj/item/storage/photobook/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL @@ -22,7 +22,7 @@ w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE -/obj/item/storage/bag/photo/Initialize() +/obj/item/storage/bag/photo/Initialize(mapload) . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL diff --git a/yogstation/code/modules/power/validhunter.dm b/yogstation/code/modules/power/validhunter.dm index 647a4aba1bad..63262bd57139 100644 --- a/yogstation/code/modules/power/validhunter.dm +++ b/yogstation/code/modules/power/validhunter.dm @@ -11,7 +11,7 @@ var/operating = FALSE //Is it on? var/gibtime = 40 // Time from starting until done -/obj/machinery/power/validhunter_engine/Initialize() +/obj/machinery/power/validhunter_engine/Initialize(mapload) connect_to_network() return ..() diff --git a/yogstation/code/modules/reagents/reagent_containers/gummies.dm b/yogstation/code/modules/reagents/reagent_containers/gummies.dm index e7864ffe4b6f..0abb4c9264ea 100644 --- a/yogstation/code/modules/reagents/reagent_containers/gummies.dm +++ b/yogstation/code/modules/reagents/reagent_containers/gummies.dm @@ -14,7 +14,7 @@ var/self_delay = 1 SECONDS var/dissolvable = TRUE -/obj/item/reagent_containers/gummy/Initialize() +/obj/item/reagent_containers/gummy/Initialize(mapload) . = ..() if(prob(1)) name = "chubby gummi bear" //le player reference @@ -178,7 +178,7 @@ , "Surely, there's no way this could go bad.") color = null -/obj/item/reagent_containers/gummy/floorbear/Initialize() +/obj/item/reagent_containers/gummy/floorbear/Initialize(mapload) list_reagents = list(get_random_reagent_id() = 30) . = ..() name = pick(names2) diff --git a/yogstation/code/modules/recycling/disposal/pipe_sorting.dm b/yogstation/code/modules/recycling/disposal/pipe_sorting.dm index 53080382d2dd..f62799bbc453 100644 --- a/yogstation/code/modules/recycling/disposal/pipe_sorting.dm +++ b/yogstation/code/modules/recycling/disposal/pipe_sorting.dm @@ -4,7 +4,7 @@ var/sort_scan = TRUE var/panel_open = FALSE -/obj/structure/disposalpipe/sorting/Initialize() +/obj/structure/disposalpipe/sorting/Initialize(mapload) . = ..() wires = new /datum/wires/disposals(src) diff --git a/yogstation/code/modules/research/rdconsole.dm b/yogstation/code/modules/research/rdconsole.dm index 53a2e2493066..a9b4b997fbe6 100644 --- a/yogstation/code/modules/research/rdconsole.dm +++ b/yogstation/code/modules/research/rdconsole.dm @@ -1,4 +1,4 @@ -/obj/machinery/computer/rdconsole/Initialize() +/obj/machinery/computer/rdconsole/Initialize(mapload) .=..() light_color = LIGHT_COLOR_PURPLE diff --git a/yogstation/code/modules/scripting/IDE.dm b/yogstation/code/modules/scripting/IDE.dm index f88e26a56a8b..c1f119e95a6b 100644 --- a/yogstation/code/modules/scripting/IDE.dm +++ b/yogstation/code/modules/scripting/IDE.dm @@ -232,7 +232,7 @@ src << output(null, "tcserror") src << output("Failed to clear memory: Unable to locate machine.", "tcserror") -/proc/telecomms_check(var/mob/mob) +/proc/telecomms_check(mob/mob) if(mob && istype(mob.machine, /obj/machinery/computer/telecomms/traffic) && in_range(mob.machine, mob) || issilicon(mob) && istype(mob.machine, /obj/machinery/computer/telecomms/traffic)) return 1 return 0 diff --git a/yogstation/code/modules/spacepods/equipment.dm b/yogstation/code/modules/spacepods/equipment.dm index f0b4944a907b..aec8c6517d61 100644 --- a/yogstation/code/modules/spacepods/equipment.dm +++ b/yogstation/code/modules/spacepods/equipment.dm @@ -312,7 +312,7 @@ var/static/id_source = 0 var/id = null -/obj/item/spacepod_equipment/lock/keyed/Initialize() +/obj/item/spacepod_equipment/lock/keyed/Initialize(mapload) . = ..() if(id == null) id = ++id_source diff --git a/yogstation/code/modules/spacepods/parts.dm b/yogstation/code/modules/spacepods/parts.dm index 0373bcb1da2e..d37c220ce8bc 100644 --- a/yogstation/code/modules/spacepods/parts.dm +++ b/yogstation/code/modules/spacepods/parts.dm @@ -14,7 +14,7 @@ var/link_to = null var/link_angle = 0 -/obj/item/pod_parts/pod_frame/Initialize() +/obj/item/pod_parts/pod_frame/Initialize(mapload) . = ..() AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE) @@ -53,7 +53,7 @@ return FALSE return connectedparts -/obj/item/pod_parts/pod_frame/attackby(var/obj/item/O, mob/user) +/obj/item/pod_parts/pod_frame/attackby(obj/item/O, mob/user) if(istype(O, /obj/item/stack/rods)) var/obj/item/stack/rods/R = O var/list/linkedparts = find_square() diff --git a/yogstation/code/modules/spacepods/prebuilt.dm b/yogstation/code/modules/spacepods/prebuilt.dm index 5f30a084c06d..a834b32c0fd8 100644 --- a/yogstation/code/modules/spacepods/prebuilt.dm +++ b/yogstation/code/modules/spacepods/prebuilt.dm @@ -7,7 +7,7 @@ var/equipment_types = list() construction_state = SPACEPOD_ARMOR_WELDED -/obj/spacepod/prebuilt/Initialize() +/obj/spacepod/prebuilt/Initialize(mapload) . =..() add_armor(new armor_type(src)) if(cell_type) @@ -47,7 +47,7 @@ icon_state = "pod_civ" construction_state = SPACEPOD_ARMOR_WELDED -/obj/spacepod/random/Initialize() +/obj/spacepod/random/Initialize(mapload) . = ..() var/armor_type = pick(/obj/item/pod_parts/armor, /obj/item/pod_parts/armor/syndicate, diff --git a/yogstation/code/modules/spacepods/spacepod.dm b/yogstation/code/modules/spacepods/spacepod.dm index 871b8cc14925..769a4112cc45 100644 --- a/yogstation/code/modules/spacepods/spacepod.dm +++ b/yogstation/code/modules/spacepods/spacepod.dm @@ -78,7 +78,7 @@ GLOBAL_LIST_INIT(spacepods_list, list()) var/bounce_factor = 0.2 // how much of our velocity to keep on collision var/lateral_bounce_factor = 0.95 // mostly there to slow you down when you drive (pilot?) down a 2x2 corridor -/obj/spacepod/Initialize() +/obj/spacepod/Initialize(mapload) . = ..() GLOB.spacepods_list += src START_PROCESSING(SSfastprocess, src) diff --git a/yogstation/code/modules/webhook/webhook.dm b/yogstation/code/modules/webhook/webhook.dm index 6a703332ccbc..d0f13624feeb 100644 --- a/yogstation/code/modules/webhook/webhook.dm +++ b/yogstation/code/modules/webhook/webhook.dm @@ -1,4 +1,4 @@ -/proc/webhook_send(var/method, var/data) +/proc/webhook_send(method, data) if(!CONFIG_GET(string/webhook_address) || !CONFIG_GET(string/webhook_key)) return @@ -8,10 +8,10 @@ req.prepare(RUSTG_HTTP_METHOD_POST, url, json_encode(data), list("Content-Type" = "application/json")) req.begin_async() //why would we ever want to track the results of the request, meme made by yogstation gang -/proc/webhook(var/ckey, var/message) +/proc/webhook(ckey, message) return list("ckey" = ckey, "message" = message) -/proc/webhook_send_roundstatus(var/status, var/extraData) +/proc/webhook_send_roundstatus(status, extraData) var/list/query = list("status" = status) if(extraData) @@ -19,34 +19,34 @@ webhook_send("roundstatus", query) -/proc/webhook_send_asay(var/ckey, var/message) +/proc/webhook_send_asay(ckey, message) var/list/query = webhook(ckey, message) webhook_send("asaymessage", query) -/proc/webhook_send_ooc(var/ckey, var/message) +/proc/webhook_send_ooc(ckey, message) var/list/query = webhook(ckey, message) webhook_send("oocmessage", query) -/proc/webhook_send_ticket_unclaimed(var/ckey, var/message, var/id) +/proc/webhook_send_ticket_unclaimed(ckey, message, id) var/list/query = webhook(ckey, message) query.Add(list("id" = id, "round" = "[GLOB.round_id ? GLOB.round_id : "NULL"]")) webhook_send("ticket_unclaimed", query) //////// Discord Tickets ///////// -/proc/webhook_send_ticket_new(var/ckey, var/message, var/id) +/proc/webhook_send_ticket_new(ckey, message, id) var/list/query = webhook(ckey, message) query.Add(list("id" = id, "round" = GLOB.round_id ? GLOB.round_id : 0)) webhook_send("ticket_new", query) -/proc/webhook_send_ticket_administer(var/admin_ckey, var/id) +/proc/webhook_send_ticket_administer(admin_ckey, id) webhook_send("ticket_administer", list("ckey" = admin_ckey, "id" = id)) -/proc/webhook_send_ticket_interaction(var/ckey, var/message, var/id) +/proc/webhook_send_ticket_interaction(ckey, message, id) var/list/query = webhook(ckey, message) query.Add(list("id" = id)) webhook_send("ticket_interaction", query) -/proc/webhook_send_ticket_resolve(var/id, var/resolved) +/proc/webhook_send_ticket_resolve(id, resolved) webhook_send("ticket_resolve", list("id" = id, "resolved" = resolved)) /proc/webhook_send_ticket_refresh() @@ -70,21 +70,21 @@ webhook_send("ticket_refresh", data) /////////////MENTORS///////////// -/proc/webhook_send_msay(var/ckey, var/message) +/proc/webhook_send_msay(ckey, message) var/list/query = webhook(ckey, message) webhook_send("msaymessage", query) -/proc/webhook_send_mhelp(var/ckey, var/message) +/proc/webhook_send_mhelp(ckey, message) var/list/query = webhook(ckey, message) webhook_send("mhelp", query) -/proc/webhook_send_mres(var/ckey, var/ckey2, var/message) +/proc/webhook_send_mres(ckey, ckey2, message) var/query = list("to" = ckey, "from" = ckey2, "message" = message) webhook_send("mres", query) -/proc/webhook_send_mchange(var/ckey, var/ckey2, var/action) +/proc/webhook_send_mchange(ckey, ckey2, action) var/query = list("ckey" = ckey, "ckey2" = ckey2, "action" = action) webhook_send("mchange", query) diff --git a/yogstation/code/modules/xenoarch/loot/gigadrill.dm b/yogstation/code/modules/xenoarch/loot/gigadrill.dm index 5e109872c365..32c252da6d48 100644 --- a/yogstation/code/modules/xenoarch/loot/gigadrill.dm +++ b/yogstation/code/modules/xenoarch/loot/gigadrill.dm @@ -26,7 +26,7 @@ else icon_state = "gigadrill" -/obj/vehicle/ridden/gigadrill/Initialize() +/obj/vehicle/ridden/gigadrill/Initialize(mapload) . = ..() var/datum/component/riding/D = LoadComponent(/datum/component/riding) D.vehicle_move_delay = 1